Skip to contentSkip to conversation

ARM: OMAP/TWL: remove unused pdata IRQ fields

PATCH New Kevin Hilman 2 participants 4 messages May 8, 2012 – May 11, 2012

Subsystems (3)
Arm (32-bit) Arm sub-architectures OMAP2+ support
lore
Share & tools
lore

Kevin Hilman

author
#0 lore raw

cover ARM: OMAP/TWL: remove unused pdata IRQ fields

The TWL driver has been converted to SPARSE_IRQ, and no longer needs these fields. Remove them.

Samuel, with your ack, we can keep the twl.h change with the OMAP change that removes all the users so they merge together and avoid potential build problems if they merge separately.

Kevin

Kevin Hilman (2):
ARM: OMAP2+: TWL: remove usage of pdata->irq_base/_end
mfd: twl: remove pdata->irq_base/_end, no more users

 arch/arm/mach-omap2/board-2430sdp.c    |    3 ---
 arch/arm/mach-omap2/board-omap3logic.c |    3 ---
 arch/arm/mach-omap2/twl-common.c       |   10 ----------
 include/linux/i2c/twl.h                |    1 -
 4 files changed, 17 deletions(-)
Signature · 1 line
1.7.9.2
author
#1 lore raw

PATCH 1/2 ARM: OMAP2+: TWL: remove usage of pdata->irq_base/_end

The TWL driver has been converted to use SPARSE_IRQ and no longer needs to be passed IRQ base/end. Since driver no longer uses these fields, so remove them from the reamaining users.

Cc Benoit Cousson <[email protected]>
Cc Samuel Ortiz <[email protected]>
Signed-off-by Kevin Hilman <[email protected]>
---
 arch/arm/mach-omap2/board-2430sdp.c    |    3 ---
 arch/arm/mach-omap2/board-omap3logic.c |    3 ---
 arch/arm/mach-omap2/twl-common.c       |   10 ----------
 3 files changed, 16 deletions(-)
arch/arm/mach-omap2/board-2430sdp.c +0 -3
index e658f83..3a59a25 100644
@@ -218,9 +218,6 @@ static struct twl4030_gpio_platform_data sdp2430_gpio_data = {
 };
 
 static struct twl4030_platform_data sdp2430_twldata = {
-	.irq_base	= TWL4030_IRQ_BASE,
-	.irq_end	= TWL4030_IRQ_END,
-
 	/* platform_data for children goes here */
 	.gpio		= &sdp2430_gpio_data,
 	.vmmc1		= &sdp2430_vmmc1,
arch/arm/mach-omap2/board-omap3logic.c +0 -3
index 9b3c141..0dea793 100644
@@ -86,9 +86,6 @@ static struct twl4030_gpio_platform_data omap3logic_gpio_data = {
 };
 
 static struct twl4030_platform_data omap3logic_twldata = {
-	.irq_base	= TWL4030_IRQ_BASE,
-	.irq_end	= TWL4030_IRQ_END,
-
 	/* platform_data for children goes here */
 	.gpio		= &omap3logic_gpio_data,
 	.vmmc1		= &omap3logic_vmmc1,
arch/arm/mach-omap2/twl-common.c +0 -10
index 7a7b893..f0e0fee 100644
@@ -156,11 +156,6 @@ static struct regulator_init_data omap3_vpll2_idata = {
 void __init omap3_pmic_get_config(struct twl4030_platform_data *pmic_data,
 				  u32 pdata_flags, u32 regulators_flags)
 {
-	if (!pmic_data->irq_base)
-		pmic_data->irq_base = TWL4030_IRQ_BASE;
-	if (!pmic_data->irq_end)
-		pmic_data->irq_end = TWL4030_IRQ_END;
-
 	/* Common platform data configurations */
 	if (pdata_flags & TWL_COMMON_PDATA_USB && !pmic_data->usb)
 		pmic_data->usb = &omap3_usb_pdata;

@@ -313,11 +308,6 @@ static struct regulator_init_data omap4_clk32kg_idata = {
 void __init omap4_pmic_get_config(struct twl4030_platform_data *pmic_data,
 				  u32 pdata_flags, u32 regulators_flags)
 {
-	if (!pmic_data->irq_base)
-		pmic_data->irq_base = TWL6030_IRQ_BASE;
-	if (!pmic_data->irq_end)
-		pmic_data->irq_end = TWL6030_IRQ_END;
-
 	/* Common platform data configurations */
 	if (pdata_flags & TWL_COMMON_PDATA_USB && !pmic_data->usb)
 		pmic_data->usb = &omap4_usb_pdata;
Signature · 1 line
1.7.9.2
author
#2 lore raw

PATCH 2/2 mfd: twl: remove pdata->irq_base/_end, no more users

In reply to Kevin Hilman

After converstion to SPARSE_IRQ, the driver doesn't use the pdata->irq_base/irq_end fields anymore. The last users have been cleanup up, and now these fields can be removed.

Cc Benoit Cousson <[email protected]>
Cc Samuel Ortiz <[email protected]>
Signed-off-by Kevin Hilman <[email protected]>
---
 include/linux/i2c/twl.h |    1 -
 1 file changed, 1 deletion(-)
include/linux/i2c/twl.h +0 -1
index 1f90de0..f8b967c 100644
@@ -685,7 +685,6 @@ struct twl4030_audio_data {
 };
 
 struct twl4030_platform_data {
-	unsigned				irq_base, irq_end;
 	struct twl4030_clock_init_data		*clock;
 	struct twl4030_bci_platform_data	*bci;
 	struct twl4030_gpio_platform_data	*gpio;
Signature · 1 line
1.7.9.2
#3 lore raw

PATCH 2/2 mfd: twl: remove pdata->irq_base/_end, no more users

Hi Kevin,

Quoted 7 lines · Kevin Hilman

After converstion to SPARSE_IRQ, the driver doesn't use the pdata->irq_base/irq_end fields anymore. The last users have been cleanup up, and now these fields can be removed.

Cc Benoit Cousson <[email protected]>
Cc Samuel Ortiz <[email protected]>
Signed-off-by Kevin Hilman <[email protected]>
Acked-by Samuel Ortiz <[email protected]>

Cheers,
Samuel.

Signature · 2 lines
Intel Open Source Technology Centre
http://oss.intel.com/