diff options
| author | Samuel Ortiz <sameo@linux.intel.com> | 2011-04-08 02:04:50 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-05-26 19:45:16 +0200 |
| commit | ba279f58c6148c1dc76265da98eb292e76c15a32 (patch) | |
| tree | f5f13806d9fdc18f32855dfaa71e1bd9302baae6 /include | |
| parent | 17cf8b429341869c154268f9d92d32a74295a29a (diff) | |
| download | linux-3.10-ba279f58c6148c1dc76265da98eb292e76c15a32.tar.gz linux-3.10-ba279f58c6148c1dc76265da98eb292e76c15a32.tar.bz2 linux-3.10-ba279f58c6148c1dc76265da98eb292e76c15a32.zip | |
mfd: Remove mfd_data
Cell pointers are passed through device->mfd_cell and platform data
is passed through the MFD cell platform_data pointer.
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mfd/core.h | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/include/linux/mfd/core.h b/include/linux/mfd/core.h index 68c13e52a50..4e76163dd86 100644 --- a/include/linux/mfd/core.h +++ b/include/linux/mfd/core.h @@ -33,9 +33,6 @@ struct mfd_cell { int (*suspend)(struct platform_device *dev); int (*resume)(struct platform_device *dev); - /* mfd_data can be used to pass data to client drivers */ - void *mfd_data; - /* platform data passed to the sub devices drivers */ void *platform_data; size_t pdata_size; @@ -93,24 +90,6 @@ static inline const struct mfd_cell *mfd_get_cell(struct platform_device *pdev) return pdev->mfd_cell; } -/* - * Given a platform device that's been created by mfd_add_devices(), fetch - * the .mfd_data entry from the mfd_cell that created it. - * Otherwise just return the platform_data pointer. - * This maintains compatibility with platform drivers whose devices aren't - * created by the mfd layer, and expect platform_data to contain what would've - * otherwise been in mfd_data. - */ -static inline void *mfd_get_data(struct platform_device *pdev) -{ - const struct mfd_cell *cell = mfd_get_cell(pdev); - - if (cell) - return cell->mfd_data; - else - return pdev->dev.platform_data; -} - extern int mfd_add_devices(struct device *parent, int id, struct mfd_cell *cells, int n_devs, struct resource *mem_base, |