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

Commit 3d2bdf75 authored by Samuel Ortiz's avatar Samuel Ortiz
Browse files

mfd: Use mfd cell platform_data for janz 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: Ira W. Snyder <iws@ovro.caltech.edu>
Cc: Wolfgang Grandegger <wg@grandegger.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent c8a03c96

drivers/gpio/janz-ttl.c

+1 −2
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#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>
@@ -150,7 +149,7 @@ static int __devinit ttl_probe(struct platform_device *pdev) 
	struct resource *res;

	int ret;



	pdata = mfd_get_data(pdev);

	pdata = pdev->dev.platform_data;

	if (!pdata) {

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

		ret = -ENXIO;

drivers/mfd/janz-cmodio.c

+2 −1
Original line number Diff line number Diff line
@@ -86,7 +86,8 @@ static int __devinit cmodio_setup_subdevice(struct cmodio_device *priv, 


	/* Add platform data */

	pdata->modno = modno;

	cell->mfd_data = pdata;

	cell->platform_data = pdata;

	cell->pdata_size = sizeof(*pdata);



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

	res->flags = IORESOURCE_MEM;

drivers/net/can/janz-ican3.c

+1 −2
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#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>
@@ -1644,7 +1643,7 @@ static int __devinit ican3_probe(struct platform_device *pdev) 
	struct device *dev;

	int ret;



	pdata = mfd_get_data(pdev);

	pdata = pdev->dev.platform_data;

	if (!pdata)

		return -ENXIO;