Patchwork [01/26] mtd: devices: spear_smi: remove unnecessary platform_set_drvdata()

login
register
mail settings
Submitter Jingoo Han
Date May 7, 2013, 6:25 a.m.
Message ID <004501ce4aeb$bc1006e0$343014a0$@samsung.com>
Download mbox | patch
Permalink /patch/242009/
State New
Headers show

Comments

Jingoo Han - May 7, 2013, 6:25 a.m.
The driver core clears the driver data to NULL after device_release
or on probe failure, since commit 0998d0631001288a5974afc0b2a5f568bcdecb4d
(device-core: Ensure drvdata = NULL when no driver is bound).
Thus, it is not needed to manually clear the device driver data to NULL.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/mtd/devices/spear_smi.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
viresh kumar - May 13, 2013, 4:15 a.m.
On 7 May 2013 11:55, Jingoo Han <jg1.han@samsung.com> wrote:
> The driver core clears the driver data to NULL after device_release
> or on probe failure, since commit 0998d0631001288a5974afc0b2a5f568bcdecb4d
> (device-core: Ensure drvdata = NULL when no driver is bound).
> Thus, it is not needed to manually clear the device driver data to NULL.
>
> Signed-off-by: Jingoo Han <jg1.han@samsung.com>
> ---
>  drivers/mtd/devices/spear_smi.c |    5 +----
>  1 files changed, 1 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/mtd/devices/spear_smi.c b/drivers/mtd/devices/spear_smi.c
> index 8a82b8b..e290ef8 100644
> --- a/drivers/mtd/devices/spear_smi.c
> +++ b/drivers/mtd/devices/spear_smi.c
> @@ -995,14 +995,12 @@ static int spear_smi_probe(struct platform_device *pdev)
>                 ret = spear_smi_setup_banks(pdev, i, pdata->np[i]);
>                 if (ret) {
>                         dev_err(&dev->pdev->dev, "bank setup failed\n");
> -                       goto err_bank_setup;
> +                       goto err_irq;
>                 }
>         }
>
>         return 0;
>
> -err_bank_setup:
> -       platform_set_drvdata(pdev, NULL);
>  err_irq:
>         clk_disable_unprepare(dev->clk);
>  err:
> @@ -1040,7 +1038,6 @@ static int spear_smi_remove(struct platform_device *pdev)
>         }
>
>         clk_disable_unprepare(dev->clk);
> -       platform_set_drvdata(pdev, NULL);

Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Jingoo Han - June 25, 2013, 1:19 a.m.
On Tuesday, May 07, 2013 3:26 PM, Jingoo Han wrote:
> 
> The driver core clears the driver data to NULL after device_release
> or on probe failure, since commit 0998d0631001288a5974afc0b2a5f568bcdecb4d
> (device-core: Ensure drvdata = NULL when no driver is bound).
> Thus, it is not needed to manually clear the device driver data to NULL.
> 
> Signed-off-by: Jingoo Han <jg1.han@samsung.com>

Hi Artem Bityutskiy,

I will squash everything down into one patch with the ACKs,
and send it again.

Best regards,
Jingoo Han


> ---
>  drivers/mtd/devices/spear_smi.c |    5 +----
>  1 files changed, 1 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/mtd/devices/spear_smi.c b/drivers/mtd/devices/spear_smi.c
> index 8a82b8b..e290ef8 100644
> --- a/drivers/mtd/devices/spear_smi.c
> +++ b/drivers/mtd/devices/spear_smi.c
> @@ -995,14 +995,12 @@ static int spear_smi_probe(struct platform_device *pdev)
>  		ret = spear_smi_setup_banks(pdev, i, pdata->np[i]);
>  		if (ret) {
>  			dev_err(&dev->pdev->dev, "bank setup failed\n");
> -			goto err_bank_setup;
> +			goto err_irq;
>  		}
>  	}
> 
>  	return 0;
> 
> -err_bank_setup:
> -	platform_set_drvdata(pdev, NULL);
>  err_irq:
>  	clk_disable_unprepare(dev->clk);
>  err:
> @@ -1040,7 +1038,6 @@ static int spear_smi_remove(struct platform_device *pdev)
>  	}
> 
>  	clk_disable_unprepare(dev->clk);
> -	platform_set_drvdata(pdev, NULL);
> 
>  	return 0;
>  }
> --
> 1.7.2.5

Patch

diff --git a/drivers/mtd/devices/spear_smi.c b/drivers/mtd/devices/spear_smi.c
index 8a82b8b..e290ef8 100644
--- a/drivers/mtd/devices/spear_smi.c
+++ b/drivers/mtd/devices/spear_smi.c
@@ -995,14 +995,12 @@  static int spear_smi_probe(struct platform_device *pdev)
 		ret = spear_smi_setup_banks(pdev, i, pdata->np[i]);
 		if (ret) {
 			dev_err(&dev->pdev->dev, "bank setup failed\n");
-			goto err_bank_setup;
+			goto err_irq;
 		}
 	}
 
 	return 0;
 
-err_bank_setup:
-	platform_set_drvdata(pdev, NULL);
 err_irq:
 	clk_disable_unprepare(dev->clk);
 err:
@@ -1040,7 +1038,6 @@  static int spear_smi_remove(struct platform_device *pdev)
 	}
 
 	clk_disable_unprepare(dev->clk);
-	platform_set_drvdata(pdev, NULL);
 
 	return 0;
 }