Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

w1: Use mfd_data instead of driver_data for dsw1wm.c

Browse source 
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>
This commit is contained in:
Andres Salomon 2011-02-17 19:07:28 -08:00 committed by Samuel Ortiz
parent dab1547a01
commit fcd67979d3
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/mfd/asic3.c
View file

@ -682,7 +682,7 @@ static struct mfd_cell asic3_cell_ds1wm = {
.name = "ds1wm", .name = "ds1wm",
.enable = ds1wm_enable, .enable = ds1wm_enable,
.disable = ds1wm_disable, .disable = ds1wm_disable,
.driver_data = &ds1wm_pdata, .mfd_data = &ds1wm_pdata,
.num_resources = ARRAY_SIZE(ds1wm_resources), .num_resources = ARRAY_SIZE(ds1wm_resources),
.resources = ds1wm_resources, .resources = ds1wm_resources,
}; };

3
drivers/mfd/htc-pasic3.c
View file

@ -117,7 +117,7 @@ static struct mfd_cell ds1wm_cell __initdata = {
.name = "ds1wm", .name = "ds1wm",
.enable = ds1wm_enable, .enable = ds1wm_enable,
.disable = ds1wm_disable, .disable = ds1wm_disable,
.driver_data = &ds1wm_pdata, .mfd_data = &ds1wm_pdata,
.num_resources = 2, .num_resources = 2,
.resources = ds1wm_resources, .resources = ds1wm_resources,
}; };
@ -172,7 +172,6 @@ static int __init pasic3_probe(struct platform_device *pdev)
} }
if (pdata && pdata->led_pdata) { if (pdata && pdata->led_pdata) {
led_cell.driver_data = pdata->led_pdata;
ret = mfd_add_devices(&pdev->dev, pdev->id, &led_cell, 1, r, 0); ret = mfd_add_devices(&pdev->dev, pdev->id, &led_cell, 1, r, 0);
if (ret < 0) if (ret < 0)
dev_warn(dev, "failed to register LED device\n"); dev_warn(dev, "failed to register LED device\n");

4
drivers/w1/masters/ds1wm.c
View file

@ -216,7 +216,7 @@ static int ds1wm_find_divisor(int gclk)
static void ds1wm_up(struct ds1wm_data *ds1wm_data) static void ds1wm_up(struct ds1wm_data *ds1wm_data)
{ {
int divisor; 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) if (ds1wm_data->cell->enable)
ds1wm_data->cell->enable(ds1wm_data->pdev); ds1wm_data->cell->enable(ds1wm_data->pdev);
@ -356,7 +356,7 @@ static int ds1wm_probe(struct platform_device *pdev)
ret = -ENOMEM; ret = -ENOMEM;
goto err0; goto err0;
} }
plat = cell->driver_data; plat = mfd_get_data(pdev);
/* calculate bus shift from mem resource */ /* calculate bus shift from mem resource */
ds1wm_data->bus_shift = resource_size(res) >> 3; ds1wm_data->bus_shift = resource_size(res) >> 3;