add stmac read mac form eeprom

hc

2023-12-09 b22da3d8526a935aa31e086e63f60ff3246cb61c

 kernel/sound/soc/hisilicon/hi6210-i2s.c
..
..
@@ -1,17 +1,9 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  * linux/sound/soc/m8m/hi6210_i2s.c - I2S IP driver
3
4
  *
4
5
  * Copyright (C) 2015 Linaro, Ltd
5
6
  * Author: Andy Green <andy.green@linaro.org>
6
- *
7
- * This program is free software: you can redistribute it and/or modify
8
- * it under the terms of the GNU General Public License as published by
9
- * the Free Software Foundation, version 2 of the License.
10
- *
11
- * This program is distributed in the hope that it will be useful,
12
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
13
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14
- * GNU General Public License for more details.
15
7
  *
16
8
  * This driver only deals with S2 interface (BT)
17
9
  */
..
..
@@ -271,13 +263,13 @@
271
263
 	switch (params_format(params)) {
272
264
 	case SNDRV_PCM_FORMAT_U16_LE:
273
265
 		signed_data = HII2S_I2S_CFG__S2_CODEC_DATA_FORMAT;
274
-		/* fallthru */
266
+		fallthrough;
275
267
 	case SNDRV_PCM_FORMAT_S16_LE:
276
268
 		bits = HII2S_BITS_16;
277
269
 		break;
278
270
 	case SNDRV_PCM_FORMAT_U24_LE:
279
271
 		signed_data = HII2S_I2S_CFG__S2_CODEC_DATA_FORMAT;
280
-		/* fallthru */
272
+		fallthrough;
281
273
 	case SNDRV_PCM_FORMAT_S24_LE:
282
274
 		bits = HII2S_BITS_24;
283
275
 		break;
..
..
@@ -557,7 +549,7 @@
557
549
 	struct resource *res;
558
550
 	int ret;
559
551
 
560
-	i2s = devm_kzalloc(&pdev->dev, sizeof(*i2s), GFP_KERNEL);
552
+	i2s = devm_kzalloc(dev, sizeof(*i2s), GFP_KERNEL);
561
553
 	if (!i2s)
562
554
 		return -ENOMEM;
563
555
 
..
..
@@ -572,28 +564,28 @@
572
564
 	i2s->base_phys = (phys_addr_t)res->start;
573
565
 	i2s->dai = hi6210_i2s_dai_init;
574
566
 
575
-	dev_set_drvdata(&pdev->dev, i2s);
567
+	dev_set_drvdata(dev, i2s);
576
568
 
577
569
 	i2s->sysctrl = syscon_regmap_lookup_by_phandle(node,
578
570
 						"hisilicon,sysctrl-syscon");
579
571
 	if (IS_ERR(i2s->sysctrl))
580
572
 		return PTR_ERR(i2s->sysctrl);
581
573
 
582
-	i2s->clk[CLK_DACODEC] = devm_clk_get(&pdev->dev, "dacodec");
583
-	if (IS_ERR_OR_NULL(i2s->clk[CLK_DACODEC]))
574
+	i2s->clk[CLK_DACODEC] = devm_clk_get(dev, "dacodec");
575
+	if (IS_ERR(i2s->clk[CLK_DACODEC]))
584
576
 		return PTR_ERR(i2s->clk[CLK_DACODEC]);
585
577
 	i2s->clocks++;
586
578
 
587
-	i2s->clk[CLK_I2S_BASE] = devm_clk_get(&pdev->dev, "i2s-base");
588
-	if (IS_ERR_OR_NULL(i2s->clk[CLK_I2S_BASE]))
579
+	i2s->clk[CLK_I2S_BASE] = devm_clk_get(dev, "i2s-base");
580
+	if (IS_ERR(i2s->clk[CLK_I2S_BASE]))
589
581
 		return PTR_ERR(i2s->clk[CLK_I2S_BASE]);
590
582
 	i2s->clocks++;
591
583
 
592
-	ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0);
584
+	ret = devm_snd_dmaengine_pcm_register(dev, NULL, 0);
593
585
 	if (ret)
594
586
 		return ret;
595
587
 
596
-	ret = devm_snd_soc_register_component(&pdev->dev, &hi6210_i2s_i2s_comp,
588
+	ret = devm_snd_soc_register_component(dev, &hi6210_i2s_i2s_comp,
597
589
 					 &i2s->dai, 1);
598
590
 	return ret;
599
591
 }