diff options
author | Samuel Ortiz <sameo@linux.intel.com> | 2011-04-07 20:04:50 -0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-05-26 13:45:16 -0400 |
commit | ba279f58c6148c1dc76265da98eb292e76c15a32 (patch) | |
tree | f5f13806d9fdc18f32855dfaa71e1bd9302baae6 | |
parent | 17cf8b429341869c154268f9d92d32a74295a29a (diff) |
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>
-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 68c13e52a50c..4e76163dd862 100644 --- a/include/linux/mfd/core.h +++ b/include/linux/mfd/core.h | |||
@@ -33,9 +33,6 @@ struct mfd_cell { | |||
33 | int (*suspend)(struct platform_device *dev); | 33 | int (*suspend)(struct platform_device *dev); |
34 | int (*resume)(struct platform_device *dev); | 34 | int (*resume)(struct platform_device *dev); |
35 | 35 | ||
36 | /* mfd_data can be used to pass data to client drivers */ | ||
37 | void *mfd_data; | ||
38 | |||
39 | /* platform data passed to the sub devices drivers */ | 36 | /* platform data passed to the sub devices drivers */ |
40 | void *platform_data; | 37 | void *platform_data; |
41 | size_t pdata_size; | 38 | size_t pdata_size; |
@@ -93,24 +90,6 @@ static inline const struct mfd_cell *mfd_get_cell(struct platform_device *pdev) | |||
93 | return pdev->mfd_cell; | 90 | return pdev->mfd_cell; |
94 | } | 91 | } |
95 | 92 | ||
96 | /* | ||
97 | * Given a platform device that's been created by mfd_add_devices(), fetch | ||
98 | * the .mfd_data entry from the mfd_cell that created it. | ||
99 | * Otherwise just return the platform_data pointer. | ||
100 | * This maintains compatibility with platform drivers whose devices aren't | ||
101 | * created by the mfd layer, and expect platform_data to contain what would've | ||
102 | * otherwise been in mfd_data. | ||
103 | */ | ||
104 | static inline void *mfd_get_data(struct platform_device *pdev) | ||
105 | { | ||
106 | const struct mfd_cell *cell = mfd_get_cell(pdev); | ||
107 | |||
108 | if (cell) | ||
109 | return cell->mfd_data; | ||
110 | else | ||
111 | return pdev->dev.platform_data; | ||
112 | } | ||
113 | |||
114 | extern int mfd_add_devices(struct device *parent, int id, | 93 | extern int mfd_add_devices(struct device *parent, int id, |
115 | struct mfd_cell *cells, int n_devs, | 94 | struct mfd_cell *cells, int n_devs, |
116 | struct resource *mem_base, | 95 | struct resource *mem_base, |