mfd: lpc_ich: remove unnecessary pci_set_drvdata()
Subsystems (2)
PATCH 1/3 mfd: lpc_ich: remove unnecessary pci_set_drvdata()
The driver core clears the driver data to NULL after device_release or on probe failure. Thus, it is not needed to manually clear the device driver data to NULL.
--- drivers/mfd/lpc_ich.c | 2 -- 1 file changed, 2 deletions(-)
drivers/mfd/lpc_ich.c +0 -2
@@ -969,7 +969,6 @@ static int lpc_ich_probe(struct pci_dev *dev,if (!cell_added) {dev_warn (&dev->dev,"No MFD cells added\n" );lpc_ich_restore_config_space (dev); -pci_set_drvdata (dev,NULL );return -ENODEV ; }
@@ -980,7 +979,6 @@ static void lpc_ich_remove(struct pci_dev *dev) {mfd_remove_devices (&dev->dev);lpc_ich_restore_config_space (dev); -pci_set_drvdata (dev,NULL ); }static struct pci_driver lpc_ich_driver = {
Signature · 1 line
1.7.10.4
PATCH 2/3 mfd: sm501: remove unnecessary pci_set_drvdata()
The driver core clears the driver data to NULL after device_release or on probe failure. Thus, it is not needed to manually clear the device driver data to NULL.
--- drivers/mfd/sm501.c | 2 -- 1 file changed, 2 deletions(-)
drivers/mfd/sm501.c +0 -2
@@ -1660,7 +1660,6 @@ static int sm501_pci_probe(struct pci_dev *dev, err3:pci_disable_device (dev); err2: -pci_set_drvdata (dev,NULL );kfree (sm); err1:return err;
@@ -1695,7 +1694,6 @@ static void sm501_pci_remove(struct pci_dev *dev)release_resource (sm->regs_claim);kfree (sm->regs_claim); -pci_set_drvdata (dev,NULL );pci_disable_device (dev); }
Signature · 1 line
1.7.10.4
Lee Jones
AppliedRe: [PATCH 2/3] mfd: sm501: remove unnecessary pci_set_drvdata()
Quoted 8 lines · Jingoo Han
The driver core clears the driver data to NULL after
device_releaseor on probe failure. Thus, it is not needed to manually clear the device driver data to NULL.Signed-off-by Jingoo Han <[email protected]>--- drivers/mfd/sm501.c | 2 -- 1 file changed, 2 deletions(-)
Applied, thanks.
Signature · 4 lines
Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
PATCH 3/3 mfd: timberdale: remove unnecessary pci_set_drvdata()
In reply to Jingoo HanThe driver core clears the driver data to NULL after device_release or on probe failure. Thus, it is not needed to manually clear the device driver data to NULL.
--- drivers/mfd/timberdale.c | 3 --- 1 file changed, 3 deletions(-)
drivers/mfd/timberdale.c +0 -3
@@ -829,12 +829,10 @@ err_config: err_ioremap:release_mem_region (priv->ctl_mapbase,CHIPCTLSIZE ); err_request: -pci_set_drvdata (dev,NULL ); err_start:pci_disable_device (dev); err_enable:kfree (priv); -pci_set_drvdata (dev,NULL );return -ENODEV ; }
@@ -851,7 +849,6 @@ static void timb_remove(struct pci_dev *dev)pci_disable_msix (dev);pci_disable_device (dev); -pci_set_drvdata (dev,NULL );kfree (priv); }
Signature · 1 line
1.7.10.4
Re: [PATCH 3/3] mfd: timberdale: remove unnecessary pci_set_drvdata()
Quoted 14 lines · Jingoo Han
The driver core clears the driver data to NULL after
device_releaseor on probe failure. Thus, it is not needed to manually clear the device driver data to NULL.Signed-off-by Jingoo Han <[email protected]>--- drivers/mfd/timberdale.c | 3 --- 1 file changed, 3 deletions(-)drivers/mfd/timberdale.c +0
-0
drivers/mfd/timberdale.c err_config: · line 832
Quoted 4 lines
drivers/mfd/timberdale.c +0
-1@@ -829,12 +829,10 @@ err_config: err_ioremap:release_mem_region (priv->ctl_mapbase,CHIPCTLSIZE ); err_request: -pci_set_drvdata (dev,NULL );
So now err_request is redundant.
Can you clean that up in this patch also please?
Quoted 16 lines
drivers/mfd/timberdale.c +0
-2err_start:pci_disable_device (dev); err_enable:kfree (priv); -pci_set_drvdata (dev,NULL );return -ENODEV ; }@@ -851,7 +849,6 @@ static void timb_remove(struct pci_dev *dev)pci_disable_msix (dev);pci_disable_device (dev); -pci_set_drvdata (dev,NULL );kfree (priv); }
Signature · 4 lines
Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
PATCH v2 1/1 mfd: timberdale: remove unnecessary pci_set_drvdata()
In reply to Jingoo HanThe driver core clears the driver data to NULL after device_release or on probe failure. Thus, it is not needed to manually clear the device driver data to NULL. It also removes unnecessary label such as 'err_request'.
---
Changes since v1:
- Removed unnecessary label such as 'err_request'.
drivers/mfd/timberdale.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/mfd/timberdale.c +1 -5
@@ -678,7 +678,7 @@ static int timb_probe(struct pci_dev *dev, priv->ctl_mapbase = mapbase +CHIPCTLOFFSET ;if (!request_mem_region (priv->ctl_mapbase,CHIPCTLSIZE ,"timb-ctl" )) {dev_err (&dev->dev,"Failed to request ctl mem\n" ); - goto err_request; + goto err_start; } priv->ctl_membase =ioremap (priv->ctl_mapbase,CHIPCTLSIZE );
@@ -828,13 +828,10 @@ err_config:iounmap (priv->ctl_membase); err_ioremap:release_mem_region (priv->ctl_mapbase,CHIPCTLSIZE ); -err_request: -pci_set_drvdata (dev,NULL ); err_start:pci_disable_device (dev); err_enable:kfree (priv); -pci_set_drvdata (dev,NULL );return -ENODEV ; }
@@ -851,7 +848,6 @@ static void timb_remove(struct pci_dev *dev)pci_disable_msix (dev);pci_disable_device (dev); -pci_set_drvdata (dev,NULL );kfree (priv); }
Signature · 1 line
1.7.10.4
Lee Jones
AppliedRe: [PATCH V2] mfd: timberdale: remove unnecessary pci_set_drvdata()
drivers/mfd/timberdale.c
Quoted 14 lines · Jingoo Han
The driver core clears the driver data to NULL after
device_releaseor on probe failure. Thus, it is not needed to manually clear the device driver data to NULL. It also removes unnecessary label such as 'err_request'.Signed-off-by Jingoo Han <[email protected]>---
Changes since v1:
- Removed unnecessary label such as 'err_request'.drivers/mfd/timberdale.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)drivers/mfd/timberdale.c +0
-0
Looks fine to me now.
Applied, thanks.
Signature · 4 lines
Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
Lee Jones
Applieddrivers/mfd/lpc_ich.c
Quoted 10 lines · Jingoo Han
The driver core clears the driver data to NULL after
device_releaseor on probe failure. Thus, it is not needed to manually clear the device driver data to NULL.Signed-off-by Jingoo Han <[email protected]>--- drivers/mfd/lpc_ich.c | 2 -- 1 file changed, 2 deletions(-)drivers/mfd/lpc_ich.c +0
-0
Applied, thanks.
Signature · 4 lines
Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog