mmc: sdhci-pltfm: Drop unnecessary error messages in sdhci_pltfm_init()
PATCH 1/2 mmc: sdhci-pltfm: Drop unnecessary error messages in sdhci_pltfm_init()
The devm_platform_ioremap_resource() and platform_get_irq() print the error messages themselves and our "failed" one brings no value and just noise. Refactor code to avoid those noisy error messages.
--- drivers/mmc/host/sdhci-pltfm.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-)
drivers/mmc/host/sdhci-pltfm.c +7 -15
@@ -115,26 +115,21 @@ struct sdhci_host *sdhci_pltfm_init(struct platform_device *pdev, {struct sdhci_host *host;void __iomem *ioaddr; -int irq, ret; +int irq; ioaddr =devm_platform_ioremap_resource (pdev,0 ); -if (IS_ERR (ioaddr)) { - ret =PTR_ERR (ioaddr); - goto err; - } +if (IS_ERR (ioaddr)) +return ERR_CAST (ioaddr); irq =platform_get_irq (pdev,0 ); -if (irq <0 ) { - ret = irq; - goto err; - } +if (irq <0 ) +return ERR_PTR (irq); host =sdhci_alloc_host (&pdev->dev,sizeof (struct sdhci_pltfm_host ) + priv_size); -if (IS_ERR (host)) { - ret =PTR_ERR (host); - goto err; +dev_err (&pdev->dev,"%s failed %pe\n" , __func__, host); +return ERR_CAST (host); } host->ioaddr = ioaddr;
@@ -152,9 +147,6 @@ struct sdhci_host *sdhci_pltfm_init(struct platform_device *pdev,platform_set_drvdata (pdev, host);return host; -err: -dev_err (&pdev->dev,"%s failed %d\n" , __func__, ret); -return ERR_PTR (ret); }EXPORT_SYMBOL_GPL (sdhci_pltfm_init);
Signature · 1 line
2.40.0.1.gaa8946217a0b
PATCH 2/2 mmc: sdhci-pltfm: Make driver OF independent
Since we have device_is_compatible() API, drop OF dependency in the driver.
--- drivers/mmc/host/sdhci-pltfm.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)
drivers/mmc/host/sdhci-pltfm.c +6 -10
@@ -19,7 +19,6 @@#include <linux/err.h> #include <linux/module.h> #include <linux/property.h> -#include <linux/of.h> #ifdef CONFIG_PPC #include <asm/machdep.h> #endif
@@ -56,19 +55,16 @@ static bool sdhci_wp_inverted(struct device *dev)static void sdhci_get_compatibility (struct platform_device *pdev) { +struct device *dev = &pdev->dev;struct sdhci_host *host =platform_get_drvdata (pdev); -struct device_node *np = pdev->dev.of_node; -if (!np) -return ; - -if (of_device_is_compatible (np,"fsl,p2020-rev1-esdhc" )) +if (device_is_compatible (dev,"fsl,p2020-rev1-esdhc" )) host->quirks |=SDHCI_QUIRK_BROKEN_DMA ; -if (of_device_is_compatible (np,"fsl,p2020-esdhc" ) || -of_device_is_compatible (np,"fsl,p1010-esdhc" ) || -of_device_is_compatible (np,"fsl,t4240-esdhc" ) || -of_device_is_compatible (np,"fsl,mpc8536-esdhc" )) +if (device_is_compatible (dev,"fsl,p2020-esdhc" ) || +device_is_compatible (dev,"fsl,p1010-esdhc" ) || +device_is_compatible (dev,"fsl,t4240-esdhc" ) || +device_is_compatible (dev,"fsl,mpc8536-esdhc" )) host->quirks |=SDHCI_QUIRK_BROKEN_TIMEOUT_VAL ; }
Signature · 1 line
2.40.0.1.gaa8946217a0b
Re: [PATCH v1 2/2] mmc: sdhci-pltfm: Make driver OF independent
Quoted 4 lines · Andy Shevchenko
Since we have
device_is_compatible()API, drop OF dependency in the driver.Signed-off-by Andy Shevchenko <[email protected]>
Quoted 42 lines
--- drivers/mmc/host/sdhci-pltfm.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)drivers/mmc/host/sdhci-pltfm.c +6
-10@@ -19,7 +19,6 @@#include <linux/err.h> #include <linux/module.h> #include <linux/property.h> -#include <linux/of.h> #ifdef CONFIG_PPC #include <asm/machdep.h> #endif @@ -56,19 +55,16 @@ static bool sdhci_wp_inverted(struct device *dev)static void sdhci_get_compatibility (struct platform_device *pdev) { +struct device *dev = &pdev->dev;struct sdhci_host *host =platform_get_drvdata (pdev); -struct device_node *np = pdev->dev.of_node; -if (!np) -return ; - -if (of_device_is_compatible (np,"fsl,p2020-rev1-esdhc" )) +if (device_is_compatible (dev,"fsl,p2020-rev1-esdhc" )) host->quirks |=SDHCI_QUIRK_BROKEN_DMA ; -if (of_device_is_compatible (np,"fsl,p2020-esdhc" ) || -of_device_is_compatible (np,"fsl,p1010-esdhc" ) || -of_device_is_compatible (np,"fsl,t4240-esdhc" ) || -of_device_is_compatible (np,"fsl,mpc8536-esdhc" )) +if (device_is_compatible (dev,"fsl,p2020-esdhc" ) || +device_is_compatible (dev,"fsl,p1010-esdhc" ) || +device_is_compatible (dev,"fsl,t4240-esdhc" ) || +device_is_compatible (dev,"fsl,mpc8536-esdhc" )) host->quirks |=SDHCI_QUIRK_BROKEN_TIMEOUT_VAL ; }
Re: [PATCH v1 2/2] mmc: sdhci-pltfm: Make driver OF independent
In reply to Andy ShevchenkoQuoted 5 lines · Andy Shevchenko
Since we have
device_is_compatible()API, drop OF dependency in the driver.Signed-off-by Andy Shevchenko <[email protected]>
Applied for next, thanks!
Kind regards
Uffe
Quoted 45 lines
--- drivers/mmc/host/sdhci-pltfm.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)drivers/mmc/host/sdhci-pltfm.c +6
-11@@ -19,7 +19,6 @@#include <linux/err.h> #include <linux/module.h> #include <linux/property.h> -#include <linux/of.h> #ifdef CONFIG_PPC #include <asm/machdep.h> #endif @@ -56,19 +55,16 @@ static bool sdhci_wp_inverted(struct device *dev)static void sdhci_get_compatibility (struct platform_device *pdev) { +struct device *dev = &pdev->dev;struct sdhci_host *host =platform_get_drvdata (pdev); -struct device_node *np = pdev->dev.of_node; -if (!np) -return ; - -if (of_device_is_compatible (np,"fsl,p2020-rev1-esdhc" )) +if (device_is_compatible (dev,"fsl,p2020-rev1-esdhc" )) host->quirks |=SDHCI_QUIRK_BROKEN_DMA ; -if (of_device_is_compatible (np,"fsl,p2020-esdhc" ) || -of_device_is_compatible (np,"fsl,p1010-esdhc" ) || -of_device_is_compatible (np,"fsl,t4240-esdhc" ) || -of_device_is_compatible (np,"fsl,mpc8536-esdhc" )) +if (device_is_compatible (dev,"fsl,p2020-esdhc" ) || +device_is_compatible (dev,"fsl,p1010-esdhc" ) || +device_is_compatible (dev,"fsl,t4240-esdhc" ) || +device_is_compatible (dev,"fsl,mpc8536-esdhc" )) host->quirks |=SDHCI_QUIRK_BROKEN_TIMEOUT_VAL ; } --2.40.0.1.gaa8946217a0b
Quoted 5 lines · Andy Shevchenko
The
devm_platform_ioremap_resource()andplatform_get_irq()print the error messages themselves and our "failed" one brings no value and just noise. Refactor code to avoid those noisy error messages.Signed-off-by Andy Shevchenko <[email protected]>
Quoted 52 lines
--- drivers/mmc/host/sdhci-pltfm.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-)drivers/mmc/host/sdhci-pltfm.c +7
-15@@ -115,26 +115,21 @@ struct sdhci_host *sdhci_pltfm_init(struct platform_device *pdev, {struct sdhci_host *host;void __iomem *ioaddr; -int irq, ret; +int irq; ioaddr =devm_platform_ioremap_resource (pdev,0 ); -if (IS_ERR (ioaddr)) { - ret =PTR_ERR (ioaddr); - goto err; - } +if (IS_ERR (ioaddr)) +return ERR_CAST (ioaddr); irq =platform_get_irq (pdev,0 ); -if (irq <0 ) { - ret = irq; - goto err; - } +if (irq <0 ) +return ERR_PTR (irq); host =sdhci_alloc_host (&pdev->dev,sizeof (struct sdhci_pltfm_host ) + priv_size); -if (IS_ERR (host)) { - ret =PTR_ERR (host); - goto err; +dev_err (&pdev->dev,"%s failed %pe\n" , __func__, host); +return ERR_CAST (host); } host->ioaddr = ioaddr;@@ -152,9 +147,6 @@ struct sdhci_host *sdhci_pltfm_init(struct platform_device *pdev,platform_set_drvdata (pdev, host);return host; -err: -dev_err (&pdev->dev,"%s failed %d\n" , __func__, ret); -return ERR_PTR (ret); }EXPORT_SYMBOL_GPL (sdhci_pltfm_init);
Quoted 6 lines · Andy Shevchenko
The
devm_platform_ioremap_resource()andplatform_get_irq()print the error messages themselves and our "failed" one brings no value and just noise. Refactor code to avoid those noisy error messages.Signed-off-by Andy Shevchenko <[email protected]>
Applied for next, thanks!
Kind regards
Uffe
Quoted 55 lines
--- drivers/mmc/host/sdhci-pltfm.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-)drivers/mmc/host/sdhci-pltfm.c +7
-16@@ -115,26 +115,21 @@ struct sdhci_host *sdhci_pltfm_init(struct platform_device *pdev, {struct sdhci_host *host;void __iomem *ioaddr; -int irq, ret; +int irq; ioaddr =devm_platform_ioremap_resource (pdev,0 ); -if (IS_ERR (ioaddr)) { - ret =PTR_ERR (ioaddr); - goto err; - } +if (IS_ERR (ioaddr)) +return ERR_CAST (ioaddr); irq =platform_get_irq (pdev,0 ); -if (irq <0 ) { - ret = irq; - goto err; - } +if (irq <0 ) +return ERR_PTR (irq); host =sdhci_alloc_host (&pdev->dev,sizeof (struct sdhci_pltfm_host ) + priv_size); -if (IS_ERR (host)) { - ret =PTR_ERR (host); - goto err; +dev_err (&pdev->dev,"%s failed %pe\n" , __func__, host); +return ERR_CAST (host); } host->ioaddr = ioaddr;@@ -152,9 +147,6 @@ struct sdhci_host *sdhci_pltfm_init(struct platform_device *pdev,platform_set_drvdata (pdev, host);return host; -err: -dev_err (&pdev->dev,"%s failed %d\n" , __func__, ret); -return ERR_PTR (ret); }EXPORT_SYMBOL_GPL (sdhci_pltfm_init); --2.40.0.1.gaa8946217a0b