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

Commit 46673ed2 authored by Andres Salomon's avatar Andres Salomon Committed by Samuel Ortiz
Browse files

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: default avatarAndres Salomon <dilinger@queued.net>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 6d90bdde

drivers/gpio/rdc321x-gpio.c

+2 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <linux/pci.h>

#include <linux/gpio.h>

#include <linux/mfd/rdc321x.h>

#include <linux/mfd/core.h>

#include <linux/slab.h>



struct rdc321x_gpio {
@@ -135,7 +136,7 @@ static int __devinit rdc321x_gpio_probe(struct platform_device *pdev) 
	struct rdc321x_gpio *rdc321x_gpio_dev;

	struct rdc321x_gpio_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;

drivers/mfd/rdc321x-southbridge.c

+2 −2
Original line number Diff line number Diff line
@@ -61,12 +61,12 @@ static struct mfd_cell rdc321x_sb_cells[] = { 
		.name		= "rdc321x-wdt",

		.resources	= rdc321x_wdt_resource,

		.num_resources	= ARRAY_SIZE(rdc321x_wdt_resource),

		.driver_data	= &rdc321x_wdt_pdata,

		.mfd_data	= &rdc321x_wdt_pdata,

	}, {

		.name		= "rdc321x-gpio",

		.resources	= rdc321x_gpio_resources,

		.num_resources	= ARRAY_SIZE(rdc321x_gpio_resources),

		.driver_data	= &rdc321x_gpio_pdata,

		.mfd_data	= &rdc321x_gpio_pdata,

	},

};

drivers/watchdog/rdc321x_wdt.c

+2 −1
Original line number Diff line number Diff line
@@ -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;