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

Commit 9abd768a authored by Samuel Ortiz's avatar Samuel Ortiz
Browse files

mfd: Use mfd cell platform_data for rdc321x cells platform bits 



With the addition of a platform device mfd_cell pointer, MFD drivers
can go back to passing platform data back to their sub drivers.
This allows for an mfd_cell->mfd_data removal and thus keep the
sub drivers MFD agnostic. This is mostly needed for non MFD aware
sub drivers.

Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Wim Van Sebroeck <wim@iguana.be>
Cc: Florian Fainelli <florian@openwrt.org>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 3271d382

drivers/gpio/rdc321x-gpio.c

+1 −2
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#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 {
@@ -136,7 +135,7 @@ static int __devinit rdc321x_gpio_probe(struct platform_device *pdev) 
	struct rdc321x_gpio *rdc321x_gpio_dev;

	struct rdc321x_gpio_pdata *pdata;



	pdata = mfd_get_data(pdev);

	pdata = pdev->dev.platform_data;

	if (!pdata) {

		dev_err(&pdev->dev, "no platform data supplied\n");

		return -ENODEV;

drivers/mfd/rdc321x-southbridge.c

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

		.resources	= rdc321x_wdt_resource,

		.num_resources	= ARRAY_SIZE(rdc321x_wdt_resource),

		.mfd_data	= &rdc321x_wdt_pdata,

		.platform_data	= &rdc321x_wdt_pdata,

		.pdata_size	= sizeof(rdc321x_wdt_pdata),

	}, {

		.name		= "rdc321x-gpio",

		.resources	= rdc321x_gpio_resources,

		.num_resources	= ARRAY_SIZE(rdc321x_gpio_resources),

		.mfd_data	= &rdc321x_gpio_pdata,

		.platform_data	= &rdc321x_gpio_pdata,

		.pdata_size	= sizeof(rdc321x_gpio_pdata),

	},

};

drivers/watchdog/rdc321x_wdt.c

+1 −2
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
#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 */
@@ -232,7 +231,7 @@ static int __devinit rdc321x_wdt_probe(struct platform_device *pdev) 
	struct resource *r;

	struct rdc321x_wdt_pdata *pdata;



	pdata = mfd_get_data(pdev);

	pdata = pdev->dev.platform_data;

	if (!pdata) {

		dev_err(&pdev->dev, "no platform data supplied\n");

		return -ENODEV;