Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c0517b1 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Lee Jones
Browse files

mfd: maxim: Constify struct mfd_cell where possible 



As of commit 03e361b2 ("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: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 04e02417

drivers/mfd/max77686.c

+1 −1
Original line number Diff line number Diff line
@@ -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", },

drivers/mfd/max77693.c

+1 −1
Original line number Diff line number Diff line
@@ -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", },

drivers/mfd/max8907.c

+1 −1
Original line number Diff line number Diff line
@@ -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", },

};

drivers/mfd/max8925-core.c

+4 −4
Original line number Diff line number Diff line
@@ -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,

drivers/mfd/max8997.c

+1 −1
Original line number Diff line number Diff line
@@ -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", },