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>
This commit is contained in:

zatwierdzone przez
Samuel Ortiz

rodzic
dab1547a01
commit
fcd67979d3
@@ -117,7 +117,7 @@ static struct mfd_cell ds1wm_cell __initdata = {
|
||||
.name = "ds1wm",
|
||||
.enable = ds1wm_enable,
|
||||
.disable = ds1wm_disable,
|
||||
.driver_data = &ds1wm_pdata,
|
||||
.mfd_data = &ds1wm_pdata,
|
||||
.num_resources = 2,
|
||||
.resources = ds1wm_resources,
|
||||
};
|
||||
@@ -172,7 +172,6 @@ static int __init pasic3_probe(struct platform_device *pdev)
|
||||
}
|
||||
|
||||
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);
|
||||
if (ret < 0)
|
||||
dev_warn(dev, "failed to register LED device\n");
|
||||
|
Reference in New Issue
Block a user