janz: mfd_cell is now implicitly available to drivers

PATCH In review Andres Salomon 1 participant 1 message Feb 12, 2011

Subsystems (5)

Networking Network drivers GPIO Multifunction devices (MFD) +1 more subsystems

lore

Share & tools

lore

Andres Salomon

author

2011-02-12 02:17 UTC #0 lore raw

PATCH 15/17 janz: mfd_cell is now implicitly available to 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 <[email protected]>

---
 drivers/gpio/janz-ttl.c      |    2 +-
 drivers/mfd/janz-cmodio.c    |    1 -
 drivers/net/can/janz-ican3.c |    2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

drivers/gpio/janz-ttl.c +1 -1

index 813ac07..ef399ee 100644
@@ -149,7 +149,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

index 36a166b..58de1e2 100644
@@ -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 +1 -1

index 366f5cc..bc2b15b 100644
@@ -1643,7 +1643,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;

Signature · 1 line

1.7.2.3