diff options
| author | Andres Salomon <dilinger@queued.net> | 2011-02-17 19:07:32 -0800 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-03-23 10:41:57 +0100 |
| commit | 46673ed2cdca85afa7c69d126e3778bba2dbd2d5 (patch) | |
| tree | efa841bea603b55905766cb2bcbd9a2e7232d940 /drivers/watchdog | |
| parent | 6d90bdde4b7b8e0f403bc3641fcddea733bddf77 (diff) | |
| download | kernel_goldelico_gta04-46673ed2cdca85afa7c69d126e3778bba2dbd2d5.zip kernel_goldelico_gta04-46673ed2cdca85afa7c69d126e3778bba2dbd2d5.tar.gz kernel_goldelico_gta04-46673ed2cdca85afa7c69d126e3778bba2dbd2d5.tar.bz2 | |
rdc321x-southbridge: Use mfd_data instead of driver_data
Use mfd_data for passing information from mfd drivers to soc
clients. The mfd_cell's driver_data field is being phased out.
Clients that were using driver_data now access .mfd_data
via mfd_get_data().
Signed-off-by: Andres Salomon <dilinger@queued.net>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/watchdog')
| -rw-r--r-- | drivers/watchdog/rdc321x_wdt.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/watchdog/rdc321x_wdt.c b/drivers/watchdog/rdc321x_wdt.c index 3939e53..d8e7250 100644 --- a/drivers/watchdog/rdc321x_wdt.c +++ b/drivers/watchdog/rdc321x_wdt.c @@ -37,6 +37,7 @@ #include <linux/io.h> #include <linux/uaccess.h> #include <linux/mfd/rdc321x.h> +#include <linux/mfd/core.h> #define RDC_WDT_MASK 0x80000000 /* Mask */ #define RDC_WDT_EN 0x00800000 /* Enable bit */ @@ -231,7 +232,7 @@ static int __devinit rdc321x_wdt_probe(struct platform_device *pdev) struct resource *r; struct rdc321x_wdt_pdata *pdata; - pdata = platform_get_drvdata(pdev); + pdata = mfd_get_data(pdev); if (!pdata) { dev_err(&pdev->dev, "no platform data supplied\n"); return -ENODEV; |