lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mfd-core: Unconditionally add mfd_cell to every platform_device

Browse Source 
Previously, one would set the mfd_cell's platform_data/data_size to point
to the current mfd_cell in order to pass that information along to drivers.

This causes the current mfd_cell to always be available to drivers.  It
also adds a wrapper function for fetching the mfd cell from a platform
device, similar to what originally existed for mfd devices.

Drivers who previously used platform_data for other purposes can still
use it; the difference is that mfd_get_data() must be used to
access it (and the pdata structure is no longer allocated in
mfd_add_devices).

Note that mfd_get_data is intentionally vague (in name) about where
the data is stored; variable name changes can come later without having
to touch brazillions of drivers.

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:09 -08:00
committed by Samuel Ortiz
parent 2798e226ad
commit fe891a008f
2 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/mfd/mfd-core.c
View File

@@ -39,12 +39,9 @@ static int mfd_add_device(struct device *parent, int id,
pdev->dev.parent = parent; pdev->dev.parent = parent;
platform_set_drvdata(pdev, cell->driver_data); platform_set_drvdata(pdev, cell->driver_data);
if (cell->data_size) { ret = platform_device_add_data(pdev, cell, sizeof(*cell));
ret = platform_device_add_data(pdev,
cell->platform_data, cell->data_size);
if (ret) if (ret)
goto fail_res; goto fail_res;
}
for (r = 0; r < cell->num_resources; r++) { for (r = 0; r < cell->num_resources; r++) {
res[r].name = cell->resources[r].name; res[r].name = cell->resources[r].name;

23
include/linux/mfd/core.h
View File

@@ -33,9 +33,10 @@ struct mfd_cell {
/* driver-specific data for MFD-aware "cell" drivers */ /* driver-specific data for MFD-aware "cell" drivers */
void *driver_data; void *driver_data;
/* platform_data can be used to either pass data to "generic" /* platform_data can be used to pass data to "generic" drivers */
driver or as a hook to mfd_cell for the "cell" drivers */
void *platform_data; void *platform_data;
/* unused */
size_t data_size; size_t data_size;
/* /*
@@ -55,6 +56,24 @@ struct mfd_cell {
bool pm_runtime_no_callbacks; bool pm_runtime_no_callbacks;
}; };
/*
* Given a platform device that's been created by mfd_add_devices(), fetch
* the mfd_cell that created it.
*/
static inline const struct mfd_cell *mfd_get_cell(struct platform_device *pdev)
{
return pdev->dev.platform_data;
}
/*
* Given a platform device that's been created by mfd_add_devices(), fetch
* the .platform_data entry from the mfd_cell that created it.
*/
static inline void *mfd_get_data(struct platform_device *pdev)
{
return mfd_get_cell(pdev)->platform_data;
}
extern int mfd_add_devices(struct device *parent, int id, extern int mfd_add_devices(struct device *parent, int id,
const struct mfd_cell *cells, int n_devs, const struct mfd_cell *cells, int n_devs,
struct resource *mem_base, struct resource *mem_base,