From ed400392388151c1dd2adda9be55b0cdf5efbf9a Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Mon, 5 Nov 2012 16:10:29 +0100 Subject: [PATCH] --- yaml --- r: 344951 b: refs/heads/master c: 8ae754ebd5edffa0b2a2bafa4879a9ace01d5477 h: refs/heads/master i: 344949: 4dd79b4e4da0e432bebef6bbed22cc617950d671 344947: f36f757126bca8175bf151c430cd24da20e3f768 344943: dab0914a183f1063326e5b55108154be573221c8 v: v3 --- [refs] | 2 +- trunk/drivers/mfd/ab8500-core.c | 36 --------------------------------- 2 files changed, 1 insertion(+), 37 deletions(-) diff --git a/[refs] b/[refs] index 1f5d8b54bd57..41ac1f47e726 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aec17ea1ee78923f1287c18e9905c19e4dfd9c64 +refs/heads/master: 8ae754ebd5edffa0b2a2bafa4879a9ace01d5477 diff --git a/trunk/drivers/mfd/ab8500-core.c b/trunk/drivers/mfd/ab8500-core.c index 1667c77b5cde..e7197fe7059a 100644 --- a/trunk/drivers/mfd/ab8500-core.c +++ b/trunk/drivers/mfd/ab8500-core.c @@ -591,38 +591,6 @@ int ab8500_suspend(struct ab8500 *ab8500) return 0; } -/* AB8500 GPIO Resources */ -static struct resource __devinitdata ab8500_gpio_resources[] = { - { - .name = "GPIO_INT6", - .start = AB8500_INT_GPIO6R, - .end = AB8500_INT_GPIO41F, - .flags = IORESOURCE_IRQ, - } -}; - -/* AB9540 GPIO Resources */ -static struct resource __devinitdata ab9540_gpio_resources[] = { - { - .name = "GPIO_INT6", - .start = AB8500_INT_GPIO6R, - .end = AB8500_INT_GPIO41F, - .flags = IORESOURCE_IRQ, - }, - { - .name = "GPIO_INT14", - .start = AB9540_INT_GPIO50R, - .end = AB9540_INT_GPIO54R, - .flags = IORESOURCE_IRQ, - }, - { - .name = "GPIO_INT15", - .start = AB9540_INT_GPIO50F, - .end = AB9540_INT_GPIO54F, - .flags = IORESOURCE_IRQ, - } -}; - static struct resource __devinitdata ab8500_gpadc_resources[] = { { .name = "HW_CONV_END", @@ -1065,8 +1033,6 @@ static struct mfd_cell __devinitdata ab8500_devs[] = { { .name = "ab8500-gpio", .of_compatible = "stericsson,ab8500-gpio", - .num_resources = ARRAY_SIZE(ab8500_gpio_resources), - .resources = ab8500_gpio_resources, }, { .name = "ab8500-usb", @@ -1083,8 +1049,6 @@ static struct mfd_cell __devinitdata ab8500_devs[] = { static struct mfd_cell __devinitdata ab9540_devs[] = { { .name = "ab8500-gpio", - .num_resources = ARRAY_SIZE(ab9540_gpio_resources), - .resources = ab9540_gpio_resources, }, { .name = "ab9540-usb",