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

Commit d89995db authored by Jingoo Han's avatar Jingoo Han Committed by Tejun Heo
Browse files

ata: use platform_{get,set}_drvdata() 



Use the wrapper functions for getting and setting the driver data using
platform_device instead of using dev_{get,set}_drvdata() with &pdev->dev,
so we can directly pass a struct platform_device.

Also, unnecessary dev_set_drvdata() is removed, because the driver core
clears the driver data to NULL after device_release or on probe failure.

Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent b29900e6

drivers/ata/pata_arasan_cf.c

+1 −1
Original line number Diff line number Diff line
@@ -908,7 +908,7 @@ static int arasan_cf_probe(struct platform_device *pdev) 


static int arasan_cf_remove(struct platform_device *pdev)

{

	struct ata_host *host = dev_get_drvdata(&pdev->dev);

	struct ata_host *host = platform_get_drvdata(pdev);

	struct arasan_cf_dev *acdev = host->ports[0]->private_data;



	ata_host_detach(host);

drivers/ata/pata_at91.c

+1 −1
Original line number Diff line number Diff line
@@ -422,7 +422,7 @@ static int pata_at91_probe(struct platform_device *pdev) 


static int pata_at91_remove(struct platform_device *pdev)

{

	struct ata_host *host = dev_get_drvdata(&pdev->dev);

	struct ata_host *host = platform_get_drvdata(pdev);

	struct at91_ide_info *info;



	if (!host)

drivers/ata/pata_bf54x.c

+4 −6
Original line number Diff line number Diff line
@@ -1596,7 +1596,7 @@ static int bfin_atapi_probe(struct platform_device *pdev) 
		return -ENODEV;

	}



	dev_set_drvdata(&pdev->dev, host);

	platform_set_drvdata(pdev, host);



	return 0;

}
@@ -1610,11 +1610,9 @@ static int bfin_atapi_probe(struct platform_device *pdev) 
 */

static int bfin_atapi_remove(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct ata_host *host = dev_get_drvdata(dev);

	struct ata_host *host = platform_get_drvdata(pdev);



	ata_host_detach(host);

	dev_set_drvdata(&pdev->dev, NULL);



	peripheral_free_list(atapi_io_port);
@@ -1624,7 +1622,7 @@ static int bfin_atapi_remove(struct platform_device *pdev) 
#ifdef CONFIG_PM

static int bfin_atapi_suspend(struct platform_device *pdev, pm_message_t state)

{

	struct ata_host *host = dev_get_drvdata(&pdev->dev);

	struct ata_host *host = platform_get_drvdata(pdev);

	if (host)

		return ata_host_suspend(host, state);

	else
@@ -1633,7 +1631,7 @@ static int bfin_atapi_suspend(struct platform_device *pdev, pm_message_t state) 


static int bfin_atapi_resume(struct platform_device *pdev)

{

	struct ata_host *host = dev_get_drvdata(&pdev->dev);

	struct ata_host *host = platform_get_drvdata(pdev);

	int ret;



	if (host) {

drivers/ata/pata_imx.c

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ static int pata_imx_probe(struct platform_device *pdev) 


static int pata_imx_remove(struct platform_device *pdev)

{

	struct ata_host *host = dev_get_drvdata(&pdev->dev);

	struct ata_host *host = platform_get_drvdata(pdev);

	struct pata_imx_priv *priv = host->private_data;



	ata_host_detach(host);

drivers/ata/pata_mpc52xx.c

+2 −2
Original line number Diff line number Diff line
@@ -825,7 +825,7 @@ mpc52xx_ata_remove(struct platform_device *op) 
static int

mpc52xx_ata_suspend(struct platform_device *op, pm_message_t state)

{

	struct ata_host *host = dev_get_drvdata(&op->dev);

	struct ata_host *host = platform_get_drvdata(op);



	return ata_host_suspend(host, state);

}
@@ -833,7 +833,7 @@ mpc52xx_ata_suspend(struct platform_device *op, pm_message_t state) 
static int

mpc52xx_ata_resume(struct platform_device *op)

{

	struct ata_host *host = dev_get_drvdata(&op->dev);

	struct ata_host *host = platform_get_drvdata(op);

	struct mpc52xx_ata_priv *priv = host->private_data;

	int rv;