diff options
author | Andres Salomon <dilinger@queued.net> | 2011-02-17 22:07:25 -0500 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-03-23 05:41:55 -0400 |
commit | 65e523595a31813c0f20ffd249792c60e253438e (patch) | |
tree | 595f1db4bafe62d7d96760d45ea6d42e59a21256 /include/linux/mfd | |
parent | 40e03f571b2e63827f2afb90ea9aa459612c29e3 (diff) |
mfd: Rename platform_data field of mfd_cell to mfd_data
Rename the platform_data variable to imply a distinction between
common platform_data driver usage (typically accessed via
pdev->dev.platform_data) and the way MFD passes data down to
clients (using a wrapper named mfd_get_data).
All clients have already been changed to use the wrapper function,
so this can be a quick single-commit change that only touches things
in drivers/mfd.
Signed-off-by: Andres Salomon <dilinger@queued.net>
Acked-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'include/linux/mfd')
-rw-r--r-- | include/linux/mfd/core.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/mfd/core.h b/include/linux/mfd/core.h index 923ec2591eb7..f317fe4f8366 100644 --- a/include/linux/mfd/core.h +++ b/include/linux/mfd/core.h | |||
@@ -33,8 +33,8 @@ struct mfd_cell { | |||
33 | /* driver-specific data for MFD-aware "cell" drivers */ | 33 | /* driver-specific data for MFD-aware "cell" drivers */ |
34 | void *driver_data; | 34 | void *driver_data; |
35 | 35 | ||
36 | /* platform_data can be used to pass data to "generic" drivers */ | 36 | /* mfd_data can be used to pass data to client drivers */ |
37 | void *platform_data; | 37 | void *mfd_data; |
38 | 38 | ||
39 | /* | 39 | /* |
40 | * These resources can be specified relative to the parent device. | 40 | * These resources can be specified relative to the parent device. |
@@ -64,11 +64,11 @@ static inline const struct mfd_cell *mfd_get_cell(struct platform_device *pdev) | |||
64 | 64 | ||
65 | /* | 65 | /* |
66 | * Given a platform device that's been created by mfd_add_devices(), fetch | 66 | * Given a platform device that's been created by mfd_add_devices(), fetch |
67 | * the .platform_data entry from the mfd_cell that created it. | 67 | * the .mfd_data entry from the mfd_cell that created it. |
68 | */ | 68 | */ |
69 | static inline void *mfd_get_data(struct platform_device *pdev) | 69 | static inline void *mfd_get_data(struct platform_device *pdev) |
70 | { | 70 | { |
71 | return mfd_get_cell(pdev)->platform_data; | 71 | return mfd_get_cell(pdev)->mfd_data; |
72 | } | 72 | } |
73 | 73 | ||
74 | extern int mfd_add_devices(struct device *parent, int id, | 74 | extern int mfd_add_devices(struct device *parent, int id, |