aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2013-09-20 04:49:34 -0400
committerLee Jones <lee.jones@linaro.org>2013-10-23 11:21:07 -0400
commitaf1192d769a146328cabfe11916f107f35561ae8 (patch)
tree7276a41df16c775ad0d6d9b7f0f9e369ae280343 /drivers/mfd
parentbef781617691488472f31ca9e5978de5bd064c56 (diff)
mfd: mc12xx-i2c: rtsx_pcr: ti-ssp: Remove redundant dev_set_drvdata
Driver core sets driver data to NULL upon failure or remove. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/mc13xxx-i2c.c1
-rw-r--r--drivers/mfd/rtsx_pcr.c5
-rw-r--r--drivers/mfd/ti-ssp.c1
3 files changed, 1 insertions, 6 deletions
diff --git a/drivers/mfd/mc13xxx-i2c.c b/drivers/mfd/mc13xxx-i2c.c
index f745e27ee874..898bd335cd8e 100644
--- a/drivers/mfd/mc13xxx-i2c.c
+++ b/drivers/mfd/mc13xxx-i2c.c
@@ -78,7 +78,6 @@ static int mc13xxx_i2c_probe(struct i2c_client *client,
78 ret = PTR_ERR(mc13xxx->regmap); 78 ret = PTR_ERR(mc13xxx->regmap);
79 dev_err(mc13xxx->dev, "Failed to initialize register map: %d\n", 79 dev_err(mc13xxx->dev, "Failed to initialize register map: %d\n",
80 ret); 80 ret);
81 dev_set_drvdata(&client->dev, NULL);
82 return ret; 81 return ret;
83 } 82 }
84 83
diff --git a/drivers/mfd/rtsx_pcr.c b/drivers/mfd/rtsx_pcr.c
index e6ae7720f9e1..11e20afbdcac 100644
--- a/drivers/mfd/rtsx_pcr.c
+++ b/drivers/mfd/rtsx_pcr.c
@@ -1149,7 +1149,7 @@ static int rtsx_pci_probe(struct pci_dev *pcidev,
1149 pcr->remap_addr = ioremap_nocache(base, len); 1149 pcr->remap_addr = ioremap_nocache(base, len);
1150 if (!pcr->remap_addr) { 1150 if (!pcr->remap_addr) {
1151 ret = -ENOMEM; 1151 ret = -ENOMEM;
1152 goto free_host; 1152 goto free_handle;
1153 } 1153 }
1154 1154
1155 pcr->rtsx_resv_buf = dma_alloc_coherent(&(pcidev->dev), 1155 pcr->rtsx_resv_buf = dma_alloc_coherent(&(pcidev->dev),
@@ -1209,8 +1209,6 @@ disable_msi:
1209 pcr->rtsx_resv_buf, pcr->rtsx_resv_buf_addr); 1209 pcr->rtsx_resv_buf, pcr->rtsx_resv_buf_addr);
1210unmap: 1210unmap:
1211 iounmap(pcr->remap_addr); 1211 iounmap(pcr->remap_addr);
1212free_host:
1213 dev_set_drvdata(&pcidev->dev, NULL);
1214free_handle: 1212free_handle:
1215 kfree(handle); 1213 kfree(handle);
1216free_pcr: 1214free_pcr:
@@ -1242,7 +1240,6 @@ static void rtsx_pci_remove(struct pci_dev *pcidev)
1242 pci_disable_msi(pcr->pci); 1240 pci_disable_msi(pcr->pci);
1243 iounmap(pcr->remap_addr); 1241 iounmap(pcr->remap_addr);
1244 1242
1245 dev_set_drvdata(&pcidev->dev, NULL);
1246 pci_release_regions(pcidev); 1243 pci_release_regions(pcidev);
1247 pci_disable_device(pcidev); 1244 pci_disable_device(pcidev);
1248 1245
diff --git a/drivers/mfd/ti-ssp.c b/drivers/mfd/ti-ssp.c
index 1c2b994e1f6c..71e3e0c5bf73 100644
--- a/drivers/mfd/ti-ssp.c
+++ b/drivers/mfd/ti-ssp.c
@@ -445,7 +445,6 @@ static int ti_ssp_remove(struct platform_device *pdev)
445 iounmap(ssp->regs); 445 iounmap(ssp->regs);
446 release_mem_region(ssp->res->start, resource_size(ssp->res)); 446 release_mem_region(ssp->res->start, resource_size(ssp->res));
447 kfree(ssp); 447 kfree(ssp);
448 dev_set_drvdata(dev, NULL);
449 return 0; 448 return 0;
450} 449}
451 450