* [PATCH 2/9] input: ambakmi: Remove unnecessary amba_set_drvdata()
2013-10-03 9:46 [PATCH 1/9] dma: pl330: Remove unnecessary amba_set_drvdata() Michal Simek
@ 2013-10-03 9:46 ` Michal Simek
2013-10-03 9:46 ` [PATCH 3/9] ARM: etm: " Michal Simek
` (7 subsequent siblings)
8 siblings, 0 replies; 14+ messages in thread
From: Michal Simek @ 2013-10-03 9:46 UTC (permalink / raw)
To: linux-kernel, monstr; +Cc: Russell King, Dmitry Torokhov, linux-input
[-- Attachment #1: Type: text/plain, Size: 803 bytes --]
Driver core clears the driver data to NULL after device_release
or on probe failure, so just remove it from here.
Driver core change:
"device-core: Ensure drvdata = NULL when no driver is bound"
(sha1: 0998d0631001288a5974afc0b2a5f568bcdecb4d)
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
drivers/input/serio/ambakmi.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/input/serio/ambakmi.c b/drivers/input/serio/ambakmi.c
index 4e2fd44..b7c206d 100644
--- a/drivers/input/serio/ambakmi.c
+++ b/drivers/input/serio/ambakmi.c
@@ -167,8 +167,6 @@ static int amba_kmi_remove(struct amba_device *dev)
{
struct amba_kmi_port *kmi = amba_get_drvdata(dev);
- amba_set_drvdata(dev, NULL);
-
serio_unregister_port(kmi->io);
clk_put(kmi->clk);
iounmap(kmi->base);
--
1.8.2.3
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 3/9] ARM: etm: Remove unnecessary amba_set_drvdata()
2013-10-03 9:46 [PATCH 1/9] dma: pl330: Remove unnecessary amba_set_drvdata() Michal Simek
2013-10-03 9:46 ` [PATCH 2/9] input: ambakmi: " Michal Simek
@ 2013-10-03 9:46 ` Michal Simek
2013-10-03 9:46 ` [PATCH 4/9] mmc: mmci: " Michal Simek
` (6 subsequent siblings)
8 siblings, 0 replies; 14+ messages in thread
From: Michal Simek @ 2013-10-03 9:46 UTC (permalink / raw)
To: linux-kernel, monstr
Cc: linux-arm-kernel, Russell King, Andrew Morton, zhangwei(Jovi),
Greg Kroah-Hartman, Randy Dunlap
[-- Attachment #1: Type: text/plain, Size: 1166 bytes --]
Driver core clears the driver data to NULL after device_release
or on probe failure, so just remove it from here.
Driver core change:
"device-core: Ensure drvdata = NULL when no driver is bound"
(sha1: 0998d0631001288a5974afc0b2a5f568bcdecb4d)
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
arch/arm/kernel/etm.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/arch/arm/kernel/etm.c b/arch/arm/kernel/etm.c
index 8ff0ecd..131a6ab 100644
--- a/arch/arm/kernel/etm.c
+++ b/arch/arm/kernel/etm.c
@@ -385,7 +385,6 @@ out:
return ret;
out_unmap:
- amba_set_drvdata(dev, NULL);
iounmap(t->etb_regs);
out_release:
@@ -398,8 +397,6 @@ static int etb_remove(struct amba_device *dev)
{
struct tracectx *t = amba_get_drvdata(dev);
- amba_set_drvdata(dev, NULL);
-
iounmap(t->etb_regs);
t->etb_regs = NULL;
@@ -588,7 +585,6 @@ out:
return ret;
out_unmap:
- amba_set_drvdata(dev, NULL);
iounmap(t->etm_regs);
out_release:
@@ -601,8 +597,6 @@ static int etm_remove(struct amba_device *dev)
{
struct tracectx *t = amba_get_drvdata(dev);
- amba_set_drvdata(dev, NULL);
-
iounmap(t->etm_regs);
t->etm_regs = NULL;
--
1.8.2.3
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 4/9] mmc: mmci: Remove unnecessary amba_set_drvdata()
2013-10-03 9:46 [PATCH 1/9] dma: pl330: Remove unnecessary amba_set_drvdata() Michal Simek
2013-10-03 9:46 ` [PATCH 2/9] input: ambakmi: " Michal Simek
2013-10-03 9:46 ` [PATCH 3/9] ARM: etm: " Michal Simek
@ 2013-10-03 9:46 ` Michal Simek
2013-10-03 9:46 ` [PATCH 5/9] rtc: amba: " Michal Simek
` (5 subsequent siblings)
8 siblings, 0 replies; 14+ messages in thread
From: Michal Simek @ 2013-10-03 9:46 UTC (permalink / raw)
To: linux-kernel, monstr; +Cc: Russell King, Chris Ball, linux-mmc
[-- Attachment #1: Type: text/plain, Size: 746 bytes --]
Driver core clears the driver data to NULL after device_release
or on probe failure, so just remove it from here.
Driver core change:
"device-core: Ensure drvdata = NULL when no driver is bound"
(sha1: 0998d0631001288a5974afc0b2a5f568bcdecb4d)
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
drivers/mmc/host/mmci.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index c3785ed..07e17f1 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -1678,8 +1678,6 @@ static int mmci_remove(struct amba_device *dev)
{
struct mmc_host *mmc = amba_get_drvdata(dev);
- amba_set_drvdata(dev, NULL);
-
if (mmc) {
struct mmci_host *host = mmc_priv(mmc);
--
1.8.2.3
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 5/9] rtc: amba: Remove unnecessary amba_set_drvdata()
2013-10-03 9:46 [PATCH 1/9] dma: pl330: Remove unnecessary amba_set_drvdata() Michal Simek
` (2 preceding siblings ...)
2013-10-03 9:46 ` [PATCH 4/9] mmc: mmci: " Michal Simek
@ 2013-10-03 9:46 ` Michal Simek
2013-10-03 9:46 ` [PATCH 6/9] serial: " Michal Simek
` (4 subsequent siblings)
8 siblings, 0 replies; 14+ messages in thread
From: Michal Simek @ 2013-10-03 9:46 UTC (permalink / raw)
To: linux-kernel, monstr
Cc: Alessandro Zummo, Linus Walleij, rtc-linux, linux-arm-kernel
[-- Attachment #1: Type: text/plain, Size: 1373 bytes --]
Driver core clears the driver data to NULL after device_release
or on probe failure, so just remove it from here.
Driver core change:
"device-core: Ensure drvdata = NULL when no driver is bound"
(sha1: 0998d0631001288a5974afc0b2a5f568bcdecb4d)
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
drivers/rtc/rtc-pl030.c | 2 --
drivers/rtc/rtc-pl031.c | 2 --
2 files changed, 4 deletions(-)
diff --git a/drivers/rtc/rtc-pl030.c b/drivers/rtc/rtc-pl030.c
index 22bacdb..a804f75 100644
--- a/drivers/rtc/rtc-pl030.c
+++ b/drivers/rtc/rtc-pl030.c
@@ -153,8 +153,6 @@ static int pl030_remove(struct amba_device *dev)
{
struct pl030_rtc *rtc = amba_get_drvdata(dev);
- amba_set_drvdata(dev, NULL);
-
writel(0, rtc->base + RTC_CR);
free_irq(dev->irq[0], rtc);
diff --git a/drivers/rtc/rtc-pl031.c b/drivers/rtc/rtc-pl031.c
index 0f0609b..c9ca86e 100644
--- a/drivers/rtc/rtc-pl031.c
+++ b/drivers/rtc/rtc-pl031.c
@@ -305,7 +305,6 @@ static int pl031_remove(struct amba_device *adev)
{
struct pl031_local *ldata = dev_get_drvdata(&adev->dev);
- amba_set_drvdata(adev, NULL);
free_irq(adev->irq[0], ldata);
rtc_device_unregister(ldata->rtc);
iounmap(ldata->base);
@@ -392,7 +391,6 @@ out_no_irq:
rtc_device_unregister(ldata->rtc);
out_no_rtc:
iounmap(ldata->base);
- amba_set_drvdata(adev, NULL);
out_no_remap:
kfree(ldata);
out:
--
1.8.2.3
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 6/9] serial: Remove unnecessary amba_set_drvdata()
2013-10-03 9:46 [PATCH 1/9] dma: pl330: Remove unnecessary amba_set_drvdata() Michal Simek
` (3 preceding siblings ...)
2013-10-03 9:46 ` [PATCH 5/9] rtc: amba: " Michal Simek
@ 2013-10-03 9:46 ` Michal Simek
2013-10-03 9:46 ` [PATCH 7/9] spi: pl022: " Michal Simek
` (3 subsequent siblings)
8 siblings, 0 replies; 14+ messages in thread
From: Michal Simek @ 2013-10-03 9:46 UTC (permalink / raw)
To: linux-kernel, monstr
Cc: Greg Kroah-Hartman, linux-serial, Russell King, Jiri Slaby
[-- Attachment #1: Type: text/plain, Size: 1877 bytes --]
Driver core clears the driver data to NULL after device_release
or on probe failure, so just remove it from here.
Driver core change:
"device-core: Ensure drvdata = NULL when no driver is bound"
(sha1: 0998d0631001288a5974afc0b2a5f568bcdecb4d)
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
drivers/tty/serial/amba-pl010.c | 3 ---
drivers/tty/serial/amba-pl011.c | 3 ---
2 files changed, 6 deletions(-)
diff --git a/drivers/tty/serial/amba-pl010.c b/drivers/tty/serial/amba-pl010.c
index 8b90f0b..33bd860 100644
--- a/drivers/tty/serial/amba-pl010.c
+++ b/drivers/tty/serial/amba-pl010.c
@@ -728,7 +728,6 @@ static int pl010_probe(struct amba_device *dev, const struct amba_id *id)
amba_set_drvdata(dev, uap);
ret = uart_add_one_port(&amba_reg, &uap->port);
if (ret) {
- amba_set_drvdata(dev, NULL);
amba_ports[i] = NULL;
clk_put(uap->clk);
unmap:
@@ -745,8 +744,6 @@ static int pl010_remove(struct amba_device *dev)
struct uart_amba_port *uap = amba_get_drvdata(dev);
int i;
- amba_set_drvdata(dev, NULL);
-
uart_remove_one_port(&amba_reg, &uap->port);
for (i = 0; i < ARRAY_SIZE(amba_ports); i++)
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index aaa2286..7203864 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -2147,7 +2147,6 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id)
amba_set_drvdata(dev, uap);
ret = uart_add_one_port(&amba_reg, &uap->port);
if (ret) {
- amba_set_drvdata(dev, NULL);
amba_ports[i] = NULL;
pl011_dma_remove(uap);
}
@@ -2160,8 +2159,6 @@ static int pl011_remove(struct amba_device *dev)
struct uart_amba_port *uap = amba_get_drvdata(dev);
int i;
- amba_set_drvdata(dev, NULL);
-
uart_remove_one_port(&amba_reg, &uap->port);
for (i = 0; i < ARRAY_SIZE(amba_ports); i++)
--
1.8.2.3
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 7/9] spi: pl022: Remove unnecessary amba_set_drvdata()
2013-10-03 9:46 [PATCH 1/9] dma: pl330: Remove unnecessary amba_set_drvdata() Michal Simek
` (4 preceding siblings ...)
2013-10-03 9:46 ` [PATCH 6/9] serial: " Michal Simek
@ 2013-10-03 9:46 ` Michal Simek
2013-10-03 13:07 ` Mark Brown
2013-10-03 9:46 ` [PATCH 8/9] watchdog: sp805_wdt: " Michal Simek
` (2 subsequent siblings)
8 siblings, 1 reply; 14+ messages in thread
From: Michal Simek @ 2013-10-03 9:46 UTC (permalink / raw)
To: linux-kernel, monstr; +Cc: Mark Brown, linux-spi
[-- Attachment #1: Type: text/plain, Size: 754 bytes --]
Driver core clears the driver data to NULL after device_release
or on probe failure, so just remove it from here.
Driver core change:
"device-core: Ensure drvdata = NULL when no driver is bound"
(sha1: 0998d0631001288a5974afc0b2a5f568bcdecb4d)
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
drivers/spi/spi-pl022.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c
index 9c511a9..f661a7e 100644
--- a/drivers/spi/spi-pl022.c
+++ b/drivers/spi/spi-pl022.c
@@ -2288,7 +2288,6 @@ pl022_remove(struct amba_device *adev)
amba_release_regions(adev);
tasklet_disable(&pl022->pump_transfers);
spi_unregister_master(pl022->master);
- amba_set_drvdata(adev, NULL);
return 0;
}
--
1.8.2.3
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 8/9] watchdog: sp805_wdt: Remove unnecessary amba_set_drvdata()
2013-10-03 9:46 [PATCH 1/9] dma: pl330: Remove unnecessary amba_set_drvdata() Michal Simek
` (5 preceding siblings ...)
2013-10-03 9:46 ` [PATCH 7/9] spi: pl022: " Michal Simek
@ 2013-10-03 9:46 ` Michal Simek
2013-10-03 16:47 ` Guenter Roeck
2013-10-29 7:49 ` Wim Van Sebroeck
2013-10-03 9:46 ` [PATCH 9/9] video: amba-clcd: " Michal Simek
2013-10-31 14:25 ` [PATCH 1/9] dma: pl330: " Vinod Koul
8 siblings, 2 replies; 14+ messages in thread
From: Michal Simek @ 2013-10-03 9:46 UTC (permalink / raw)
To: linux-kernel, monstr; +Cc: Wim Van Sebroeck, linux-watchdog
[-- Attachment #1: Type: text/plain, Size: 809 bytes --]
Driver core clears the driver data to NULL after device_release
or on probe failure, so just remove it from here.
Driver core change:
"device-core: Ensure drvdata = NULL when no driver is bound"
(sha1: 0998d0631001288a5974afc0b2a5f568bcdecb4d)
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
drivers/watchdog/sp805_wdt.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/watchdog/sp805_wdt.c b/drivers/watchdog/sp805_wdt.c
index 58df98a..3f786ce 100644
--- a/drivers/watchdog/sp805_wdt.c
+++ b/drivers/watchdog/sp805_wdt.c
@@ -268,7 +268,6 @@ static int sp805_wdt_remove(struct amba_device *adev)
struct sp805_wdt *wdt = amba_get_drvdata(adev);
watchdog_unregister_device(&wdt->wdd);
- amba_set_drvdata(adev, NULL);
watchdog_set_drvdata(&wdt->wdd, NULL);
return 0;
--
1.8.2.3
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH 8/9] watchdog: sp805_wdt: Remove unnecessary amba_set_drvdata()
2013-10-03 9:46 ` [PATCH 8/9] watchdog: sp805_wdt: " Michal Simek
@ 2013-10-03 16:47 ` Guenter Roeck
2013-10-29 7:49 ` Wim Van Sebroeck
1 sibling, 0 replies; 14+ messages in thread
From: Guenter Roeck @ 2013-10-03 16:47 UTC (permalink / raw)
To: Michal Simek; +Cc: linux-kernel, monstr, Wim Van Sebroeck, linux-watchdog
On Thu, Oct 03, 2013 at 11:46:30AM +0200, Michal Simek wrote:
> Driver core clears the driver data to NULL after device_release
> or on probe failure, so just remove it from here.
>
> Driver core change:
> "device-core: Ensure drvdata = NULL when no driver is bound"
> (sha1: 0998d0631001288a5974afc0b2a5f568bcdecb4d)
>
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> ---
> drivers/watchdog/sp805_wdt.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/drivers/watchdog/sp805_wdt.c b/drivers/watchdog/sp805_wdt.c
> index 58df98a..3f786ce 100644
> --- a/drivers/watchdog/sp805_wdt.c
> +++ b/drivers/watchdog/sp805_wdt.c
> @@ -268,7 +268,6 @@ static int sp805_wdt_remove(struct amba_device *adev)
> struct sp805_wdt *wdt = amba_get_drvdata(adev);
>
> watchdog_unregister_device(&wdt->wdd);
> - amba_set_drvdata(adev, NULL);
> watchdog_set_drvdata(&wdt->wdd, NULL);
This one is quite unnecessary as well. The wdt data structure will be freed
as part of the removal. That could be a separate patch, though, so still
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
If you like, feel free to resubmit with the watchdog_set_drvdata() removed
and keep my Reviewed-by.
Thanks,
Guenter
>
> return 0;
> --
> 1.8.2.3
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 8/9] watchdog: sp805_wdt: Remove unnecessary amba_set_drvdata()
2013-10-03 9:46 ` [PATCH 8/9] watchdog: sp805_wdt: " Michal Simek
2013-10-03 16:47 ` Guenter Roeck
@ 2013-10-29 7:49 ` Wim Van Sebroeck
1 sibling, 0 replies; 14+ messages in thread
From: Wim Van Sebroeck @ 2013-10-29 7:49 UTC (permalink / raw)
To: Michal Simek; +Cc: linux-kernel, monstr, linux-watchdog
Hi Michal,
> Driver core clears the driver data to NULL after device_release
> or on probe failure, so just remove it from here.
>
> Driver core change:
> "device-core: Ensure drvdata = NULL when no driver is bound"
> (sha1: 0998d0631001288a5974afc0b2a5f568bcdecb4d)
>
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
This patch has been added to linux-watchdog-next.
Kind regards,
Wim.
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 9/9] video: amba-clcd: Remove unnecessary amba_set_drvdata()
2013-10-03 9:46 [PATCH 1/9] dma: pl330: Remove unnecessary amba_set_drvdata() Michal Simek
` (6 preceding siblings ...)
2013-10-03 9:46 ` [PATCH 8/9] watchdog: sp805_wdt: " Michal Simek
@ 2013-10-03 9:46 ` Michal Simek
2013-10-09 8:44 ` Tomi Valkeinen
2013-10-31 14:25 ` [PATCH 1/9] dma: pl330: " Vinod Koul
8 siblings, 1 reply; 14+ messages in thread
From: Michal Simek @ 2013-10-03 9:46 UTC (permalink / raw)
To: linux-kernel, monstr
Cc: Russell King, Jean-Christophe Plagniol-Villard, Tomi Valkeinen,
linux-fbdev
[-- Attachment #1: Type: text/plain, Size: 777 bytes --]
Driver core clears the driver data to NULL after device_release
or on probe failure, so just remove it from here.
Driver core change:
"device-core: Ensure drvdata = NULL when no driver is bound"
(sha1: 0998d0631001288a5974afc0b2a5f568bcdecb4d)
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
drivers/video/amba-clcd.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/video/amba-clcd.c b/drivers/video/amba-clcd.c
index 0a2cce7..0bab6ab 100644
--- a/drivers/video/amba-clcd.c
+++ b/drivers/video/amba-clcd.c
@@ -594,8 +594,6 @@ static int clcdfb_remove(struct amba_device *dev)
{
struct clcd_fb *fb = amba_get_drvdata(dev);
- amba_set_drvdata(dev, NULL);
-
clcdfb_disable(fb);
unregister_framebuffer(&fb->fb);
if (fb->fb.cmap.len)
--
1.8.2.3
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH 9/9] video: amba-clcd: Remove unnecessary amba_set_drvdata()
2013-10-03 9:46 ` [PATCH 9/9] video: amba-clcd: " Michal Simek
@ 2013-10-09 8:44 ` Tomi Valkeinen
0 siblings, 0 replies; 14+ messages in thread
From: Tomi Valkeinen @ 2013-10-09 8:44 UTC (permalink / raw)
To: Michal Simek
Cc: linux-kernel, monstr, Russell King,
Jean-Christophe Plagniol-Villard, linux-fbdev
[-- Attachment #1: Type: text/plain, Size: 944 bytes --]
On 03/10/13 12:46, Michal Simek wrote:
> Driver core clears the driver data to NULL after device_release
> or on probe failure, so just remove it from here.
>
> Driver core change:
> "device-core: Ensure drvdata = NULL when no driver is bound"
> (sha1: 0998d0631001288a5974afc0b2a5f568bcdecb4d)
>
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> ---
> drivers/video/amba-clcd.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/drivers/video/amba-clcd.c b/drivers/video/amba-clcd.c
> index 0a2cce7..0bab6ab 100644
> --- a/drivers/video/amba-clcd.c
> +++ b/drivers/video/amba-clcd.c
> @@ -594,8 +594,6 @@ static int clcdfb_remove(struct amba_device *dev)
> {
> struct clcd_fb *fb = amba_get_drvdata(dev);
>
> - amba_set_drvdata(dev, NULL);
> -
> clcdfb_disable(fb);
> unregister_framebuffer(&fb->fb);
> if (fb->fb.cmap.len)
> --
> 1.8.2.3
>
Thanks, queued for 3.13.
Tomi
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 901 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 1/9] dma: pl330: Remove unnecessary amba_set_drvdata()
2013-10-03 9:46 [PATCH 1/9] dma: pl330: Remove unnecessary amba_set_drvdata() Michal Simek
` (7 preceding siblings ...)
2013-10-03 9:46 ` [PATCH 9/9] video: amba-clcd: " Michal Simek
@ 2013-10-31 14:25 ` Vinod Koul
8 siblings, 0 replies; 14+ messages in thread
From: Vinod Koul @ 2013-10-31 14:25 UTC (permalink / raw)
To: Michal Simek; +Cc: linux-kernel, monstr, Dan Williams
[-- Attachment #1: Type: text/plain, Size: 1258 bytes --]
On Thu, Oct 03, 2013 at 11:46:23AM +0200, Michal Simek wrote:
> Driver core clears the driver data to NULL after device_release
> or on probe failure, so just remove it from here.
>
> Driver core change:
> "device-core: Ensure drvdata = NULL when no driver is bound"
> (sha1: 0998d0631001288a5974afc0b2a5f568bcdecb4d)
Applied thanks
--
~Vinod
>
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> ---
> drivers/dma/pl330.c | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
> index a562d24..dfb2931 100644
> --- a/drivers/dma/pl330.c
> +++ b/drivers/dma/pl330.c
> @@ -3029,8 +3029,6 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id)
>
> return 0;
> probe_err3:
> - amba_set_drvdata(adev, NULL);
> -
> /* Idle the DMAC */
> list_for_each_entry_safe(pch, _p, &pdmac->ddma.channels,
> chan.device_node) {
> @@ -3064,7 +3062,6 @@ static int pl330_remove(struct amba_device *adev)
> of_dma_controller_free(adev->dev.of_node);
>
> dma_async_device_unregister(&pdmac->ddma);
> - amba_set_drvdata(adev, NULL);
>
> /* Idle the DMAC */
> list_for_each_entry_safe(pch, _p, &pdmac->ddma.channels,
> --
> 1.8.2.3
>
--
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread