xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

Browse Source 
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
  mfd: Fetch cell pointer from platform_device->mfd_cell
This commit is contained in:
Linus Torvalds
2011-04-12 14:25:10 -07:00
parent 0d88f6e804 e710d7d5a9
commit e328f05dd6
4 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,16 +86,25 @@ extern int mfd_clone_cell(const char *cell, const char **clones,
*/
static inline const struct mfd_cell *mfd_get_cell(struct platform_device *pdev)
{
return pdev->dev.platform_data;
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)
{
return mfd_get_cell(pdev)->mfd_data;
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,

5
include/linux/platform_device.h
View File

@@ -14,6 +14,8 @@
#include <linux/device.h>
#include <linux/mod_devicetable.h>
struct mfd_cell;
struct platform_device {
const char * name;
int id;
@@ -23,6 +25,9 @@ struct platform_device {
const struct platform_device_id *id_entry;
/* MFD cell pointer */
struct mfd_cell *mfd_cell;
/* arch specific additions */
struct pdev_archdata archdata;
};