summaryrefslogtreecommitdiff
path: root/drivers/mfd/htc-pasic3.c
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2011-04-06 13:41:03 +0400
committerSamuel Ortiz <sameo@linux.intel.com>2011-05-26 21:45:00 +0400
commit121ea573aeb7e9b1d79effa8ef7970031aebda12 (patch)
treecbde4018e74e37fb4697ae5a9f1eb0a0096fae8b /drivers/mfd/htc-pasic3.c
parentec71974f2a3ae052cdbb57a92ce3c3b34ebd7b5d (diff)
downloadlinux-121ea573aeb7e9b1d79effa8ef7970031aebda12.tar.xz
w1: Use device platform_data to retrieve ds1wm platform bits
With the addition of the platform device mfd_cell pointer, we can now cleanly pass the sub device drivers platform data pointers through the regular device platform_data one, and get rid of mfd_get_data(). Cc: Matt Reimer <mreimer@vpop.net> Cc: Philipp Zabel <philipp.zabel@gmail.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/htc-pasic3.c')
-rw-r--r--drivers/mfd/htc-pasic3.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mfd/htc-pasic3.c b/drivers/mfd/htc-pasic3.c
index fb9770b39a32..95a4ff48b282 100644
--- a/drivers/mfd/htc-pasic3.c
+++ b/drivers/mfd/htc-pasic3.c
@@ -117,7 +117,8 @@ static struct mfd_cell ds1wm_cell __initdata = {
.name = "ds1wm",
.enable = ds1wm_enable,
.disable = ds1wm_disable,
- .mfd_data = &ds1wm_pdata,
+ .platform_data = &ds1wm_pdata,
+ .pdata_size = sizeof(ds1wm_pdata),
.num_resources = 2,
.resources = ds1wm_resources,
};