redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

mfd: stmicro: Constify struct mfd_cell where possible

Browse source 
As of commit 03e361b25e ("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>
This commit is contained in:
Geert Uytterhoeven 2013-11-18 14:33:01 +01:00 committed by Lee Jones
parent 9e146f4330
commit 6bbb3c4cb2
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/mfd/stmpe.c
View file

@ -297,14 +297,14 @@ static struct resource stmpe_gpio_resources[] = {
}, },
}; };
static struct mfd_cell stmpe_gpio_cell = { static const struct mfd_cell stmpe_gpio_cell = {
.name = "stmpe-gpio", .name = "stmpe-gpio",
.of_compatible = "st,stmpe-gpio", .of_compatible = "st,stmpe-gpio",
.resources = stmpe_gpio_resources, .resources = stmpe_gpio_resources,
.num_resources = ARRAY_SIZE(stmpe_gpio_resources), .num_resources = ARRAY_SIZE(stmpe_gpio_resources),
}; };
static struct mfd_cell stmpe_gpio_cell_noirq = { static const struct mfd_cell stmpe_gpio_cell_noirq = {
.name = "stmpe-gpio", .name = "stmpe-gpio",
.of_compatible = "st,stmpe-gpio", .of_compatible = "st,stmpe-gpio",
/* gpio cell resources consist of an irq only so no resources here */ /* gpio cell resources consist of an irq only so no resources here */
@ -325,7 +325,7 @@ static struct resource stmpe_keypad_resources[] = {
}, },
}; };
static struct mfd_cell stmpe_keypad_cell = { static const struct mfd_cell stmpe_keypad_cell = {
.name = "stmpe-keypad", .name = "stmpe-keypad",
.of_compatible = "st,stmpe-keypad", .of_compatible = "st,stmpe-keypad",
.resources = stmpe_keypad_resources, .resources = stmpe_keypad_resources,
@ -409,7 +409,7 @@ static struct resource stmpe_ts_resources[] = {
}, },
}; };
static struct mfd_cell stmpe_ts_cell = { static const struct mfd_cell stmpe_ts_cell = {
.name = "stmpe-ts", .name = "stmpe-ts",
.of_compatible = "st,stmpe-ts", .of_compatible = "st,stmpe-ts",
.resources = stmpe_ts_resources, .resources = stmpe_ts_resources,
@ -1064,7 +1064,7 @@ static int stmpe_chip_init(struct stmpe *stmpe)
return stmpe_reg_write(stmpe, stmpe->regs[STMPE_IDX_ICR_LSB], icr); return stmpe_reg_write(stmpe, stmpe->regs[STMPE_IDX_ICR_LSB], icr);
} }
static int stmpe_add_device(struct stmpe *stmpe, struct mfd_cell *cell) static int stmpe_add_device(struct stmpe *stmpe, const struct mfd_cell *cell)
{ {
return mfd_add_devices(stmpe->dev, stmpe->pdata->id, cell, 1, return mfd_add_devices(stmpe->dev, stmpe->pdata->id, cell, 1,
NULL, stmpe->irq_base, stmpe->domain); NULL, stmpe->irq_base, stmpe->domain);

2
drivers/mfd/stmpe.h
View file

@ -38,7 +38,7 @@ static inline void stmpe_dump_bytes(const char *str, const void *buf,
* enable and altfunc callbacks * enable and altfunc callbacks
*/ */
struct stmpe_variant_block { struct stmpe_variant_block {
struct mfd_cell *cell; const struct mfd_cell *cell;
int irq; int irq;
enum stmpe_block block; enum stmpe_block block;
}; };