aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorAndres Salomon <dilinger@queued.net>2011-02-17 22:07:32 -0500
committerSamuel Ortiz <sameo@linux.intel.com>2011-03-23 05:41:57 -0400
commit46673ed2cdca85afa7c69d126e3778bba2dbd2d5 (patch)
treeefa841bea603b55905766cb2bcbd9a2e7232d940 /drivers/watchdog
parent6d90bdde4b7b8e0f403bc3641fcddea733bddf77 (diff)
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.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/watchdog/rdc321x_wdt.c b/drivers/watchdog/rdc321x_wdt.c
index 3939e53f5f98..d8e725082fdc 100644
--- a/drivers/watchdog/rdc321x_wdt.c
+++ b/drivers/watchdog/rdc321x_wdt.c
@@ -37,6 +37,7 @@
37#include <linux/io.h> 37#include <linux/io.h>
38#include <linux/uaccess.h> 38#include <linux/uaccess.h>
39#include <linux/mfd/rdc321x.h> 39#include <linux/mfd/rdc321x.h>
40#include <linux/mfd/core.h>
40 41
41#define RDC_WDT_MASK 0x80000000 /* Mask */ 42#define RDC_WDT_MASK 0x80000000 /* Mask */
42#define RDC_WDT_EN 0x00800000 /* Enable bit */ 43#define RDC_WDT_EN 0x00800000 /* Enable bit */
@@ -231,7 +232,7 @@ static int __devinit rdc321x_wdt_probe(struct platform_device *pdev)
231 struct resource *r; 232 struct resource *r;
232 struct rdc321x_wdt_pdata *pdata; 233 struct rdc321x_wdt_pdata *pdata;
233 234
234 pdata = platform_get_drvdata(pdev); 235 pdata = mfd_get_data(pdev);
235 if (!pdata) { 236 if (!pdata) {
236 dev_err(&pdev->dev, "no platform data supplied\n"); 237 dev_err(&pdev->dev, "no platform data supplied\n");
237 return -ENODEV; 238 return -ENODEV;