s3fb: fix error return code in s3_pci_probe()

[~andy/linux] / drivers / mfd / t7l66xb.c

diff --git a/drivers/mfd/t7l66xb.c b/drivers/mfd/t7l66xb.c
index a21bff283a98fa7d5637e2f9ebc9ba6e94a602c7..9e04a74859818bd0016dfd6a60bbcd94669a4248 100644 (file)
--- a/drivers/mfd/t7l66xb.c
+++ b/drivers/mfd/t7l66xb.c
@@ -281,7 +281,7 @@ static void t7l66xb_detach_irq(struct platform_device *dev)
 static int t7l66xb_suspend(struct platform_device *dev, pm_message_t state)
 {
        struct t7l66xb *t7l66xb = platform_get_drvdata(dev);
-       struct t7l66xb_platform_data *pdata = dev->dev.platform_data;
+       struct t7l66xb_platform_data *pdata = dev_get_platdata(&dev->dev);
 
        if (pdata && pdata->suspend)
                pdata->suspend(dev);
@@ -293,7 +293,7 @@ static int t7l66xb_suspend(struct platform_device *dev, pm_message_t state)
 static int t7l66xb_resume(struct platform_device *dev)
 {
        struct t7l66xb *t7l66xb = platform_get_drvdata(dev);
-       struct t7l66xb_platform_data *pdata = dev->dev.platform_data;
+       struct t7l66xb_platform_data *pdata = dev_get_platdata(&dev->dev);
 
        clk_enable(t7l66xb->clk48m);
        if (pdata && pdata->resume)
@@ -313,7 +313,7 @@ static int t7l66xb_resume(struct platform_device *dev)
 
 static int t7l66xb_probe(struct platform_device *dev)
 {
-       struct t7l66xb_platform_data *pdata = dev->dev.platform_data;
+       struct t7l66xb_platform_data *pdata = dev_get_platdata(&dev->dev);
        struct t7l66xb *t7l66xb;
        struct resource *iomem, *rscr;
        int ret;
@@ -409,7 +409,7 @@ err_noirq:
 
 static int t7l66xb_remove(struct platform_device *dev)
 {
-       struct t7l66xb_platform_data *pdata = dev->dev.platform_data;
+       struct t7l66xb_platform_data *pdata = dev_get_platdata(&dev->dev);
        struct t7l66xb *t7l66xb = platform_get_drvdata(dev);
        int ret;