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>

diff --git a/drivers/mfd/max77686.c b/drivers/mfd/max77686.c
index 34520cbe8afbd6e9f0daca77f4bbde41b93697a6..fb0848544b768ab3a0943ddfe984b29cfeca4b53 100644 (file)
--- a/drivers/mfd/max77686.c
+++ b/drivers/mfd/max77686.c
@@ -35,7 +35,7 @@
 
 #define I2C_ADDR_RTC   (0x0C >> 1)
 
-static struct mfd_cell max77686_devs[] = {
+static const struct mfd_cell max77686_devs[] = {
        { .name = "max77686-pmic", },
        { .name = "max77686-rtc", },
        { .name = "max77686-clk", },

diff --git a/drivers/mfd/max77693.c b/drivers/mfd/max77693.c
index 9f92463f4f7ecaca1b005a14e6cd59f7d38deb4a..a0093a839d4b6fcb397f474248ee7962b2952b5d 100644 (file)
--- a/drivers/mfd/max77693.c
+++ b/drivers/mfd/max77693.c
@@ -41,7 +41,7 @@
 #define I2C_ADDR_MUIC  (0x4A >> 1)
 #define I2C_ADDR_HAPTIC        (0x90 >> 1)
 
-static struct mfd_cell max77693_devs[] = {
+static const struct mfd_cell max77693_devs[] = {
        { .name = "max77693-pmic", },
        { .name = "max77693-charger", },
        { .name = "max77693-flash", },

diff --git a/drivers/mfd/max8907.c b/drivers/mfd/max8907.c
index 3bbfedc07f41c8e24d866120b64423374c629fa3..07740314b29d03acc8068dcc56addd989abca5d1 100644 (file)
--- a/drivers/mfd/max8907.c
+++ b/drivers/mfd/max8907.c
@@ -22,7 +22,7 @@
 #include <linux/regmap.h>
 #include <linux/slab.h>
 
-static struct mfd_cell max8907_cells[] = {
+static const struct mfd_cell max8907_cells[] = {
        { .name = "max8907-regulator", },
        { .name = "max8907-rtc", },
 };

diff --git a/drivers/mfd/max8925-core.c b/drivers/mfd/max8925-core.c
index f0cc40296d8ccc50fab35f0805023bdab6ebc54f..f3faf0c45dddf36d09d4b2d05641145a7ebe13f6 100644 (file)
--- a/drivers/mfd/max8925-core.c
+++ b/drivers/mfd/max8925-core.c
@@ -45,7 +45,7 @@ static struct resource touch_resources[] = {
        },
 };
 
-static struct mfd_cell touch_devs[] = {
+static const struct mfd_cell touch_devs[] = {
        {
                .name           = "max8925-touch",
                .num_resources  = 1,
@@ -63,7 +63,7 @@ static struct resource power_supply_resources[] = {
        },
 };
 
-static struct mfd_cell power_devs[] = {
+static const struct mfd_cell power_devs[] = {
        {
                .name           = "max8925-power",
                .num_resources  = 1,
@@ -81,7 +81,7 @@ static struct resource rtc_resources[] = {
        },
 };
 
-static struct mfd_cell rtc_devs[] = {
+static const struct mfd_cell rtc_devs[] = {
        {
                .name           = "max8925-rtc",
                .num_resources  = 1,
@@ -104,7 +104,7 @@ static struct resource onkey_resources[] = {
        },
 };
 
-static struct mfd_cell onkey_devs[] = {
+static const struct mfd_cell onkey_devs[] = {
        {
                .name           = "max8925-onkey",
                .num_resources  = 2,

diff --git a/drivers/mfd/max8997.c b/drivers/mfd/max8997.c
index 791aea3e96ce27622032a0c0fd1bc52ecd69203e..1b80e51c2e73622b11769c6ddec449be50cd9044 100644 (file)
--- a/drivers/mfd/max8997.c
+++ b/drivers/mfd/max8997.c
@@ -40,7 +40,7 @@
 #define I2C_ADDR_RTC   (0x0C >> 1)
 #define I2C_ADDR_HAPTIC        (0x90 >> 1)
 
-static struct mfd_cell max8997_devs[] = {
+static const struct mfd_cell max8997_devs[] = {
        { .name = "max8997-pmic", },
        { .name = "max8997-rtc", },
        { .name = "max8997-battery", },

diff --git a/drivers/mfd/max8998.c b/drivers/mfd/max8998.c
index fe6332dcabee891a27daed80e3ed2525e3b1caa8..f47eaa70eae076f172f4e72977f98dfe26e680da 100644 (file)
--- a/drivers/mfd/max8998.c
+++ b/drivers/mfd/max8998.c
@@ -37,7 +37,7 @@
 
 #define RTC_I2C_ADDR           (0x0c >> 1)
 
-static struct mfd_cell max8998_devs[] = {
+static const struct mfd_cell max8998_devs[] = {
        {
                .name = "max8998-pmic",
        }, {
@@ -47,7 +47,7 @@ static struct mfd_cell max8998_devs[] = {
        },
 };
 
-static struct mfd_cell lp3974_devs[] = {
+static const struct mfd_cell lp3974_devs[] = {
        {
                .name = "lp3974-pmic",
        }, {