summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorAndres Salomon <dilinger@queued.net>2011-02-17 19:07:09 -0800
committerSamuel Ortiz <sameo@linux.intel.com>2011-03-23 10:41:50 +0100
commitfe891a008f3310be47786e87c158edebdb71e265 (patch)
treea89b8b9ffbf07308009e4e2f568181c0e7e5804f /include/linux
parent2798e226ad7db82725ba03da933638e981b472f7 (diff)
downloadblackbird-obmc-linux-fe891a008f3310be47786e87c158edebdb71e265.tar.gz
blackbird-obmc-linux-fe891a008f3310be47786e87c158edebdb71e265.zip
mfd-core: Unconditionally add mfd_cell to every platform_device
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>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/mfd/core.h23
1 files changed, 21 insertions, 2 deletions
diff --git a/include/linux/mfd/core.h b/include/linux/mfd/core.h
index 1fd7c4467e5a..aefc378f8dc9 100644
--- a/include/linux/mfd/core.h
+++ b/include/linux/mfd/core.h
@@ -33,9 +33,10 @@ struct mfd_cell {
/* driver-specific data for MFD-aware "cell" drivers */
void *driver_data;
- /* platform_data can be used to either pass data to "generic"
- driver or as a hook to mfd_cell for the "cell" drivers */
+ /* platform_data can be used to pass data to "generic" drivers */
void *platform_data;
+
+ /* unused */
size_t data_size;
/*
@@ -55,6 +56,24 @@ struct mfd_cell {
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,
const struct mfd_cell *cells, int n_devs,
struct resource *mem_base,
OpenPOWER on IntegriCloud