瀏覽代碼

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>
Geert Uytterhoeven 11 年之前
父節點
當前提交
7c0517b171
共有 6 個文件被更改,包括 10 次插入10 次删除
  1. 1 1
      drivers/mfd/max77686.c
  2. 1 1
      drivers/mfd/max77693.c
  3. 1 1
      drivers/mfd/max8907.c
  4. 4 4
      drivers/mfd/max8925-core.c
  5. 1 1
      drivers/mfd/max8997.c
  6. 2 2
      drivers/mfd/max8998.c

+ 1 - 1
drivers/mfd/max77686.c

@@ -35,7 +35,7 @@
 
 
 #define I2C_ADDR_RTC	(0x0C >> 1)
 #define I2C_ADDR_RTC	(0x0C >> 1)
 
 
-static struct mfd_cell max77686_devs[] = {
+static const struct mfd_cell max77686_devs[] = {
 	{ .name = "max77686-pmic", },
 	{ .name = "max77686-pmic", },
 	{ .name = "max77686-rtc", },
 	{ .name = "max77686-rtc", },
 	{ .name = "max77686-clk", },
 	{ .name = "max77686-clk", },

+ 1 - 1
drivers/mfd/max77693.c

@@ -41,7 +41,7 @@
 #define I2C_ADDR_MUIC	(0x4A >> 1)
 #define I2C_ADDR_MUIC	(0x4A >> 1)
 #define I2C_ADDR_HAPTIC	(0x90 >> 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-pmic", },
 	{ .name = "max77693-charger", },
 	{ .name = "max77693-charger", },
 	{ .name = "max77693-flash", },
 	{ .name = "max77693-flash", },

+ 1 - 1
drivers/mfd/max8907.c

@@ -22,7 +22,7 @@
 #include <linux/regmap.h>
 #include <linux/regmap.h>
 #include <linux/slab.h>
 #include <linux/slab.h>
 
 
-static struct mfd_cell max8907_cells[] = {
+static const struct mfd_cell max8907_cells[] = {
 	{ .name = "max8907-regulator", },
 	{ .name = "max8907-regulator", },
 	{ .name = "max8907-rtc", },
 	{ .name = "max8907-rtc", },
 };
 };

+ 4 - 4
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",
 		.name		= "max8925-touch",
 		.num_resources	= 1,
 		.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",
 		.name		= "max8925-power",
 		.num_resources	= 1,
 		.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",
 		.name		= "max8925-rtc",
 		.num_resources	= 1,
 		.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",
 		.name		= "max8925-onkey",
 		.num_resources	= 2,
 		.num_resources	= 2,

+ 1 - 1
drivers/mfd/max8997.c

@@ -40,7 +40,7 @@
 #define I2C_ADDR_RTC	(0x0C >> 1)
 #define I2C_ADDR_RTC	(0x0C >> 1)
 #define I2C_ADDR_HAPTIC	(0x90 >> 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-pmic", },
 	{ .name = "max8997-rtc", },
 	{ .name = "max8997-rtc", },
 	{ .name = "max8997-battery", },
 	{ .name = "max8997-battery", },

+ 2 - 2
drivers/mfd/max8998.c

@@ -37,7 +37,7 @@
 
 
 #define RTC_I2C_ADDR		(0x0c >> 1)
 #define RTC_I2C_ADDR		(0x0c >> 1)
 
 
-static struct mfd_cell max8998_devs[] = {
+static const struct mfd_cell max8998_devs[] = {
 	{
 	{
 		.name = "max8998-pmic",
 		.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",
 		.name = "lp3974-pmic",
 	}, {
 	}, {