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

Commit 8615e4cb authored by Andres Salomon's avatar Andres Salomon Committed by Samuel Ortiz
Browse files

mfd: mfd_cell is now implicitly available to janz drivers 



The cell's platform_data is now accessed with a helper function;
change clients to use that, and remove the now-unused data_size.

Signed-off-by: default avatarAndres Salomon <dilinger@queued.net>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 6a3521ad

drivers/gpio/janz-ttl.c

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

#include <linux/delay.h>

#include <linux/platform_device.h>

#include <linux/mfd/core.h>

#include <linux/io.h>

#include <linux/gpio.h>

#include <linux/slab.h>
@@ -149,7 +150,7 @@ static int __devinit ttl_probe(struct platform_device *pdev) 
	struct resource *res;

	int ret;



	pdata = pdev->dev.platform_data;

	pdata = mfd_get_data(pdev);

	if (!pdata) {

		dev_err(dev, "no platform data\n");

		ret = -ENXIO;

drivers/mfd/janz-cmodio.c

+0 −1
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ static int __devinit cmodio_setup_subdevice(struct cmodio_device *priv, 
	/* Add platform data */

	pdata->modno = modno;

	cell->platform_data = pdata;

	cell->data_size = sizeof(*pdata);



	/* MODULbus registers -- PCI BAR3 is big-endian MODULbus access */

	res->flags = IORESOURCE_MEM;

drivers/net/can/janz-ican3.c

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

#include <linux/delay.h>

#include <linux/platform_device.h>

#include <linux/mfd/core.h>



#include <linux/netdevice.h>

#include <linux/can.h>
@@ -1643,7 +1644,7 @@ static int __devinit ican3_probe(struct platform_device *pdev) 
	struct device *dev;

	int ret;



	pdata = pdev->dev.platform_data;

	pdata = mfd_get_data(pdev);

	if (!pdata)

		return -ENXIO;