Commit a9e9ce4c authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman
Browse files

mfd: remove use of __devinitdata 



CONFIG_HOTPLUG is going away as an option so __devinitdata is no
longer needed.

Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Cc: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
Cc: Peter Tyser <ptyser@xes-inc.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f791be49

drivers/mfd/88pm860x-core.c

+34 −34
Original line number Diff line number Diff line
@@ -28,111 +28,111 @@ 


#define INT_STATUS_NUM			3



static struct resource bk0_resources[] __devinitdata = {

static struct resource bk0_resources[] = {

	{2, 2, "duty cycle", IORESOURCE_REG, },

	{3, 3, "always on",  IORESOURCE_REG, },

	{3, 3, "current",    IORESOURCE_REG, },

};

static struct resource bk1_resources[] __devinitdata = {

static struct resource bk1_resources[] = {

	{4, 4, "duty cycle", IORESOURCE_REG, },

	{5, 5, "always on",  IORESOURCE_REG, },

	{5, 5, "current",    IORESOURCE_REG, },

};

static struct resource bk2_resources[] __devinitdata = {

static struct resource bk2_resources[] = {

	{6, 6, "duty cycle", IORESOURCE_REG, },

	{7, 7, "always on",  IORESOURCE_REG, },

	{5, 5, "current",    IORESOURCE_REG, },

};



static struct resource led0_resources[] __devinitdata = {

static struct resource led0_resources[] = {

	/* RGB1 Red LED */

	{0xd, 0xd, "control", IORESOURCE_REG, },

	{0xc, 0xc, "blink",   IORESOURCE_REG, },

};

static struct resource led1_resources[] __devinitdata = {

static struct resource led1_resources[] = {

	/* RGB1 Green LED */

	{0xe, 0xe, "control", IORESOURCE_REG, },

	{0xc, 0xc, "blink",   IORESOURCE_REG, },

};

static struct resource led2_resources[] __devinitdata = {

static struct resource led2_resources[] = {

	/* RGB1 Blue LED */

	{0xf, 0xf, "control", IORESOURCE_REG, },

	{0xc, 0xc, "blink",   IORESOURCE_REG, },

};

static struct resource led3_resources[] __devinitdata = {

static struct resource led3_resources[] = {

	/* RGB2 Red LED */

	{0x9, 0x9, "control", IORESOURCE_REG, },

	{0x8, 0x8, "blink",   IORESOURCE_REG, },

};

static struct resource led4_resources[] __devinitdata = {

static struct resource led4_resources[] = {

	/* RGB2 Green LED */

	{0xa, 0xa, "control", IORESOURCE_REG, },

	{0x8, 0x8, "blink",   IORESOURCE_REG, },

};

static struct resource led5_resources[] __devinitdata = {

static struct resource led5_resources[] = {

	/* RGB2 Blue LED */

	{0xb, 0xb, "control", IORESOURCE_REG, },

	{0x8, 0x8, "blink",   IORESOURCE_REG, },

};



static struct resource buck1_resources[] __devinitdata = {

static struct resource buck1_resources[] = {

	{0x24, 0x24, "buck set", IORESOURCE_REG, },

};

static struct resource buck2_resources[] __devinitdata = {

static struct resource buck2_resources[] = {

	{0x25, 0x25, "buck set", IORESOURCE_REG, },

};

static struct resource buck3_resources[] __devinitdata = {

static struct resource buck3_resources[] = {

	{0x26, 0x26, "buck set", IORESOURCE_REG, },

};

static struct resource ldo1_resources[] __devinitdata = {

static struct resource ldo1_resources[] = {

	{0x10, 0x10, "ldo set", IORESOURCE_REG, },

};

static struct resource ldo2_resources[] __devinitdata = {

static struct resource ldo2_resources[] = {

	{0x11, 0x11, "ldo set", IORESOURCE_REG, },

};

static struct resource ldo3_resources[] __devinitdata = {

static struct resource ldo3_resources[] = {

	{0x12, 0x12, "ldo set", IORESOURCE_REG, },

};

static struct resource ldo4_resources[] __devinitdata = {

static struct resource ldo4_resources[] = {

	{0x13, 0x13, "ldo set", IORESOURCE_REG, },

};

static struct resource ldo5_resources[] __devinitdata = {

static struct resource ldo5_resources[] = {

	{0x14, 0x14, "ldo set", IORESOURCE_REG, },

};

static struct resource ldo6_resources[] __devinitdata = {

static struct resource ldo6_resources[] = {

	{0x15, 0x15, "ldo set", IORESOURCE_REG, },

};

static struct resource ldo7_resources[] __devinitdata = {

static struct resource ldo7_resources[] = {

	{0x16, 0x16, "ldo set", IORESOURCE_REG, },

};

static struct resource ldo8_resources[] __devinitdata = {

static struct resource ldo8_resources[] = {

	{0x17, 0x17, "ldo set", IORESOURCE_REG, },

};

static struct resource ldo9_resources[] __devinitdata = {

static struct resource ldo9_resources[] = {

	{0x18, 0x18, "ldo set", IORESOURCE_REG, },

};

static struct resource ldo10_resources[] __devinitdata = {

static struct resource ldo10_resources[] = {

	{0x19, 0x19, "ldo set", IORESOURCE_REG, },

};

static struct resource ldo12_resources[] __devinitdata = {

static struct resource ldo12_resources[] = {

	{0x1a, 0x1a, "ldo set", IORESOURCE_REG, },

};

static struct resource ldo_vibrator_resources[] __devinitdata = {

static struct resource ldo_vibrator_resources[] = {

	{0x28, 0x28, "ldo set", IORESOURCE_REG, },

};

static struct resource ldo14_resources[] __devinitdata = {

static struct resource ldo14_resources[] = {

	{0x1b, 0x1b, "ldo set", IORESOURCE_REG, },

};



static struct resource touch_resources[] __devinitdata = {

static struct resource touch_resources[] = {

	{PM8607_IRQ_PEN, PM8607_IRQ_PEN, "touch", IORESOURCE_IRQ,},

};



static struct resource onkey_resources[] __devinitdata = {

static struct resource onkey_resources[] = {

	{PM8607_IRQ_ONKEY, PM8607_IRQ_ONKEY, "onkey", IORESOURCE_IRQ,},

};



static struct resource codec_resources[] __devinitdata = {

static struct resource codec_resources[] = {

	/* Headset microphone insertion or removal */

	{PM8607_IRQ_MICIN,   PM8607_IRQ_MICIN,   "micin",   IORESOURCE_IRQ,},

	/* Hook-switch press or release */
@@ -143,12 +143,12 @@ static struct resource codec_resources[] __devinitdata = { 
	{PM8607_IRQ_AUDIO_SHORT, PM8607_IRQ_AUDIO_SHORT, "audio-short", IORESOURCE_IRQ,},

};



static struct resource battery_resources[] __devinitdata = {

static struct resource battery_resources[] = {

	{PM8607_IRQ_CC,  PM8607_IRQ_CC,  "columb counter", IORESOURCE_IRQ,},

	{PM8607_IRQ_BAT, PM8607_IRQ_BAT, "battery",        IORESOURCE_IRQ,},

};



static struct resource charger_resources[] __devinitdata = {

static struct resource charger_resources[] = {

	{PM8607_IRQ_CHG,  PM8607_IRQ_CHG,  "charger detect",  IORESOURCE_IRQ,},

	{PM8607_IRQ_CHG_DONE,  PM8607_IRQ_CHG_DONE,  "charging done",       IORESOURCE_IRQ,},

	{PM8607_IRQ_CHG_FAIL,  PM8607_IRQ_CHG_FAIL,  "charging timeout",    IORESOURCE_IRQ,},
@@ -158,11 +158,11 @@ static struct resource charger_resources[] __devinitdata = { 
	{PM8607_IRQ_VCHG, PM8607_IRQ_VCHG, "vchg voltage",    IORESOURCE_IRQ,},

};



static struct resource rtc_resources[] __devinitdata = {

static struct resource rtc_resources[] = {

	{PM8607_IRQ_RTC, PM8607_IRQ_RTC, "rtc", IORESOURCE_IRQ,},

};



static struct mfd_cell bk_devs[] __devinitdata = {

static struct mfd_cell bk_devs[] = {

	{

		.name = "88pm860x-backlight",

		.id = 0,
@@ -181,7 +181,7 @@ static struct mfd_cell bk_devs[] __devinitdata = { 
	},

};



static struct mfd_cell led_devs[] __devinitdata = {

static struct mfd_cell led_devs[] = {

	{

		.name = "88pm860x-led",

		.id = 0,
@@ -215,7 +215,7 @@ static struct mfd_cell led_devs[] __devinitdata = { 
	},

};



static struct mfd_cell reg_devs[] __devinitdata = {

static struct mfd_cell reg_devs[] = {

	{

		.name = "88pm860x-regulator",

		.id = 0,

drivers/mfd/ab8500-core.c

+17 −17
Original line number Diff line number Diff line
@@ -623,7 +623,7 @@ static struct resource __devinitdata ab9540_gpio_resources[] = { 
	}

};



static struct resource __devinitdata ab8500_gpadc_resources[] = {

static struct resource ab8500_gpadc_resources[] = {

	{

		.name	= "HW_CONV_END",

		.start	= AB8500_INT_GP_HW_ADC_CONV_END,
@@ -638,7 +638,7 @@ static struct resource __devinitdata ab8500_gpadc_resources[] = { 
	},

};



static struct resource __devinitdata ab8500_rtc_resources[] = {

static struct resource ab8500_rtc_resources[] = {

	{

		.name	= "60S",

		.start	= AB8500_INT_RTC_60S,
@@ -653,7 +653,7 @@ static struct resource __devinitdata ab8500_rtc_resources[] = { 
	},

};



static struct resource __devinitdata ab8500_poweronkey_db_resources[] = {

static struct resource ab8500_poweronkey_db_resources[] = {

	{

		.name	= "ONKEY_DBF",

		.start	= AB8500_INT_PON_KEY1DB_F,
@@ -668,7 +668,7 @@ static struct resource __devinitdata ab8500_poweronkey_db_resources[] = { 
	},

};



static struct resource __devinitdata ab8500_av_acc_detect_resources[] = {

static struct resource ab8500_av_acc_detect_resources[] = {

	{

	       .name = "ACC_DETECT_1DB_F",

	       .start = AB8500_INT_ACC_DETECT_1DB_F,
@@ -707,7 +707,7 @@ static struct resource __devinitdata ab8500_av_acc_detect_resources[] = { 
	},

};



static struct resource __devinitdata ab8500_charger_resources[] = {

static struct resource ab8500_charger_resources[] = {

	{

		.name = "MAIN_CH_UNPLUG_DET",

		.start = AB8500_INT_MAIN_CH_UNPLUG_DET,
@@ -788,7 +788,7 @@ static struct resource __devinitdata ab8500_charger_resources[] = { 
	},

};



static struct resource __devinitdata ab8500_btemp_resources[] = {

static struct resource ab8500_btemp_resources[] = {

	{

		.name = "BAT_CTRL_INDB",

		.start = AB8500_INT_BAT_CTRL_INDB,
@@ -821,7 +821,7 @@ static struct resource __devinitdata ab8500_btemp_resources[] = { 
	},

};



static struct resource __devinitdata ab8500_fg_resources[] = {

static struct resource ab8500_fg_resources[] = {

	{

		.name = "NCONV_ACCU",

		.start = AB8500_INT_CCN_CONV_ACC,
@@ -860,10 +860,10 @@ static struct resource __devinitdata ab8500_fg_resources[] = { 
	},

};



static struct resource __devinitdata ab8500_chargalg_resources[] = {};

static struct resource ab8500_chargalg_resources[] = {};



#ifdef CONFIG_DEBUG_FS

static struct resource __devinitdata ab8500_debug_resources[] = {

static struct resource ab8500_debug_resources[] = {

	{

		.name	= "IRQ_FIRST",

		.start	= AB8500_INT_MAIN_EXT_CH_NOT_OK,
@@ -879,7 +879,7 @@ static struct resource __devinitdata ab8500_debug_resources[] = { 
};

#endif



static struct resource __devinitdata ab8500_usb_resources[] = {

static struct resource ab8500_usb_resources[] = {

	{

		.name = "ID_WAKEUP_R",

		.start = AB8500_INT_ID_WAKEUP_R,
@@ -924,7 +924,7 @@ static struct resource __devinitdata ab8500_usb_resources[] = { 
	},

};



static struct resource __devinitdata ab8505_iddet_resources[] = {

static struct resource ab8505_iddet_resources[] = {

	{

		.name  = "KeyDeglitch",

		.start = AB8505_INT_KEYDEGLITCH,
@@ -957,7 +957,7 @@ static struct resource __devinitdata ab8505_iddet_resources[] = { 
	},

};



static struct resource __devinitdata ab8500_temp_resources[] = {

static struct resource ab8500_temp_resources[] = {

	{

		.name  = "AB8500_TEMP_WARM",

		.start = AB8500_INT_TEMP_WARM,
@@ -966,7 +966,7 @@ static struct resource __devinitdata ab8500_temp_resources[] = { 
	},

};



static struct mfd_cell __devinitdata abx500_common_devs[] = {

static struct mfd_cell abx500_common_devs[] = {

#ifdef CONFIG_DEBUG_FS

	{

		.name = "ab8500-debug",
@@ -1038,7 +1038,7 @@ static struct mfd_cell __devinitdata abx500_common_devs[] = { 
	},

};



static struct mfd_cell __devinitdata ab8500_bm_devs[] = {

static struct mfd_cell ab8500_bm_devs[] = {

	{

		.name = "ab8500-charger",

		.num_resources = ARRAY_SIZE(ab8500_charger_resources),
@@ -1061,7 +1061,7 @@ static struct mfd_cell __devinitdata ab8500_bm_devs[] = { 
	},

};



static struct mfd_cell __devinitdata ab8500_devs[] = {

static struct mfd_cell ab8500_devs[] = {

	{

		.name = "ab8500-gpio",

		.of_compatible = "stericsson,ab8500-gpio",
@@ -1080,7 +1080,7 @@ static struct mfd_cell __devinitdata ab8500_devs[] = { 
	},

};



static struct mfd_cell __devinitdata ab9540_devs[] = {

static struct mfd_cell ab9540_devs[] = {

	{

		.name = "ab8500-gpio",

		.num_resources = ARRAY_SIZE(ab9540_gpio_resources),
@@ -1097,7 +1097,7 @@ static struct mfd_cell __devinitdata ab9540_devs[] = { 
};



/* Device list common to ab9540 and ab8505 */

static struct mfd_cell __devinitdata ab9540_ab8505_devs[] = {

static struct mfd_cell ab9540_ab8505_devs[] = {

	{

		.name = "ab-iddet",

		.num_resources = ARRAY_SIZE(ab8505_iddet_resources),

drivers/mfd/cs5535-mfd.c

+2 −2
Original line number Diff line number Diff line
@@ -71,9 +71,9 @@ static int cs5535_mfd_res_disable(struct platform_device *pdev) 
	return 0;

}



static __devinitdata struct resource cs5535_mfd_resources[NR_BARS];

static struct resource cs5535_mfd_resources[NR_BARS];



static __devinitdata struct mfd_cell cs5535_mfd_cells[] = {

static struct mfd_cell cs5535_mfd_cells[] = {

	{

		.id = SMB_BAR,

		.name = "cs5535-smb",

drivers/mfd/da9052-core.c

+1 −1
Original line number Diff line number Diff line
@@ -515,7 +515,7 @@ static struct resource da9052_tsi_resources[] = { 
	},

};



static struct mfd_cell __devinitdata da9052_subdev_info[] = {

static struct mfd_cell da9052_subdev_info[] = {

	{

		.name = "da9052-regulator",

		.id = 1,

drivers/mfd/lpc_ich.c

+1 −1
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ enum lpc_chipsets { 
	LPC_LPT_LP,	/* Lynx Point-LP */

};



struct lpc_ich_info lpc_chipset_info[] __devinitdata = {

struct lpc_ich_info lpc_chipset_info[] = {

	[LPC_ICH] = {

		.name = "ICH",

		.iTCO_version = 1,