aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2013-11-18 08:33:00 -0500
committerLee Jones <lee.jones@linaro.org>2014-01-06 04:13:27 -0500
commit7c0517b1716bc1aa873064290401a8ce2fbabc32 (patch)
treeea36b5a5758447f3a060c5c9cf7471ad6b2d7112 /drivers/mfd
parent04e02417306efea1d2702f8f67b4d4ae66c298b4 (diff)
mfd: maxim: Constify struct mfd_cell where possible
As of commit 03e361b25ee8dfb1fd9b890072c23c4aae01c6c7 ("mfd: Stop setting refcounting pointers in original mfd_cell arrays"), the "cell" parameter of mfd_add_devices() is "const" again. Hence make all cell data passed to mfd_add_devices() const where possible. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/max77686.c2
-rw-r--r--drivers/mfd/max77693.c2
-rw-r--r--drivers/mfd/max8907.c2
-rw-r--r--drivers/mfd/max8925-core.c8
-rw-r--r--drivers/mfd/max8997.c2
-rw-r--r--drivers/mfd/max8998.c4
6 files changed, 10 insertions, 10 deletions
diff --git a/drivers/mfd/max77686.c b/drivers/mfd/max77686.c
index 34520cbe8afb..fb0848544b76 100644
--- a/drivers/mfd/max77686.c
+++ b/drivers/mfd/max77686.c
@@ -35,7 +35,7 @@
35 35
36#define I2C_ADDR_RTC (0x0C >> 1) 36#define I2C_ADDR_RTC (0x0C >> 1)
37 37
38static struct mfd_cell max77686_devs[] = { 38static const struct mfd_cell max77686_devs[] = {
39 { .name = "max77686-pmic", }, 39 { .name = "max77686-pmic", },
40 { .name = "max77686-rtc", }, 40 { .name = "max77686-rtc", },
41 { .name = "max77686-clk", }, 41 { .name = "max77686-clk", },
diff --git a/drivers/mfd/max77693.c b/drivers/mfd/max77693.c
index 9f92463f4f7e..a0093a839d4b 100644
--- a/drivers/mfd/max77693.c
+++ b/drivers/mfd/max77693.c
@@ -41,7 +41,7 @@
41#define I2C_ADDR_MUIC (0x4A >> 1) 41#define I2C_ADDR_MUIC (0x4A >> 1)
42#define I2C_ADDR_HAPTIC (0x90 >> 1) 42#define I2C_ADDR_HAPTIC (0x90 >> 1)
43 43
44static struct mfd_cell max77693_devs[] = { 44static const struct mfd_cell max77693_devs[] = {
45 { .name = "max77693-pmic", }, 45 { .name = "max77693-pmic", },
46 { .name = "max77693-charger", }, 46 { .name = "max77693-charger", },
47 { .name = "max77693-flash", }, 47 { .name = "max77693-flash", },
diff --git a/drivers/mfd/max8907.c b/drivers/mfd/max8907.c
index 3bbfedc07f41..07740314b29d 100644
--- a/drivers/mfd/max8907.c
+++ b/drivers/mfd/max8907.c
@@ -22,7 +22,7 @@
22#include <linux/regmap.h> 22#include <linux/regmap.h>
23#include <linux/slab.h> 23#include <linux/slab.h>
24 24
25static struct mfd_cell max8907_cells[] = { 25static const struct mfd_cell max8907_cells[] = {
26 { .name = "max8907-regulator", }, 26 { .name = "max8907-regulator", },
27 { .name = "max8907-rtc", }, 27 { .name = "max8907-rtc", },
28}; 28};
diff --git a/drivers/mfd/max8925-core.c b/drivers/mfd/max8925-core.c
index f0cc40296d8c..f3faf0c45ddd 100644
--- a/drivers/mfd/max8925-core.c
+++ b/drivers/mfd/max8925-core.c
@@ -45,7 +45,7 @@ static struct resource touch_resources[] = {
45 }, 45 },
46}; 46};
47 47
48static struct mfd_cell touch_devs[] = { 48static const struct mfd_cell touch_devs[] = {
49 { 49 {
50 .name = "max8925-touch", 50 .name = "max8925-touch",
51 .num_resources = 1, 51 .num_resources = 1,
@@ -63,7 +63,7 @@ static struct resource power_supply_resources[] = {
63 }, 63 },
64}; 64};
65 65
66static struct mfd_cell power_devs[] = { 66static const struct mfd_cell power_devs[] = {
67 { 67 {
68 .name = "max8925-power", 68 .name = "max8925-power",
69 .num_resources = 1, 69 .num_resources = 1,
@@ -81,7 +81,7 @@ static struct resource rtc_resources[] = {
81 }, 81 },
82}; 82};
83 83
84static struct mfd_cell rtc_devs[] = { 84static const struct mfd_cell rtc_devs[] = {
85 { 85 {
86 .name = "max8925-rtc", 86 .name = "max8925-rtc",
87 .num_resources = 1, 87 .num_resources = 1,
@@ -104,7 +104,7 @@ static struct resource onkey_resources[] = {
104 }, 104 },
105}; 105};
106 106
107static struct mfd_cell onkey_devs[] = { 107static const struct mfd_cell onkey_devs[] = {
108 { 108 {
109 .name = "max8925-onkey", 109 .name = "max8925-onkey",
110 .num_resources = 2, 110 .num_resources = 2,
diff --git a/drivers/mfd/max8997.c b/drivers/mfd/max8997.c
index 791aea3e96ce..1b80e51c2e73 100644
--- a/drivers/mfd/max8997.c
+++ b/drivers/mfd/max8997.c
@@ -40,7 +40,7 @@
40#define I2C_ADDR_RTC (0x0C >> 1) 40#define I2C_ADDR_RTC (0x0C >> 1)
41#define I2C_ADDR_HAPTIC (0x90 >> 1) 41#define I2C_ADDR_HAPTIC (0x90 >> 1)
42 42
43static struct mfd_cell max8997_devs[] = { 43static const struct mfd_cell max8997_devs[] = {
44 { .name = "max8997-pmic", }, 44 { .name = "max8997-pmic", },
45 { .name = "max8997-rtc", }, 45 { .name = "max8997-rtc", },
46 { .name = "max8997-battery", }, 46 { .name = "max8997-battery", },
diff --git a/drivers/mfd/max8998.c b/drivers/mfd/max8998.c
index fe6332dcabee..f47eaa70eae0 100644
--- a/drivers/mfd/max8998.c
+++ b/drivers/mfd/max8998.c
@@ -37,7 +37,7 @@
37 37
38#define RTC_I2C_ADDR (0x0c >> 1) 38#define RTC_I2C_ADDR (0x0c >> 1)
39 39
40static struct mfd_cell max8998_devs[] = { 40static const struct mfd_cell max8998_devs[] = {
41 { 41 {
42 .name = "max8998-pmic", 42 .name = "max8998-pmic",
43 }, { 43 }, {
@@ -47,7 +47,7 @@ static struct mfd_cell max8998_devs[] = {
47 }, 47 },
48}; 48};
49 49
50static struct mfd_cell lp3974_devs[] = { 50static const struct mfd_cell lp3974_devs[] = {
51 { 51 {
52 .name = "lp3974-pmic", 52 .name = "lp3974-pmic",
53 }, { 53 }, {