diff options
author | Andres Salomon <dilinger@queued.net> | 2011-02-17 22:07:28 -0500 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-03-23 05:41:56 -0400 |
commit | fcd67979d3808afbe357048d928470ef9b37cd4b (patch) | |
tree | 82c9e45ff546c7f29bae0aaf554d34b5c3905e8c /drivers/w1 | |
parent | dab1547a011b221308b6e991405677c78e1a8956 (diff) |
w1: Use mfd_data instead of driver_data for dsw1wm.c
Use mfd_data for passing information from mfd drivers to mfd
clients. The mfd_cell's driver_data field is being phased out.
Clients that were using driver_data now access .mfd_data
via mfd_get_data(). This changes ds1wm only; mfd drivers with
other cells are not modified, with the exception of led_cell.
The led_cell.driver_data line is dropped from htc-pasic3.c in this
patch as well. It's not used in mainline (there's no leds-pasic3
platform driver), so it should be safe to take care of that here.
Signed-off-by: Andres Salomon <dilinger@queued.net>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/w1')
-rw-r--r-- | drivers/w1/masters/ds1wm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/w1/masters/ds1wm.c b/drivers/w1/masters/ds1wm.c index 94f55d80f9ac..22fc726feb9b 100644 --- a/drivers/w1/masters/ds1wm.c +++ b/drivers/w1/masters/ds1wm.c | |||
@@ -216,7 +216,7 @@ static int ds1wm_find_divisor(int gclk) | |||
216 | static void ds1wm_up(struct ds1wm_data *ds1wm_data) | 216 | static void ds1wm_up(struct ds1wm_data *ds1wm_data) |
217 | { | 217 | { |
218 | int divisor; | 218 | int divisor; |
219 | struct ds1wm_driver_data *plat = ds1wm_data->cell->driver_data; | 219 | struct ds1wm_driver_data *plat = mfd_get_data(ds1wm_data->pdev); |
220 | 220 | ||
221 | if (ds1wm_data->cell->enable) | 221 | if (ds1wm_data->cell->enable) |
222 | ds1wm_data->cell->enable(ds1wm_data->pdev); | 222 | ds1wm_data->cell->enable(ds1wm_data->pdev); |
@@ -356,7 +356,7 @@ static int ds1wm_probe(struct platform_device *pdev) | |||
356 | ret = -ENOMEM; | 356 | ret = -ENOMEM; |
357 | goto err0; | 357 | goto err0; |
358 | } | 358 | } |
359 | plat = cell->driver_data; | 359 | plat = mfd_get_data(pdev); |
360 | 360 | ||
361 | /* calculate bus shift from mem resource */ | 361 | /* calculate bus shift from mem resource */ |
362 | ds1wm_data->bus_shift = resource_size(res) >> 3; | 362 | ds1wm_data->bus_shift = resource_size(res) >> 3; |