Commit d8661921 authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Jeff Garzik
Browse files

sata_mv: use {platform|pci}_get_drvdata() 



The driver uses dev_get_drvdata() to get to the driver data for the
platform and PCI devices, while the corresponding wrappers exists for
them -- in one case it even declares an otherwise unneeded variable
to do that.  Switch to using the {platform|pci}_get_drvdata() instead.

Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent c00a4c9d

drivers/ata/sata_mv.c

+4 −5
Original line number Original line Diff line number Diff line
@@ -4113,8 +4113,7 @@ err: 
 */

 */

static int __devexit mv_platform_remove(struct platform_device *pdev)

static int __devexit mv_platform_remove(struct platform_device *pdev)

{

{

	struct device *dev = &pdev->dev;

	struct ata_host *host = platform_get_drvdata(pdev);

	struct ata_host *host = dev_get_drvdata(dev);

#if defined(CONFIG_HAVE_CLK)

#if defined(CONFIG_HAVE_CLK)

	struct mv_host_priv *hpriv = host->private_data;

	struct mv_host_priv *hpriv = host->private_data;

#endif

#endif
@@ -4132,7 +4131,7 @@ static int __devexit mv_platform_remove(struct platform_device *pdev) 
#ifdef CONFIG_PM

#ifdef CONFIG_PM

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

static int mv_platform_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)

	if (host)

		return ata_host_suspend(host, state);

		return ata_host_suspend(host, state);

	else

	else
@@ -4141,7 +4140,7 @@ static int mv_platform_suspend(struct platform_device *pdev, pm_message_t state) 




static int mv_platform_resume(struct platform_device *pdev)

static int mv_platform_resume(struct platform_device *pdev)

{

{

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

	struct ata_host *host = platform_get_drvdata(pdev);

	int ret;

	int ret;





	if (host) {

	if (host) {
@@ -4356,7 +4355,7 @@ static int mv_pci_init_one(struct pci_dev *pdev, 
#ifdef CONFIG_PM

#ifdef CONFIG_PM

static int mv_pci_device_resume(struct pci_dev *pdev)

static int mv_pci_device_resume(struct pci_dev *pdev)

{

{

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

	struct ata_host *host = pci_get_drvdata(pdev);

	int rc;

	int rc;





	rc = ata_pci_device_do_resume(pdev);

	rc = ata_pci_device_do_resume(pdev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE