aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-09-12 22:23:57 -0400
committerLee Jones <lee.jones@linaro.org>2013-10-23 11:20:56 -0400
commit7902fe8cbc58ae2bd3dad1a8ecf28ce83b1ba3a8 (patch)
treed128694f40be3ce2ce4443c1f4e6d26ab0192e08
parent928dfb2c750da3e1db181742198da4d9026012b0 (diff)
mfd: timberdale: 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. It also removes unnecessary label such as 'err_request'. Signed-off-by: Jingoo Han <jg1.han@samsung.com> Signed-off-by: Lee Jones <lee.jones@linaro.org>
-rw-r--r--drivers/mfd/timberdale.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/mfd/timberdale.c b/drivers/mfd/timberdale.c
index a6755ec7bd6a..dbb34f94e5e3 100644
--- a/drivers/mfd/timberdale.c
+++ b/drivers/mfd/timberdale.c
@@ -678,7 +678,7 @@ static int timb_probe(struct pci_dev *dev,
678 priv->ctl_mapbase = mapbase + CHIPCTLOFFSET; 678 priv->ctl_mapbase = mapbase + CHIPCTLOFFSET;
679 if (!request_mem_region(priv->ctl_mapbase, CHIPCTLSIZE, "timb-ctl")) { 679 if (!request_mem_region(priv->ctl_mapbase, CHIPCTLSIZE, "timb-ctl")) {
680 dev_err(&dev->dev, "Failed to request ctl mem\n"); 680 dev_err(&dev->dev, "Failed to request ctl mem\n");
681 goto err_request; 681 goto err_start;
682 } 682 }
683 683
684 priv->ctl_membase = ioremap(priv->ctl_mapbase, CHIPCTLSIZE); 684 priv->ctl_membase = ioremap(priv->ctl_mapbase, CHIPCTLSIZE);
@@ -828,13 +828,10 @@ err_config:
828 iounmap(priv->ctl_membase); 828 iounmap(priv->ctl_membase);
829err_ioremap: 829err_ioremap:
830 release_mem_region(priv->ctl_mapbase, CHIPCTLSIZE); 830 release_mem_region(priv->ctl_mapbase, CHIPCTLSIZE);
831err_request:
832 pci_set_drvdata(dev, NULL);
833err_start: 831err_start:
834 pci_disable_device(dev); 832 pci_disable_device(dev);
835err_enable: 833err_enable:
836 kfree(priv); 834 kfree(priv);
837 pci_set_drvdata(dev, NULL);
838 return -ENODEV; 835 return -ENODEV;
839} 836}
840 837
@@ -851,7 +848,6 @@ static void timb_remove(struct pci_dev *dev)
851 848
852 pci_disable_msix(dev); 849 pci_disable_msix(dev);
853 pci_disable_device(dev); 850 pci_disable_device(dev);
854 pci_set_drvdata(dev, NULL);
855 kfree(priv); 851 kfree(priv);
856} 852}
857 853