diff mbox series

[3/5] mmc: sdhci-omap: Use of_device_get_match_data() helper

Message ID 20220202180648.1252154-4-huobean@gmail.com (mailing list archive)
State New, archived
Headers show
Series Use of_device_get_match_data() helper | expand

Commit Message

Bean Huo Feb. 2, 2022, 6:06 p.m. UTC 
From: Bean Huo <beanhuo@micron.com>

Only the device data is needed, not the entire struct of_device_id.
Use of_device_get_match_data() instead of open coding of_match_device().

Signed-off-by: Bean Huo <beanhuo@micron.com>
---
 drivers/mmc/host/sdhci-omap.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

Comments

kernel test robot Feb. 3, 2022, 2:39 a.m. UTC | #1 
Hi Bean,

Thank you for the patch! Perhaps something to improve:

[auto build test WARNING on tegra/for-next]
[also build test WARNING on linus/master ulf-hansson-mmc-mirror/next v5.17-rc2 next-20220202]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/0day-ci/linux/commits/Bean-Huo/Use-of_device_get_match_data-helper/20220203-020721
base:   https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git for-next
config: riscv-allyesconfig (https://download.01.org/0day-ci/archive/20220203/202202030919.aWKiSg0Q-lkp@intel.com/config)
compiler: riscv64-linux-gcc (GCC) 11.2.0
reproduce (this is a W=1 build):
        wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # https://github.com/0day-ci/linux/commit/33ccc62e7dd0ac8f965521ed7ff44ff52182f4b0
        git remote add linux-review https://github.com/0day-ci/linux
        git fetch --no-tags linux-review Bean-Huo/Use-of_device_get_match_data-helper/20220203-020721
        git checkout 33ccc62e7dd0ac8f965521ed7ff44ff52182f4b0
        # save the config file to linux build tree
        mkdir build_dir
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.2.0 make.cross O=build_dir ARCH=riscv SHELL=/bin/bash drivers/iio/multiplexer/ drivers/mmc/host/

If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>

All warnings (new ones prefixed by >>):

   drivers/mmc/host/sdhci-omap.c: In function 'sdhci_omap_probe':
>> drivers/mmc/host/sdhci-omap.c:1226:14: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
    1226 |         data = of_device_get_match_data(&pdev->dev);
         |              ^


vim +/const +1226 drivers/mmc/host/sdhci-omap.c

  1212	
  1213	static int sdhci_omap_probe(struct platform_device *pdev)
  1214	{
  1215		int ret;
  1216		u32 offset;
  1217		struct device *dev = &pdev->dev;
  1218		struct sdhci_host *host;
  1219		struct sdhci_pltfm_host *pltfm_host;
  1220		struct sdhci_omap_host *omap_host;
  1221		struct mmc_host *mmc;
  1222		struct sdhci_omap_data *data;
  1223		const struct soc_device_attribute *soc;
  1224		struct resource *regs;
  1225	
> 1226		data = of_device_get_match_data(&pdev->dev);
  1227		if (!data) {
  1228			dev_err(dev, "no sdhci omap data\n");
  1229			return -EINVAL;
  1230		}
  1231		offset = data->offset;
  1232	
  1233		regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
  1234		if (!regs)
  1235			return -ENXIO;
  1236	
  1237		host = sdhci_pltfm_init(pdev, &sdhci_omap_pdata,
  1238					sizeof(*omap_host));
  1239		if (IS_ERR(host)) {
  1240			dev_err(dev, "Failed sdhci_pltfm_init\n");
  1241			return PTR_ERR(host);
  1242		}
  1243	
  1244		pltfm_host = sdhci_priv(host);
  1245		omap_host = sdhci_pltfm_priv(pltfm_host);
  1246		omap_host->host = host;
  1247		omap_host->base = host->ioaddr;
  1248		omap_host->dev = dev;
  1249		omap_host->power_mode = MMC_POWER_UNDEFINED;
  1250		omap_host->timing = MMC_TIMING_LEGACY;
  1251		omap_host->flags = data->flags;
  1252		omap_host->omap_offset = data->omap_offset;
  1253		omap_host->con = -EINVAL; /* Prevent invalid restore on first resume */
  1254		host->ioaddr += offset;
  1255		host->mapbase = regs->start + offset;
  1256	
  1257		mmc = host->mmc;
  1258		sdhci_get_of_property(pdev);
  1259		ret = mmc_of_parse(mmc);
  1260		if (ret)
  1261			goto err_pltfm_free;
  1262	
  1263		soc = soc_device_match(sdhci_omap_soc_devices);
  1264		if (soc) {
  1265			omap_host->version = "rev11";
  1266			if (!strcmp(dev_name(dev), "4809c000.mmc"))
  1267				mmc->f_max = 96000000;
  1268			if (!strcmp(dev_name(dev), "480b4000.mmc"))
  1269				mmc->f_max = 48000000;
  1270			if (!strcmp(dev_name(dev), "480ad000.mmc"))
  1271				mmc->f_max = 48000000;
  1272		}
  1273	
  1274		if (!mmc_can_gpio_ro(mmc))
  1275			mmc->caps2 |= MMC_CAP2_NO_WRITE_PROTECT;
  1276	
  1277		pltfm_host->clk = devm_clk_get(dev, "fck");
  1278		if (IS_ERR(pltfm_host->clk)) {
  1279			ret = PTR_ERR(pltfm_host->clk);
  1280			goto err_pltfm_free;
  1281		}
  1282	
  1283		ret = clk_set_rate(pltfm_host->clk, mmc->f_max);
  1284		if (ret) {
  1285			dev_err(dev, "failed to set clock to %d\n", mmc->f_max);
  1286			goto err_pltfm_free;
  1287		}
  1288	
  1289		omap_host->pbias = devm_regulator_get_optional(dev, "pbias");
  1290		if (IS_ERR(omap_host->pbias)) {
  1291			ret = PTR_ERR(omap_host->pbias);
  1292			if (ret != -ENODEV)
  1293				goto err_pltfm_free;
  1294			dev_dbg(dev, "unable to get pbias regulator %d\n", ret);
  1295		}
  1296		omap_host->pbias_enabled = false;
  1297	
  1298		/*
  1299		 * omap_device_pm_domain has callbacks to enable the main
  1300		 * functional clock, interface clock and also configure the
  1301		 * SYSCONFIG register of omap devices. The callback will be invoked
  1302		 * as part of pm_runtime_get_sync.
  1303		 */
  1304		pm_runtime_use_autosuspend(dev);
  1305		pm_runtime_set_autosuspend_delay(dev, 50);
  1306		pm_runtime_enable(dev);
  1307		ret = pm_runtime_resume_and_get(dev);
  1308		if (ret) {
  1309			dev_err(dev, "pm_runtime_get_sync failed\n");
  1310			goto err_rpm_disable;
  1311		}
  1312	
  1313		ret = sdhci_omap_set_capabilities(host);
  1314		if (ret) {
  1315			dev_err(dev, "failed to set system capabilities\n");
  1316			goto err_rpm_put;
  1317		}
  1318	
  1319		host->mmc_host_ops.start_signal_voltage_switch =
  1320						sdhci_omap_start_signal_voltage_switch;
  1321		host->mmc_host_ops.set_ios = sdhci_omap_set_ios;
  1322		host->mmc_host_ops.card_busy = sdhci_omap_card_busy;
  1323		host->mmc_host_ops.execute_tuning = sdhci_omap_execute_tuning;
  1324		host->mmc_host_ops.enable_sdio_irq = sdhci_omap_enable_sdio_irq;
  1325	
  1326		/*
  1327		 * Switch to external DMA only if there is the "dmas" property and
  1328		 * ADMA is not available on the controller instance.
  1329		 */
  1330		if (device_property_present(dev, "dmas") &&
  1331		    !sdhci_omap_has_adma(omap_host, offset))
  1332			sdhci_switch_external_dma(host, true);
  1333	
  1334		if (device_property_read_bool(dev, "ti,non-removable")) {
  1335			dev_warn_once(dev, "using old ti,non-removable property\n");
  1336			mmc->caps |= MMC_CAP_NONREMOVABLE;
  1337		}
  1338	
  1339		/* R1B responses is required to properly manage HW busy detection. */
  1340		mmc->caps |= MMC_CAP_NEED_RSP_BUSY;
  1341	
  1342		/* Allow card power off and runtime PM for eMMC/SD card devices */
  1343		mmc->caps |= MMC_CAP_POWER_OFF_CARD | MMC_CAP_AGGRESSIVE_PM;
  1344	
  1345		ret = sdhci_setup_host(host);
  1346		if (ret)
  1347			goto err_rpm_put;
  1348	
  1349		ret = sdhci_omap_config_iodelay_pinctrl_state(omap_host);
  1350		if (ret)
  1351			goto err_cleanup_host;
  1352	
  1353		ret = __sdhci_add_host(host);
  1354		if (ret)
  1355			goto err_cleanup_host;
  1356	
  1357		/*
  1358		 * SDIO devices can use the dat1 pin as a wake-up interrupt. Some
  1359		 * devices like wl1xxx, use an out-of-band GPIO interrupt instead.
  1360		 */
  1361		omap_host->wakeirq = of_irq_get_byname(dev->of_node, "wakeup");
  1362		if (omap_host->wakeirq == -EPROBE_DEFER) {
  1363			ret = -EPROBE_DEFER;
  1364			goto err_cleanup_host;
  1365		}
  1366		if (omap_host->wakeirq > 0) {
  1367			device_init_wakeup(dev, true);
  1368			ret = dev_pm_set_dedicated_wake_irq(dev, omap_host->wakeirq);
  1369			if (ret) {
  1370				device_init_wakeup(dev, false);
  1371				goto err_cleanup_host;
  1372			}
  1373			host->mmc->pm_caps |= MMC_PM_KEEP_POWER | MMC_PM_WAKE_SDIO_IRQ;
  1374		}
  1375	
  1376		pm_runtime_mark_last_busy(dev);
  1377		pm_runtime_put_autosuspend(dev);
  1378	
  1379		return 0;
  1380	
  1381	err_cleanup_host:
  1382		sdhci_cleanup_host(host);
  1383	
  1384	err_rpm_put:
  1385		pm_runtime_mark_last_busy(dev);
  1386		pm_runtime_put_autosuspend(dev);
  1387	err_rpm_disable:
  1388		pm_runtime_dont_use_autosuspend(dev);
  1389		pm_runtime_disable(dev);
  1390	
  1391	err_pltfm_free:
  1392		sdhci_pltfm_free(pdev);
  1393		return ret;
  1394	}
  1395	

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
kernel test robot Feb. 3, 2022, 4:21 a.m. UTC | #2 
Hi Bean,

Thank you for the patch! Perhaps something to improve:

[auto build test WARNING on tegra/for-next]
[also build test WARNING on linus/master ulf-hansson-mmc-mirror/next v5.17-rc2 next-20220202]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/0day-ci/linux/commits/Bean-Huo/Use-of_device_get_match_data-helper/20220203-020721
base:   https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git for-next
config: openrisc-randconfig-s031-20220131 (https://download.01.org/0day-ci/archive/20220203/202202031221.asY8tGvu-lkp@intel.com/config)
compiler: or1k-linux-gcc (GCC) 11.2.0
reproduce:
        wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # apt-get install sparse
        # sparse version: v0.6.4-dirty
        # https://github.com/0day-ci/linux/commit/33ccc62e7dd0ac8f965521ed7ff44ff52182f4b0
        git remote add linux-review https://github.com/0day-ci/linux
        git fetch --no-tags linux-review Bean-Huo/Use-of_device_get_match_data-helper/20220203-020721
        git checkout 33ccc62e7dd0ac8f965521ed7ff44ff52182f4b0
        # save the config file to linux build tree
        mkdir build_dir
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.2.0 make.cross C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' O=build_dir ARCH=openrisc SHELL=/bin/bash drivers/mmc/host/

If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>


sparse warnings: (new ones prefixed by >>)
>> drivers/mmc/host/sdhci-omap.c:1226:14: sparse: sparse: incorrect type in assignment (different modifiers) @@     expected struct sdhci_omap_data *data @@     got void const * @@
   drivers/mmc/host/sdhci-omap.c:1226:14: sparse:     expected struct sdhci_omap_data *data
   drivers/mmc/host/sdhci-omap.c:1226:14: sparse:     got void const *

vim +1226 drivers/mmc/host/sdhci-omap.c

  1212	
  1213	static int sdhci_omap_probe(struct platform_device *pdev)
  1214	{
  1215		int ret;
  1216		u32 offset;
  1217		struct device *dev = &pdev->dev;
  1218		struct sdhci_host *host;
  1219		struct sdhci_pltfm_host *pltfm_host;
  1220		struct sdhci_omap_host *omap_host;
  1221		struct mmc_host *mmc;
  1222		struct sdhci_omap_data *data;
  1223		const struct soc_device_attribute *soc;
  1224		struct resource *regs;
  1225	
> 1226		data = of_device_get_match_data(&pdev->dev);
  1227		if (!data) {
  1228			dev_err(dev, "no sdhci omap data\n");
  1229			return -EINVAL;
  1230		}
  1231		offset = data->offset;
  1232	
  1233		regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
  1234		if (!regs)
  1235			return -ENXIO;
  1236	
  1237		host = sdhci_pltfm_init(pdev, &sdhci_omap_pdata,
  1238					sizeof(*omap_host));
  1239		if (IS_ERR(host)) {
  1240			dev_err(dev, "Failed sdhci_pltfm_init\n");
  1241			return PTR_ERR(host);
  1242		}
  1243	
  1244		pltfm_host = sdhci_priv(host);
  1245		omap_host = sdhci_pltfm_priv(pltfm_host);
  1246		omap_host->host = host;
  1247		omap_host->base = host->ioaddr;
  1248		omap_host->dev = dev;
  1249		omap_host->power_mode = MMC_POWER_UNDEFINED;
  1250		omap_host->timing = MMC_TIMING_LEGACY;
  1251		omap_host->flags = data->flags;
  1252		omap_host->omap_offset = data->omap_offset;
  1253		omap_host->con = -EINVAL; /* Prevent invalid restore on first resume */
  1254		host->ioaddr += offset;
  1255		host->mapbase = regs->start + offset;
  1256	
  1257		mmc = host->mmc;
  1258		sdhci_get_of_property(pdev);
  1259		ret = mmc_of_parse(mmc);
  1260		if (ret)
  1261			goto err_pltfm_free;
  1262	
  1263		soc = soc_device_match(sdhci_omap_soc_devices);
  1264		if (soc) {
  1265			omap_host->version = "rev11";
  1266			if (!strcmp(dev_name(dev), "4809c000.mmc"))
  1267				mmc->f_max = 96000000;
  1268			if (!strcmp(dev_name(dev), "480b4000.mmc"))
  1269				mmc->f_max = 48000000;
  1270			if (!strcmp(dev_name(dev), "480ad000.mmc"))
  1271				mmc->f_max = 48000000;
  1272		}
  1273	
  1274		if (!mmc_can_gpio_ro(mmc))
  1275			mmc->caps2 |= MMC_CAP2_NO_WRITE_PROTECT;
  1276	
  1277		pltfm_host->clk = devm_clk_get(dev, "fck");
  1278		if (IS_ERR(pltfm_host->clk)) {
  1279			ret = PTR_ERR(pltfm_host->clk);
  1280			goto err_pltfm_free;
  1281		}
  1282	
  1283		ret = clk_set_rate(pltfm_host->clk, mmc->f_max);
  1284		if (ret) {
  1285			dev_err(dev, "failed to set clock to %d\n", mmc->f_max);
  1286			goto err_pltfm_free;
  1287		}
  1288	
  1289		omap_host->pbias = devm_regulator_get_optional(dev, "pbias");
  1290		if (IS_ERR(omap_host->pbias)) {
  1291			ret = PTR_ERR(omap_host->pbias);
  1292			if (ret != -ENODEV)
  1293				goto err_pltfm_free;
  1294			dev_dbg(dev, "unable to get pbias regulator %d\n", ret);
  1295		}
  1296		omap_host->pbias_enabled = false;
  1297	
  1298		/*
  1299		 * omap_device_pm_domain has callbacks to enable the main
  1300		 * functional clock, interface clock and also configure the
  1301		 * SYSCONFIG register of omap devices. The callback will be invoked
  1302		 * as part of pm_runtime_get_sync.
  1303		 */
  1304		pm_runtime_use_autosuspend(dev);
  1305		pm_runtime_set_autosuspend_delay(dev, 50);
  1306		pm_runtime_enable(dev);
  1307		ret = pm_runtime_resume_and_get(dev);
  1308		if (ret) {
  1309			dev_err(dev, "pm_runtime_get_sync failed\n");
  1310			goto err_rpm_disable;
  1311		}
  1312	
  1313		ret = sdhci_omap_set_capabilities(host);
  1314		if (ret) {
  1315			dev_err(dev, "failed to set system capabilities\n");
  1316			goto err_rpm_put;
  1317		}
  1318	
  1319		host->mmc_host_ops.start_signal_voltage_switch =
  1320						sdhci_omap_start_signal_voltage_switch;
  1321		host->mmc_host_ops.set_ios = sdhci_omap_set_ios;
  1322		host->mmc_host_ops.card_busy = sdhci_omap_card_busy;
  1323		host->mmc_host_ops.execute_tuning = sdhci_omap_execute_tuning;
  1324		host->mmc_host_ops.enable_sdio_irq = sdhci_omap_enable_sdio_irq;
  1325	
  1326		/*
  1327		 * Switch to external DMA only if there is the "dmas" property and
  1328		 * ADMA is not available on the controller instance.
  1329		 */
  1330		if (device_property_present(dev, "dmas") &&
  1331		    !sdhci_omap_has_adma(omap_host, offset))
  1332			sdhci_switch_external_dma(host, true);
  1333	
  1334		if (device_property_read_bool(dev, "ti,non-removable")) {
  1335			dev_warn_once(dev, "using old ti,non-removable property\n");
  1336			mmc->caps |= MMC_CAP_NONREMOVABLE;
  1337		}
  1338	
  1339		/* R1B responses is required to properly manage HW busy detection. */
  1340		mmc->caps |= MMC_CAP_NEED_RSP_BUSY;
  1341	
  1342		/* Allow card power off and runtime PM for eMMC/SD card devices */
  1343		mmc->caps |= MMC_CAP_POWER_OFF_CARD | MMC_CAP_AGGRESSIVE_PM;
  1344	
  1345		ret = sdhci_setup_host(host);
  1346		if (ret)
  1347			goto err_rpm_put;
  1348	
  1349		ret = sdhci_omap_config_iodelay_pinctrl_state(omap_host);
  1350		if (ret)
  1351			goto err_cleanup_host;
  1352	
  1353		ret = __sdhci_add_host(host);
  1354		if (ret)
  1355			goto err_cleanup_host;
  1356	
  1357		/*
  1358		 * SDIO devices can use the dat1 pin as a wake-up interrupt. Some
  1359		 * devices like wl1xxx, use an out-of-band GPIO interrupt instead.
  1360		 */
  1361		omap_host->wakeirq = of_irq_get_byname(dev->of_node, "wakeup");
  1362		if (omap_host->wakeirq == -EPROBE_DEFER) {
  1363			ret = -EPROBE_DEFER;
  1364			goto err_cleanup_host;
  1365		}
  1366		if (omap_host->wakeirq > 0) {
  1367			device_init_wakeup(dev, true);
  1368			ret = dev_pm_set_dedicated_wake_irq(dev, omap_host->wakeirq);
  1369			if (ret) {
  1370				device_init_wakeup(dev, false);
  1371				goto err_cleanup_host;
  1372			}
  1373			host->mmc->pm_caps |= MMC_PM_KEEP_POWER | MMC_PM_WAKE_SDIO_IRQ;
  1374		}
  1375	
  1376		pm_runtime_mark_last_busy(dev);
  1377		pm_runtime_put_autosuspend(dev);
  1378	
  1379		return 0;
  1380	
  1381	err_cleanup_host:
  1382		sdhci_cleanup_host(host);
  1383	
  1384	err_rpm_put:
  1385		pm_runtime_mark_last_busy(dev);
  1386		pm_runtime_put_autosuspend(dev);
  1387	err_rpm_disable:
  1388		pm_runtime_dont_use_autosuspend(dev);
  1389		pm_runtime_disable(dev);
  1390	
  1391	err_pltfm_free:
  1392		sdhci_pltfm_free(pdev);
  1393		return ret;
  1394	}
  1395	

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
diff mbox series

Patch

diff --git a/drivers/mmc/host/sdhci-omap.c b/drivers/mmc/host/sdhci-omap.c
index 64e27c2821f9..676e3cbbfc95 100644
--- a/drivers/mmc/host/sdhci-omap.c
+++ b/drivers/mmc/host/sdhci-omap.c
@@ -1219,16 +1219,11 @@  static int sdhci_omap_probe(struct platform_device *pdev)
 	struct sdhci_pltfm_host *pltfm_host;
 	struct sdhci_omap_host *omap_host;
 	struct mmc_host *mmc;
-	const struct of_device_id *match;
 	struct sdhci_omap_data *data;
 	const struct soc_device_attribute *soc;
 	struct resource *regs;
 
-	match = of_match_device(omap_sdhci_match, dev);
-	if (!match)
-		return -EINVAL;
-
-	data = (struct sdhci_omap_data *)match->data;
+	data = of_device_get_match_data(&pdev->dev);
 	if (!data) {
 		dev_err(dev, "no sdhci omap data\n");
 		return -EINVAL;