mirror of
https://github.com/FEX-Emu/linux.git
synced 2025-01-18 23:59:53 +00:00
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: Andres Salomon <dilinger@queued.net> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
parent
6a3521ad3d
commit
8615e4cba1
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user