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/mfd/asic3.c | |
| 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/mfd/asic3.c')
| -rw-r--r-- | drivers/mfd/asic3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c index bd97639cd83..388938ce3c9 100644 --- a/drivers/mfd/asic3.c +++ b/drivers/mfd/asic3.c @@ -682,7 +682,7 @@ static struct mfd_cell asic3_cell_ds1wm = { .name = "ds1wm", .enable = ds1wm_enable, .disable = ds1wm_disable, - .driver_data = &ds1wm_pdata, + .mfd_data = &ds1wm_pdata, .num_resources = ARRAY_SIZE(ds1wm_resources), .resources = ds1wm_resources, }; |