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

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

mfd: mfd_cell is now implicitly available to timberdale 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.

Note that the mfd's platform_data is marked __devinitdata.  This
is still correct in all cases except for the timbgpio driver, whose
remove hook has been changed to no longer reference the pdata.

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

drivers/dma/timb_dma.c

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

#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/mfd/core.h>

#include <linux/slab.h>



#include <linux/timb_dma.h>
@@ -684,7 +685,7 @@ static irqreturn_t td_irq(int irq, void *devid) 


static int __devinit td_probe(struct platform_device *pdev)

{

	struct timb_dma_platform_data *pdata = pdev->dev.platform_data;

	struct timb_dma_platform_data *pdata = mfd_get_data(pdev);

	struct timb_dma *td;

	struct resource *iomem;

	int irq;

drivers/gpio/timbgpio.c

+3 −3
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/module.h>

#include <linux/gpio.h>

#include <linux/platform_device.h>

#include <linux/mfd/core.h>

#include <linux/irq.h>

#include <linux/io.h>

#include <linux/timb_gpio.h>
@@ -228,7 +229,7 @@ static int __devinit timbgpio_probe(struct platform_device *pdev) 
	struct gpio_chip *gc;

	struct timbgpio *tgpio;

	struct resource *iomem;

	struct timbgpio_platform_data *pdata = pdev->dev.platform_data;

	struct timbgpio_platform_data *pdata = mfd_get_data(pdev);

	int irq = platform_get_irq(pdev, 0);



	if (!pdata || pdata->nr_pins > 32) {
@@ -319,14 +320,13 @@ err_mem: 
static int __devexit timbgpio_remove(struct platform_device *pdev)

{

	int err;

	struct timbgpio_platform_data *pdata = pdev->dev.platform_data;

	struct timbgpio *tgpio = platform_get_drvdata(pdev);

	struct resource *iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	int irq = platform_get_irq(pdev, 0);



	if (irq >= 0 && tgpio->irq_base > 0) {

		int i;

		for (i = 0; i < pdata->nr_pins; i++) {

		for (i = 0; i < tgpio->gpio.ngpio; i++) {

			set_irq_chip(tgpio->irq_base + i, NULL);

			set_irq_chip_data(tgpio->irq_base + i, NULL);

		}

drivers/i2c/busses/i2c-ocores.c

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

#include <linux/errno.h>

#include <linux/platform_device.h>

#include <linux/mfd/core.h>

#include <linux/i2c.h>

#include <linux/interrupt.h>

#include <linux/wait.h>
@@ -305,7 +306,7 @@ static int __devinit ocores_i2c_probe(struct platform_device *pdev) 
		return -EIO;

	}



	pdata = pdev->dev.platform_data;

	pdata = mfd_get_data(pdev);

	if (pdata) {

		i2c->regstep = pdata->regstep;

		i2c->clock_khz = pdata->clock_khz;

drivers/i2c/busses/i2c-xiic.c

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

#include <linux/delay.h>

#include <linux/platform_device.h>

#include <linux/mfd/core.h>

#include <linux/i2c.h>

#include <linux/interrupt.h>

#include <linux/wait.h>
@@ -704,7 +705,7 @@ static int __devinit xiic_i2c_probe(struct platform_device *pdev) 
	if (irq < 0)

		goto resource_missing;



	pdata = (struct xiic_i2c_platform_data *) pdev->dev.platform_data;

	pdata = mfd_get_data(pdev);

	if (!pdata)

		return -EINVAL;

drivers/media/radio/radio-timb.c

+2 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <media/v4l2-ioctl.h>

#include <media/v4l2-device.h>

#include <linux/platform_device.h>

#include <linux/mfd/core.h>

#include <linux/interrupt.h>

#include <linux/slab.h>

#include <linux/i2c.h>
@@ -148,7 +149,7 @@ static const struct v4l2_file_operations timbradio_fops = { 


static int __devinit timbradio_probe(struct platform_device *pdev)

{

	struct timb_radio_platform_data *pdata = pdev->dev.platform_data;

	struct timb_radio_platform_data *pdata = mfd_get_data(pdev);

	struct timbradio *tr;

	int err;