diff options
author | Samuel Ortiz <sameo@linux.intel.com> | 2011-04-07 19:23:57 -0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-05-26 13:45:05 -0400 |
commit | 3271d382c3ffe61ef3d059ef47e635dbe031030e (patch) | |
tree | 2612b0030f0fd85ffe7722cbf195ac061a3eaf76 /drivers/media | |
parent | 7dc00a0d14992d0083fefccad7839ac837ea55bc (diff) |
mfd: Use mfd cell platform_data for timberdale cells platform bits
With the addition of a device platform 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.
Acked-by: Richard Röjfors <richard.rojfors@pelagicore.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/radio/radio-timb.c | 3 | ||||
-rw-r--r-- | drivers/media/video/timblogiw.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/radio/radio-timb.c b/drivers/media/radio/radio-timb.c index 1e3a8dd820a4..a185610b376b 100644 --- a/drivers/media/radio/radio-timb.c +++ b/drivers/media/radio/radio-timb.c | |||
@@ -21,7 +21,6 @@ | |||
21 | #include <media/v4l2-ioctl.h> | 21 | #include <media/v4l2-ioctl.h> |
22 | #include <media/v4l2-device.h> | 22 | #include <media/v4l2-device.h> |
23 | #include <linux/platform_device.h> | 23 | #include <linux/platform_device.h> |
24 | #include <linux/mfd/core.h> | ||
25 | #include <linux/interrupt.h> | 24 | #include <linux/interrupt.h> |
26 | #include <linux/slab.h> | 25 | #include <linux/slab.h> |
27 | #include <linux/i2c.h> | 26 | #include <linux/i2c.h> |
@@ -149,7 +148,7 @@ static const struct v4l2_file_operations timbradio_fops = { | |||
149 | 148 | ||
150 | static int __devinit timbradio_probe(struct platform_device *pdev) | 149 | static int __devinit timbradio_probe(struct platform_device *pdev) |
151 | { | 150 | { |
152 | struct timb_radio_platform_data *pdata = mfd_get_data(pdev); | 151 | struct timb_radio_platform_data *pdata = pdev->dev.platform_data; |
153 | struct timbradio *tr; | 152 | struct timbradio *tr; |
154 | int err; | 153 | int err; |
155 | 154 | ||
diff --git a/drivers/media/video/timblogiw.c b/drivers/media/video/timblogiw.c index 84d4c7c83435..fc611ebeb82c 100644 --- a/drivers/media/video/timblogiw.c +++ b/drivers/media/video/timblogiw.c | |||
@@ -24,7 +24,6 @@ | |||
24 | #include <linux/platform_device.h> | 24 | #include <linux/platform_device.h> |
25 | #include <linux/slab.h> | 25 | #include <linux/slab.h> |
26 | #include <linux/dmaengine.h> | 26 | #include <linux/dmaengine.h> |
27 | #include <linux/mfd/core.h> | ||
28 | #include <linux/scatterlist.h> | 27 | #include <linux/scatterlist.h> |
29 | #include <linux/interrupt.h> | 28 | #include <linux/interrupt.h> |
30 | #include <linux/list.h> | 29 | #include <linux/list.h> |
@@ -791,7 +790,7 @@ static int __devinit timblogiw_probe(struct platform_device *pdev) | |||
791 | { | 790 | { |
792 | int err; | 791 | int err; |
793 | struct timblogiw *lw = NULL; | 792 | struct timblogiw *lw = NULL; |
794 | struct timb_video_platform_data *pdata = mfd_get_data(pdev); | 793 | struct timb_video_platform_data *pdata = pdev->dev.platform_data; |
795 | 794 | ||
796 | if (!pdata) { | 795 | if (!pdata) { |
797 | dev_err(&pdev->dev, "No platform data\n"); | 796 | dev_err(&pdev->dev, "No platform data\n"); |