mmc: sdhci-s3c: simplify getting of_device_id match data
authorKrzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Thu, 15 Apr 2021 08:44:10 +0000 (10:44 +0200)
committerUlf Hansson <ulf.hansson@linaro.org>
Thu, 15 Apr 2021 12:00:15 +0000 (14:00 +0200)
Use of_device_get_match_data() to make the code slightly smaller and to
remove the of_device_id table forward declaration.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Reviewed-by: Sylwester Nawrocki <snawrocki@kernel.org>
Link: https://lore.kernel.org/r/20210415084412.51125-1-krzysztof.kozlowski@canonical.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/host/sdhci-s3c.c

index f48a788a9d3df6453df0990f65f0a84eb83c2ca3..8e1dca625620b3fdfbeef7598c7faf82ed642d82 100644 (file)
@@ -20,6 +20,7 @@
 #include <linux/gpio.h>
 #include <linux/module.h>
 #include <linux/of.h>
+#include <linux/of_device.h>
 #include <linux/of_gpio.h>
 #include <linux/pm.h>
 #include <linux/pm_runtime.h>
@@ -461,19 +462,12 @@ static int sdhci_s3c_parse_dt(struct device *dev,
 }
 #endif
 
-#ifdef CONFIG_OF
-static const struct of_device_id sdhci_s3c_dt_match[];
-#endif
-
 static inline struct sdhci_s3c_drv_data *sdhci_s3c_get_driver_data(
                        struct platform_device *pdev)
 {
 #ifdef CONFIG_OF
-       if (pdev->dev.of_node) {
-               const struct of_device_id *match;
-               match = of_match_node(sdhci_s3c_dt_match, pdev->dev.of_node);
-               return (struct sdhci_s3c_drv_data *)match->data;
-       }
+       if (pdev->dev.of_node)
+               return (struct sdhci_s3c_drv_data *)of_device_get_match_data(&pdev->dev);
 #endif
        return (struct sdhci_s3c_drv_data *)
                        platform_get_device_id(pdev)->driver_data;