mfd: Constify struct mfd_cell where possible
Subsystems (11)
PATCH 1/1 mfd: 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.
---
Compile tested:
- cs5535-mfd, intel_msic, and sta2x11-mfd for x86,
- all other drivers for arm.
drivers/mfd/88pm800.c | 4 ++-- drivers/mfd/88pm805.c | 2 +- drivers/mfd/ab8500-core.c | 14 +++++++------- drivers/mfd/arizona-core.c | 8 ++++---- drivers/mfd/as3722.c | 2 +- drivers/mfd/asic3.c | 4 ++-- drivers/mfd/cros_ec.c | 2 +- drivers/mfd/da9052-core.c | 2 +- drivers/mfd/da9055-core.c | 2 +- drivers/mfd/da9063-core.c | 2 +- drivers/mfd/db8500-prcmu.c | 4 ++-- drivers/mfd/htc-pasic3.c | 2 +- drivers/mfd/intel_msic.c | 2 +- drivers/mfd/jz4740-adc.c | 2 +- drivers/mfd/lp8788.c | 2 +- drivers/mfd/max77686.c | 2 +- drivers/mfd/max77693.c | 2 +- drivers/mfd/max8907.c | 2 +- drivers/mfd/max8925-core.c | 8 ++++---- drivers/mfd/max8997.c | 2 +- drivers/mfd/max8998.c | 4 ++-- drivers/mfd/rc5t583.c | 2 +- drivers/mfd/rdc321x-southbridge.c | 2 +- drivers/mfd/retu-mfd.c | 6 +++--- drivers/mfd/sec-core.c | 8 ++++---- drivers/mfd/stmpe.c | 10 +++++----- drivers/mfd/stmpe.h | 2 +- drivers/mfd/tc3589x.c | 4 ++-- drivers/mfd/tc6387xb.c | 2 +- drivers/mfd/timberdale.c | 12 ++++++------ drivers/mfd/tps6507x.c | 2 +- drivers/mfd/tps65090.c | 2 +- drivers/mfd/tps65217.c | 2 +- drivers/mfd/tps6586x.c | 2 +- drivers/mfd/tps65910.c | 2 +- drivers/mfd/tps65912-core.c | 2 +- drivers/mfd/tps80031.c | 2 +- drivers/mfd/viperboard.c | 2 +- drivers/mfd/vx855.c | 2 +- drivers/mfd/wm831x-core.c | 14 +++++++------- drivers/mfd/wm8994-core.c | 4 ++-- drivers/staging/nvec/nvec.c | 2 +- 42 files changed, 80 insertions(+), 80 deletions(-)
drivers/mfd/88pm800.c +2 -2
@@ -148,7 +148,7 @@ static struct resource onkey_resources[] = { }, }; -static struct mfd_cell onkey_devs[] = { +static const struct mfd_cell onkey_devs[] = { { .name ="88pm80x-onkey" , .num_resources =1 ,
@@ -157,7 +157,7 @@ static struct mfd_cell onkey_devs[] = { }, }; -static struct mfd_cell regulator_devs[] = { +static const struct mfd_cell regulator_devs[] = { { .name ="88pm80x-regulator" , .id =-1 ,
drivers/mfd/88pm805.c +1 -1
@@ -77,7 +77,7 @@ static struct resource codec_resources[] = { }, }; -static struct mfd_cell codec_devs[] = { +static const struct mfd_cell codec_devs[] = { { .name ="88pm80x-codec" , .num_resources =ARRAY_SIZE (codec_resources),
drivers/mfd/ab8500-core.c +7 -7
@@ -1017,7 +1017,7 @@ static struct resource ab8500_temp_resources[] = { }, }; -static struct mfd_cell ab8500_bm_devs[] = { +static const struct mfd_cell ab8500_bm_devs[] = { { .name ="ab8500-charger" , .of_compatible ="stericsson,ab8500-charger" ,
@@ -1052,7 +1052,7 @@ static struct mfd_cell ab8500_bm_devs[] = { }, }; -static struct mfd_cell ab8500_devs[] = { +static const struct mfd_cell ab8500_devs[] = { #ifdef CONFIG_DEBUG_FS { .name ="ab8500-debug" ,
@@ -1143,7 +1143,7 @@ static struct mfd_cell ab8500_devs[] = { }, }; -static struct mfd_cell ab9540_devs[] = { +static const struct mfd_cell ab9540_devs[] = { #ifdef CONFIG_DEBUG_FS { .name ="ab8500-debug" ,
@@ -1214,7 +1214,7 @@ static struct mfd_cell ab9540_devs[] = { };/* Device list for ab8505 */ -static struct mfd_cell ab8505_devs[] = { +static const struct mfd_cell ab8505_devs[] = { #ifdef CONFIG_DEBUG_FS { .name ="ab8500-debug" ,
@@ -1275,7 +1275,7 @@ static struct mfd_cell ab8505_devs[] = { }, }; -static struct mfd_cell ab8540_devs[] = { +static const struct mfd_cell ab8540_devs[] = { #ifdef CONFIG_DEBUG_FS { .name ="ab8500-debug" ,
@@ -1339,7 +1339,7 @@ static struct mfd_cell ab8540_devs[] = { }, }; -static struct mfd_cell ab8540_cut1_devs[] = { +static const struct mfd_cell ab8540_cut1_devs[] = { { .name ="ab8500-rtc" , .of_compatible ="stericsson,ab8500-rtc" ,
@@ -1348,7 +1348,7 @@ static struct mfd_cell ab8540_cut1_devs[] = { }, }; -static struct mfd_cell ab8540_cut2_devs[] = { +static const struct mfd_cell ab8540_cut2_devs[] = { { .name ="ab8540-rtc" , .of_compatible ="stericsson,ab8540-rtc" ,
drivers/mfd/arizona-core.c +4 -4
@@ -565,7 +565,7 @@ static inline int arizona_of_get_core_pdata(struct arizona *arizona) }#endif -static struct mfd_cell early_devs[] = { +static const struct mfd_cell early_devs[] = { { .name ="arizona-ldo1" }, };
@@ -577,7 +577,7 @@ static const char *wm5102_supplies[] = { "SPKVDDR", }; -static struct mfd_cell wm5102_devs[] = { +static const struct mfd_cell wm5102_devs[] = { { .name ="arizona-micsupp" }, { .name ="arizona-extcon" }, { .name ="arizona-gpio" },
@@ -590,7 +590,7 @@ static struct mfd_cell wm5102_devs[] = { }, }; -static struct mfd_cell wm5110_devs[] = { +static const struct mfd_cell wm5110_devs[] = { { .name ="arizona-micsupp" }, { .name ="arizona-extcon" }, { .name ="arizona-gpio" },
@@ -609,7 +609,7 @@ static const char *wm8997_supplies[] = { "SPKVDD", }; -static struct mfd_cell wm8997_devs[] = { +static const struct mfd_cell wm8997_devs[] = { { .name ="arizona-micsupp" }, { .name ="arizona-extcon" }, { .name ="arizona-gpio" },
drivers/mfd/as3722.c +1 -1
@@ -54,7 +54,7 @@ static const struct resource as3722_adc_resource[] = { }, }; -static struct mfd_cell as3722_devs[] = { +static const struct mfd_cell as3722_devs[] = { { .name ="as3722-pinctrl" , },
drivers/mfd/asic3.c +2 -2
@@ -695,7 +695,7 @@ static int ds1wm_disable(struct platform_device *pdev)return 0 ; } -static struct mfd_cell asic3_cell_ds1wm = { +static const struct mfd_cell asic3_cell_ds1wm = { .name ="ds1wm" , .enable = ds1wm_enable, .disable = ds1wm_disable,
@@ -797,7 +797,7 @@ static int asic3_mmc_disable(struct platform_device *pdev)return 0 ; } -static struct mfd_cell asic3_cell_mmc = { +static const struct mfd_cell asic3_cell_mmc = { .name ="tmio-mmc" , .enable = asic3_mmc_enable, .disable = asic3_mmc_disable,
drivers/mfd/cros_ec.c +1 -1
@@ -84,7 +84,7 @@ static irqreturn_t ec_irq_thread(int irq, void *data)return IRQ_HANDLED ; } -static struct mfd_cell cros_devs[] = { +static const struct mfd_cell cros_devs[] = { { .name ="cros-ec-keyb" , .id =1 ,
drivers/mfd/da9052-core.c +1 -1
@@ -427,7 +427,7 @@ int da9052_adc_read_temp(struct da9052 *da9052) }EXPORT_SYMBOL_GPL (da9052_adc_read_temp); -static struct mfd_cell da9052_subdev_info[] = { +static const struct mfd_cell da9052_subdev_info[] = { { .name ="da9052-regulator" , .id =1 ,
drivers/mfd/da9055-core.c +1 -1
@@ -294,7 +294,7 @@ static struct resource da9055_ld05_6_resource = { .flags = IORESOURCE_IRQ, }; -static struct mfd_cell da9055_devs[] = { +static const struct mfd_cell da9055_devs[] = { { .of_compatible ="dialog,da9055-gpio" , .name ="da9055-gpio" ,
drivers/mfd/da9063-core.c +1 -1
@@ -75,7 +75,7 @@ static struct resource da9063_hwmon_resources[] = { }; -static struct mfd_cell da9063_devs[] = { +static const struct mfd_cell da9063_devs[] = { { .name =DA9063_DRVNAME_REGULATORS , .num_resources =ARRAY_SIZE (da9063_regulators_resources),
drivers/mfd/db8500-prcmu.c +2 -2
@@ -3070,7 +3070,7 @@ static struct db8500_thsens_platform_data db8500_thsens_data = { .num_trips = 4, }; -static struct mfd_cell common_prcmu_devs[] = { +static const struct mfd_cell common_prcmu_devs[] = { { .name ="ux500_wdt" , .platform_data = &db8500_wdt_pdata,
@@ -3079,7 +3079,7 @@ static struct mfd_cell common_prcmu_devs[] = { }, }; -static struct mfd_cell db8500_prcmu_devs[] = { +static const struct mfd_cell db8500_prcmu_devs[] = { { .name ="db8500-prcmu-regulators" , .of_compatible ="stericsson,db8500-prcmu-regulator" ,
drivers/mfd/htc-pasic3.c +1 -1
@@ -114,7 +114,7 @@ static struct resource ds1wm_resources[] __initdata = { }, }; -static struct mfd_cell ds1wm_cell__initdata = { +static const struct mfd_cell ds1wm_cell__initconst = { .name ="ds1wm" , .enable = ds1wm_enable, .disable = ds1wm_disable,
drivers/mfd/intel_msic.c +1 -1
@@ -178,7 +178,7 @@ static struct mfd_cell msic_devs[] = {* These devices appear only after the MSIC driver itself is initialized so * we can guarantee that the SCU IPC interface is ready. */ -static struct mfd_cell msic_other_devs[] = { +static const struct mfd_cell msic_other_devs[] = {/* Audio codec in the MSIC */ { .id =-1 ,
drivers/mfd/jz4740-adc.c +1 -1
@@ -181,7 +181,7 @@ static struct resource jz4740_battery_resources[] = { }, }; -static struct mfd_cell jz4740_adc_cells[] = { +static const struct mfd_cell jz4740_adc_cells[] = { { .id =0 , .name ="jz4740-hwmon" ,
drivers/mfd/lp8788.c +1 -1
@@ -71,7 +71,7 @@ static struct resource rtc_irqs[] = { }, }; -static struct mfd_cell lp8788_devs[] = { +static const struct mfd_cell lp8788_devs[] = {/* 4 bucks */ MFD_DEV_WITH_ID (BUCK ,1 ),MFD_DEV_WITH_ID (BUCK ,2 ),
drivers/mfd/max77686.c +1 -1
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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" , },
drivers/mfd/max8998.c +2 -2
@@ -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" , }, {
drivers/mfd/rc5t583.c +1 -1
@@ -74,7 +74,7 @@ static struct deepsleep_control_data deepsleep_data[] = {#define EXT_PWR_REQ \ (RC5T583_EXT_PWRREQ1_CONTROL | RC5T583_EXT_PWRREQ2_CONTROL) -static struct mfd_cell rc5t583_subdevs[] = { +static const struct mfd_cell rc5t583_subdevs[] = { {.name ="rc5t583-gpio" ,}, {.name ="rc5t583-regulator" ,}, {.name ="rc5t583-rtc" , },
drivers/mfd/rdc321x-southbridge.c +1 -1
@@ -56,7 +56,7 @@ static struct resource rdc321x_gpio_resources[] = { } }; -static struct mfd_cell rdc321x_sb_cells[] = { +static const struct mfd_cell rdc321x_sb_cells[] = { { .name ="rdc321x-wdt" , .resources = rdc321x_wdt_resource,
drivers/mfd/retu-mfd.c +3 -3
@@ -55,7 +55,7 @@ static struct resource retu_pwrbutton_res[] = { }, }; -static struct mfd_cell retu_devs[] = { +static const struct mfd_cell retu_devs[] = { { .name ="retu-wdt" },
@@ -94,7 +94,7 @@ static struct resource tahvo_usb_res[] = { }, }; -static struct mfd_cell tahvo_devs[] = { +static const struct mfd_cell tahvo_devs[] = { { .name ="tahvo-usb" , .resources = tahvo_usb_res,
@@ -122,7 +122,7 @@ static const struct retu_data {char *chip_name;char *companion_name;struct regmap_irq_chip *irq_chip; -struct mfd_cell *children; +const struct mfd_cell *children;int nchildren; } retu_data[] = { [0] = {
drivers/mfd/sec-core.c +4 -4
@@ -31,7 +31,7 @@#include <linux/mfd/samsung/s5m8767.h> #include <linux/regmap.h> -static struct mfd_cell s5m8751_devs[] = { +static const struct mfd_cell s5m8751_devs[] = { { .name ="s5m8751-pmic" , }, {
@@ -41,7 +41,7 @@ static struct mfd_cell s5m8751_devs[] = { }, }; -static struct mfd_cell s5m8763_devs[] = { +static const struct mfd_cell s5m8763_devs[] = { { .name ="s5m8763-pmic" , }, {
@@ -51,7 +51,7 @@ static struct mfd_cell s5m8763_devs[] = { }, }; -static struct mfd_cell s5m8767_devs[] = { +static const struct mfd_cell s5m8767_devs[] = { { .name ="s5m8767-pmic" , }, {
@@ -59,7 +59,7 @@ static struct mfd_cell s5m8767_devs[] = { }, }; -static struct mfd_cell s2mps11_devs[] = { +static const struct mfd_cell s2mps11_devs[] = { { .name ="s2mps11-pmic" , }, {
drivers/mfd/stmpe.c +5 -5
@@ -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" , .of_compatible ="st,stmpe-gpio" , .resources = 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" , .of_compatible ="st,stmpe-gpio" ,/* 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" , .of_compatible ="st,stmpe-keypad" , .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" , .of_compatible ="st,stmpe-ts" , .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); } -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 ,NULL , stmpe->irq_base, stmpe->domain);
drivers/mfd/stmpe.h +1 -1
@@ -38,7 +38,7 @@ static inline void stmpe_dump_bytes(const char *str, const void *buf,* enable and altfunc callbacks */ struct stmpe_variant_block { -struct mfd_cell *cell; +const struct mfd_cell *cell;int irq;enum stmpe_block block; };
drivers/mfd/tc3589x.c +2 -2
@@ -155,7 +155,7 @@ static struct resource keypad_resources[] = { }, }; -static struct mfd_cell tc3589x_dev_gpio[] = { +static const struct mfd_cell tc3589x_dev_gpio[] = { { .name ="tc3589x-gpio" , .num_resources =ARRAY_SIZE (gpio_resources),
@@ -164,7 +164,7 @@ static struct mfd_cell tc3589x_dev_gpio[] = { }, }; -static struct mfd_cell tc3589x_dev_keypad[] = { +static const struct mfd_cell tc3589x_dev_keypad[] = { { .name ="tc3589x-keypad" , .num_resources =ARRAY_SIZE (keypad_resources),
drivers/mfd/tc6387xb.c +1 -1
@@ -126,7 +126,7 @@ static struct tmio_mmc_data tc6387xb_mmc_data = {/*--------------------------------------------------------------------------*/ -static struct mfd_cell tc6387xb_cells[] = { +static const struct mfd_cell tc6387xb_cells[] = { [TC6387XB_CELL_MMC ] = { .name ="tmio-mmc" , .enable = tc6387xb_mmc_enable,
drivers/mfd/timberdale.c +6 -6
@@ -374,7 +374,7 @@ static const struct resource timberdale_dma_resources[] = { }, }; -static struct mfd_cell timberdale_cells_bar0_cfg0[] = { +static const struct mfd_cell timberdale_cells_bar0_cfg0[] = { { .name ="timb-dma" , .num_resources =ARRAY_SIZE (timberdale_dma_resources),
@@ -431,7 +431,7 @@ static struct mfd_cell timberdale_cells_bar0_cfg0[] = { }, }; -static struct mfd_cell timberdale_cells_bar0_cfg1[] = { +static const struct mfd_cell timberdale_cells_bar0_cfg1[] = { { .name ="timb-dma" , .num_resources =ARRAY_SIZE (timberdale_dma_resources),
@@ -498,7 +498,7 @@ static struct mfd_cell timberdale_cells_bar0_cfg1[] = { }, }; -static struct mfd_cell timberdale_cells_bar0_cfg2[] = { +static const struct mfd_cell timberdale_cells_bar0_cfg2[] = { { .name ="timb-dma" , .num_resources =ARRAY_SIZE (timberdale_dma_resources),
@@ -548,7 +548,7 @@ static struct mfd_cell timberdale_cells_bar0_cfg2[] = { }, }; -static struct mfd_cell timberdale_cells_bar0_cfg3[] = { +static const struct mfd_cell timberdale_cells_bar0_cfg3[] = { { .name ="timb-dma" , .num_resources =ARRAY_SIZE (timberdale_dma_resources),
@@ -619,7 +619,7 @@ static const struct resource timberdale_sdhc_resources[] = { }, }; -static struct mfd_cell timberdale_cells_bar1[] = { +static const struct mfd_cell timberdale_cells_bar1[] = { { .name ="sdhci" , .num_resources =ARRAY_SIZE (timberdale_sdhc_resources),
@@ -627,7 +627,7 @@ static struct mfd_cell timberdale_cells_bar1[] = { }, }; -static struct mfd_cell timberdale_cells_bar2[] = { +static const struct mfd_cell timberdale_cells_bar2[] = { { .name ="sdhci" , .num_resources =ARRAY_SIZE (timberdale_sdhc_resources),
drivers/mfd/tps6507x.c +1 -1
@@ -24,7 +24,7 @@#include <linux/mfd/core.h> #include <linux/mfd/tps6507x.h> -static struct mfd_cell tps6507x_devs[] = { +static const struct mfd_cell tps6507x_devs[] = { { .name ="tps6507x-pmic" , },
drivers/mfd/tps65090.c +1 -1
@@ -64,7 +64,7 @@ static struct resource charger_resources[] = { } }; -static struct mfd_cell tps65090s[] = { +static const struct mfd_cell tps65090s[] = { { .name ="tps65090-pmic" , },
drivers/mfd/tps65217.c +1 -1
@@ -30,7 +30,7 @@#include <linux/mfd/core.h> #include <linux/mfd/tps65217.h> -static struct mfd_cell tps65217s[] = { +static const struct mfd_cell tps65217s[] = { { .name ="tps65217-pmic" , },
drivers/mfd/tps6586x.c +1 -1
@@ -103,7 +103,7 @@ static struct resource tps6586x_rtc_resources[] = { }, }; -static struct mfd_cell tps6586x_cell[] = { +static const struct mfd_cell tps6586x_cell[] = { { .name ="tps6586x-gpio" , },
drivers/mfd/tps65910.c +1 -1
@@ -36,7 +36,7 @@ static struct resource rtc_resources[] = { } }; -static struct mfd_cell tps65910s[] = { +static const struct mfd_cell tps65910s[] = { { .name ="tps65910-gpio" , },
drivers/mfd/tps65912-core.c +1 -1
@@ -21,7 +21,7 @@#include <linux/mfd/core.h> #include <linux/mfd/tps65912.h> -static struct mfd_cell tps65912s[] = { +static const struct mfd_cell tps65912s[] = { { .name ="tps65912-pmic" , },
drivers/mfd/tps80031.c +1 -1
@@ -44,7 +44,7 @@ static struct resource tps80031_rtc_resources[] = { };/* TPS80031 sub mfd devices */ -static struct mfd_cell tps80031_cell[] = { +static const struct mfd_cell tps80031_cell[] = { { .name ="tps80031-pmic" , },
drivers/mfd/viperboard.c +1 -1
@@ -37,7 +37,7 @@ static const struct usb_device_id vprbrd_table[] = {MODULE_DEVICE_TABLE (usb, vprbrd_table); -static struct mfd_cell vprbrd_devs[] = { +static const struct mfd_cell vprbrd_devs[] = { { .name ="viperboard-gpio" , },
drivers/mfd/vx855.c +1 -1
@@ -60,7 +60,7 @@ static struct resource vx855_gpio_resources[] = { }, }; -static struct mfd_cell vx855_cells[] = { +static const struct mfd_cell vx855_cells[] = { { .name ="vx855_gpio" , .num_resources =ARRAY_SIZE (vx855_gpio_resources),
drivers/mfd/wm831x-core.c +7 -7
@@ -1011,7 +1011,7 @@ static struct resource wm831x_wdt_resources[] = { }, }; -static struct mfd_cell wm8310_devs[] = { +static const struct mfd_cell wm8310_devs[] = { { .name ="wm831x-backup" , },
@@ -1165,7 +1165,7 @@ static struct mfd_cell wm8310_devs[] = { }, }; -static struct mfd_cell wm8311_devs[] = { +static const struct mfd_cell wm8311_devs[] = { { .name ="wm831x-backup" , },
@@ -1295,7 +1295,7 @@ static struct mfd_cell wm8311_devs[] = { }, }; -static struct mfd_cell wm8312_devs[] = { +static const struct mfd_cell wm8312_devs[] = { { .name ="wm831x-backup" , },
@@ -1449,7 +1449,7 @@ static struct mfd_cell wm8312_devs[] = { }, }; -static struct mfd_cell wm8320_devs[] = { +static const struct mfd_cell wm8320_devs[] = { { .name ="wm831x-backup" , },
@@ -1578,7 +1578,7 @@ static struct mfd_cell wm8320_devs[] = { }, }; -static struct mfd_cell touch_devs[] = { +static const struct mfd_cell touch_devs[] = { { .name ="wm831x-touch" , .num_resources =ARRAY_SIZE (wm831x_touch_resources),
@@ -1586,7 +1586,7 @@ static struct mfd_cell touch_devs[] = { }, }; -static struct mfd_cell rtc_devs[] = { +static const struct mfd_cell rtc_devs[] = { { .name ="wm831x-rtc" , .num_resources =ARRAY_SIZE (wm831x_rtc_resources),
@@ -1594,7 +1594,7 @@ static struct mfd_cell rtc_devs[] = { }, }; -static struct mfd_cell backlight_devs[] = { +static const struct mfd_cell backlight_devs[] = { { .name ="wm831x-backlight" , },
drivers/mfd/wm8994-core.c +2 -2
@@ -33,7 +33,7 @@#include "wm8994.h" -static struct mfd_cell wm8994_regulator_devs[] = { +static const struct mfd_cell wm8994_regulator_devs[] = { { .name ="wm8994-ldo" , .id =1 ,
@@ -62,7 +62,7 @@ static struct resource wm8994_gpio_resources[] = { }, }; -static struct mfd_cell wm8994_devs[] = { +static const struct mfd_cell wm8994_devs[] = { { .name ="wm8994-codec" , .num_resources =ARRAY_SIZE (wm8994_codec_resources),
drivers/staging/nvec/nvec.c +1 -1
@@ -83,7 +83,7 @@ enum nvec_sleep_subcmds {static struct nvec_chip *nvec_power_handle; -static struct mfd_cell nvec_devices[] = { +static const struct mfd_cell nvec_devices[] = { { .name ="nvec-kbd" , .id =1 ,
Signature · 1 line
1.7.9.5
Quoted 46 lines · Geert Uytterhoeven
As of commit
03e361b25ee8dfb1fd9b890072c23c4aae01c6c7("mfd: Stop setting refcounting pointers in originalmfd_cellarrays"), the "cell" parameter ofmfd_add_devices()is "const" again. Hence make all cell data passed tomfd_add_devices()const where possible.Signed-off-by Geert Uytterhoeven <[email protected]>---
Compile tested:
- cs5535-mfd,intel_msic, and sta2x11-mfd for x86,
- all other drivers for arm.drivers/mfd/88pm800.c | 4 ++-- drivers/mfd/88pm805.c | 2 +- drivers/mfd/ab8500-core.c | 14 +++++++------- drivers/mfd/arizona-core.c | 8 ++++---- drivers/mfd/as3722.c | 2 +- drivers/mfd/asic3.c | 4 ++-- drivers/mfd/cros_ec.c | 2 +- drivers/mfd/da9052-core.c | 2 +- drivers/mfd/da9055-core.c | 2 +- drivers/mfd/da9063-core.c | 2 +- drivers/mfd/db8500-prcmu.c | 4 ++-- drivers/mfd/htc-pasic3.c | 2 +- drivers/mfd/intel_msic.c | 2 +- drivers/mfd/jz4740-adc.c | 2 +- drivers/mfd/lp8788.c | 2 +- drivers/mfd/max77686.c | 2 +- drivers/mfd/max77693.c | 2 +- drivers/mfd/max8907.c | 2 +- drivers/mfd/max8925-core.c | 8 ++++---- drivers/mfd/max8997.c | 2 +- drivers/mfd/max8998.c | 4 ++-- drivers/mfd/rc5t583.c | 2 +- drivers/mfd/rdc321x-southbridge.c | 2 +- drivers/mfd/retu-mfd.c | 6 +++--- drivers/mfd/sec-core.c | 8 ++++---- drivers/mfd/stmpe.c | 10 +++++----- drivers/mfd/stmpe.h | 2 +- drivers/mfd/tc3589x.c | 4 ++-- drivers/mfd/tc6387xb.c | 2 +- drivers/mfd/timberdale.c | 12 ++++++------ drivers/mfd/tps6507x.c | 2 +- drivers/mfd/tps65090.c | 2 +- drivers/mfd/tps65217.c | 2 +- drivers/mfd/tps6586x.c | 2 +- drivers/mfd/tps65910.c | 2 +-
Quoted 8 lines
drivers/mfd/tps65912-core.c | 2 +- drivers/mfd/tps80031.c | 2 +- drivers/mfd/viperboard.c | 2 +- drivers/mfd/vx855.c | 2 +- drivers/mfd/wm831x-core.c | 14 +++++++------- drivers/mfd/wm8994-core.c | 4 ++-- drivers/staging/nvec/nvec.c | 2 +- 42 files changed, 80 insertions(+), 80 deletions(-)
In the interests of bisectability and revertability, I'd prefer one patch per file-change where possible please. Or at the very least in groups of files, so one for tps*, another one for max*, etc.
Signature · 4 lines
Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
Quoted 3 lines · Lee Jones
In the interests of bisectability and revertability, I'd prefer one patch per file-change where possible please. Or at the very least in groups of files, so one for tps*, another one for max*, etc.
Done. More SoB-credits for me ;-)
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
Quoted 6 lines · Geert Uytterhoeven
Quoted 3 lines · Lee Jones
In the interests of bisectability and revertability, I'd prefer one patch per file-change where possible please. Or at the very least in groups of files, so one for tps*, another one for max*, etc.
Done. More SoB-credits for me ;-)
You're welcome. :)
Signature · 4 lines
Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog