diff options
| -rw-r--r-- | drivers/mfd/mfd-core.c | 15 | ||||
| -rw-r--r-- | include/linux/mfd/core.h | 17 |
2 files changed, 15 insertions, 17 deletions
diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c index 4dc861a7ac56..50207700140c 100644 --- a/drivers/mfd/mfd-core.c +++ b/drivers/mfd/mfd-core.c | |||
| @@ -16,9 +16,9 @@ | |||
| 16 | #include <linux/mfd/core.h> | 16 | #include <linux/mfd/core.h> |
| 17 | 17 | ||
| 18 | static int mfd_add_device(struct platform_device *parent, | 18 | static int mfd_add_device(struct platform_device *parent, |
| 19 | const struct mfd_cell *cell, | 19 | const struct mfd_cell *cell, |
| 20 | struct resource *mem_base, | 20 | struct resource *mem_base, |
| 21 | int irq_base) | 21 | int irq_base) |
| 22 | { | 22 | { |
| 23 | struct resource res[cell->num_resources]; | 23 | struct resource res[cell->num_resources]; |
| 24 | struct platform_device *pdev; | 24 | struct platform_device *pdev; |
| @@ -75,11 +75,10 @@ fail_alloc: | |||
| 75 | return ret; | 75 | return ret; |
| 76 | } | 76 | } |
| 77 | 77 | ||
| 78 | int mfd_add_devices( | 78 | int mfd_add_devices(struct platform_device *parent, |
| 79 | struct platform_device *parent, | 79 | const struct mfd_cell *cells, int n_devs, |
| 80 | const struct mfd_cell *cells, int n_devs, | 80 | struct resource *mem_base, |
| 81 | struct resource *mem_base, | 81 | int irq_base) |
| 82 | int irq_base) | ||
| 83 | { | 82 | { |
| 84 | int i; | 83 | int i; |
| 85 | int ret = 0; | 84 | int ret = 0; |
diff --git a/include/linux/mfd/core.h b/include/linux/mfd/core.h index bb3dd0545928..b7cbb9968339 100644 --- a/include/linux/mfd/core.h +++ b/include/linux/mfd/core.h | |||
| @@ -1,5 +1,3 @@ | |||
| 1 | #ifndef MFD_CORE_H | ||
| 2 | #define MFD_CORE_H | ||
| 3 | /* | 1 | /* |
| 4 | * drivers/mfd/mfd-core.h | 2 | * drivers/mfd/mfd-core.h |
| 5 | * | 3 | * |
| @@ -13,6 +11,9 @@ | |||
| 13 | * | 11 | * |
| 14 | */ | 12 | */ |
| 15 | 13 | ||
| 14 | #ifndef MFD_CORE_H | ||
| 15 | #define MFD_CORE_H | ||
| 16 | |||
| 16 | #include <linux/platform_device.h> | 17 | #include <linux/platform_device.h> |
| 17 | 18 | ||
| 18 | /* | 19 | /* |
| @@ -38,17 +39,15 @@ struct mfd_cell { | |||
| 38 | const struct resource *resources; | 39 | const struct resource *resources; |
| 39 | }; | 40 | }; |
| 40 | 41 | ||
| 41 | static inline struct mfd_cell * | 42 | static inline struct mfd_cell *mfd_get_cell(struct platform_device *pdev) |
| 42 | mfd_get_cell(struct platform_device *pdev) | ||
| 43 | { | 43 | { |
| 44 | return (struct mfd_cell *)pdev->dev.platform_data; | 44 | return (struct mfd_cell *)pdev->dev.platform_data; |
| 45 | } | 45 | } |
| 46 | 46 | ||
| 47 | extern int mfd_add_devices( | 47 | extern int mfd_add_devices(struct platform_device *parent, |
| 48 | struct platform_device *parent, | 48 | const struct mfd_cell *cells, int n_devs, |
| 49 | const struct mfd_cell *cells, int n_devs, | 49 | struct resource *mem_base, |
| 50 | struct resource *mem_base, | 50 | int irq_base); |
| 51 | int irq_base); | ||
| 52 | 51 | ||
| 53 | extern void mfd_remove_devices(struct platform_device *parent); | 52 | extern void mfd_remove_devices(struct platform_device *parent); |
| 54 | 53 | ||
