diff options
| author | Andres Salomon <dilinger@queued.net> | 2011-02-17 19:07:28 -0800 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-03-23 10:41:56 +0100 |
| commit | fcd67979d3808afbe357048d928470ef9b37cd4b (patch) | |
| tree | 82c9e45ff546c7f29bae0aaf554d34b5c3905e8c /drivers/w1 | |
| parent | dab1547a011b221308b6e991405677c78e1a8956 (diff) | |
| download | linux-3.10-fcd67979d3808afbe357048d928470ef9b37cd4b.tar.gz linux-3.10-fcd67979d3808afbe357048d928470ef9b37cd4b.tar.bz2 linux-3.10-fcd67979d3808afbe357048d928470ef9b37cd4b.zip | |
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 94f55d80f9a..22fc726feb9 100644 --- a/drivers/w1/masters/ds1wm.c +++ b/drivers/w1/masters/ds1wm.c @@ -216,7 +216,7 @@ static int ds1wm_find_divisor(int gclk) static void ds1wm_up(struct ds1wm_data *ds1wm_data) { int divisor; - struct ds1wm_driver_data *plat = ds1wm_data->cell->driver_data; + struct ds1wm_driver_data *plat = mfd_get_data(ds1wm_data->pdev); if (ds1wm_data->cell->enable) ds1wm_data->cell->enable(ds1wm_data->pdev); @@ -356,7 +356,7 @@ static int ds1wm_probe(struct platform_device *pdev) ret = -ENOMEM; goto err0; } - plat = cell->driver_data; + plat = mfd_get_data(pdev); /* calculate bus shift from mem resource */ ds1wm_data->bus_shift = resource_size(res) >> 3; |