Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af1192d7 authored by Sachin Kamat's avatar Sachin Kamat Committed by Lee Jones
Browse files

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: default avatarSachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent bef78161

drivers/mfd/mc13xxx-i2c.c

+0 −1
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ static int mc13xxx_i2c_probe(struct i2c_client *client, 
		ret = PTR_ERR(mc13xxx->regmap);

		dev_err(mc13xxx->dev, "Failed to initialize register map: %d\n",

				ret);

		dev_set_drvdata(&client->dev, NULL);

		return ret;

	}

drivers/mfd/rtsx_pcr.c

+1 −4
Original line number Diff line number Diff line
@@ -1149,7 +1149,7 @@ static int rtsx_pci_probe(struct pci_dev *pcidev, 
	pcr->remap_addr = ioremap_nocache(base, len);

	if (!pcr->remap_addr) {

		ret = -ENOMEM;

		goto free_host;

		goto free_handle;

	}



	pcr->rtsx_resv_buf = dma_alloc_coherent(&(pcidev->dev),
@@ -1209,8 +1209,6 @@ static int rtsx_pci_probe(struct pci_dev *pcidev, 
			pcr->rtsx_resv_buf, pcr->rtsx_resv_buf_addr);

unmap:

	iounmap(pcr->remap_addr);

free_host:

	dev_set_drvdata(&pcidev->dev, NULL);

free_handle:

	kfree(handle);

free_pcr:
@@ -1242,7 +1240,6 @@ static void rtsx_pci_remove(struct pci_dev *pcidev) 
		pci_disable_msi(pcr->pci);

	iounmap(pcr->remap_addr);



	dev_set_drvdata(&pcidev->dev, NULL);

	pci_release_regions(pcidev);

	pci_disable_device(pcidev);

drivers/mfd/ti-ssp.c

+0 −1
Original line number Diff line number Diff line
@@ -445,7 +445,6 @@ static int ti_ssp_remove(struct platform_device *pdev) 
	iounmap(ssp->regs);

	release_mem_region(ssp->res->start, resource_size(ssp->res));

	kfree(ssp);

	dev_set_drvdata(dev, NULL);

	return 0;

}