diff options
| author | Tony Lindgren <tony@atomide.com> | 2006-04-09 17:21:02 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-04-09 17:21:02 -0400 |
| commit | 50e5629aa956c8c82015c90554a9a3fbf54cb404 (patch) | |
| tree | 30e5c819a15bab4f1c9d3124a8f4390155b0e1ba | |
| parent | 932355797530f5bd4e1355a2c384e9f3ccc3dcbc (diff) | |
[ARM] 3460/1: ARM: OMAP: Remove unnecessary nop_release()
Patch from Tony Lindgren
Remove unnecessary omap_nop_release() as noted by RMK.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/mach-omap1/devices.c | 11 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/devices.c | 10 | ||||
| -rw-r--r-- | arch/arm/plat-omap/devices.c | 22 |
3 files changed, 0 insertions, 43 deletions
diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c index 876c38da14f7..847329cafc5c 100644 --- a/arch/arm/mach-omap1/devices.c +++ b/arch/arm/mach-omap1/devices.c | |||
| @@ -25,10 +25,6 @@ | |||
| 25 | #include <asm/arch/mux.h> | 25 | #include <asm/arch/mux.h> |
| 26 | #include <asm/arch/gpio.h> | 26 | #include <asm/arch/gpio.h> |
| 27 | 27 | ||
| 28 | extern void omap_nop_release(struct device *dev); | ||
| 29 | |||
| 30 | /*-------------------------------------------------------------------------*/ | ||
| 31 | |||
| 32 | #if defined(CONFIG_OMAP1610_IR) || defined(CONFIG_OMAP161O_IR_MODULE) | 28 | #if defined(CONFIG_OMAP1610_IR) || defined(CONFIG_OMAP161O_IR_MODULE) |
| 33 | 29 | ||
| 34 | static u64 irda_dmamask = 0xffffffff; | 30 | static u64 irda_dmamask = 0xffffffff; |
| @@ -37,7 +33,6 @@ static struct platform_device omap1610ir_device = { | |||
| 37 | .name = "omap1610-ir", | 33 | .name = "omap1610-ir", |
| 38 | .id = -1, | 34 | .id = -1, |
| 39 | .dev = { | 35 | .dev = { |
| 40 | .release = omap_nop_release, | ||
| 41 | .dma_mask = &irda_dmamask, | 36 | .dma_mask = &irda_dmamask, |
| 42 | }, | 37 | }, |
| 43 | }; | 38 | }; |
| @@ -84,9 +79,6 @@ static struct resource rtc_resources[] = { | |||
| 84 | static struct platform_device omap_rtc_device = { | 79 | static struct platform_device omap_rtc_device = { |
| 85 | .name = "omap_rtc", | 80 | .name = "omap_rtc", |
| 86 | .id = -1, | 81 | .id = -1, |
| 87 | .dev = { | ||
| 88 | .release = omap_nop_release, | ||
| 89 | }, | ||
| 90 | .num_resources = ARRAY_SIZE(rtc_resources), | 82 | .num_resources = ARRAY_SIZE(rtc_resources), |
| 91 | .resource = rtc_resources, | 83 | .resource = rtc_resources, |
| 92 | }; | 84 | }; |
| @@ -124,9 +116,6 @@ static struct resource sti_resources[] = { | |||
| 124 | static struct platform_device sti_device = { | 116 | static struct platform_device sti_device = { |
| 125 | .name = "sti", | 117 | .name = "sti", |
| 126 | .id = -1, | 118 | .id = -1, |
| 127 | .dev = { | ||
| 128 | .release = omap_nop_release, | ||
| 129 | }, | ||
| 130 | .num_resources = ARRAY_SIZE(sti_resources), | 119 | .num_resources = ARRAY_SIZE(sti_resources), |
| 131 | .resource = sti_resources, | 120 | .resource = sti_resources, |
| 132 | }; | 121 | }; |
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index def9e5370edf..fb7f91da1aad 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c | |||
| @@ -25,10 +25,6 @@ | |||
| 25 | #include <asm/arch/mux.h> | 25 | #include <asm/arch/mux.h> |
| 26 | #include <asm/arch/gpio.h> | 26 | #include <asm/arch/gpio.h> |
| 27 | 27 | ||
| 28 | extern void omap_nop_release(struct device *dev); | ||
| 29 | |||
| 30 | /*-------------------------------------------------------------------------*/ | ||
| 31 | |||
| 32 | #if defined(CONFIG_I2C_OMAP) || defined(CONFIG_I2C_OMAP_MODULE) | 28 | #if defined(CONFIG_I2C_OMAP) || defined(CONFIG_I2C_OMAP_MODULE) |
| 33 | 29 | ||
| 34 | #define OMAP2_I2C_BASE2 0x48072000 | 30 | #define OMAP2_I2C_BASE2 0x48072000 |
| @@ -49,9 +45,6 @@ static struct resource i2c_resources2[] = { | |||
| 49 | static struct platform_device omap_i2c_device2 = { | 45 | static struct platform_device omap_i2c_device2 = { |
| 50 | .name = "i2c_omap", | 46 | .name = "i2c_omap", |
| 51 | .id = 2, | 47 | .id = 2, |
| 52 | .dev = { | ||
| 53 | .release = omap_nop_release, | ||
| 54 | }, | ||
| 55 | .num_resources = ARRAY_SIZE(i2c_resources2), | 48 | .num_resources = ARRAY_SIZE(i2c_resources2), |
| 56 | .resource = i2c_resources2, | 49 | .resource = i2c_resources2, |
| 57 | }; | 50 | }; |
| @@ -100,9 +93,6 @@ static struct resource sti_resources[] = { | |||
| 100 | static struct platform_device sti_device = { | 93 | static struct platform_device sti_device = { |
| 101 | .name = "sti", | 94 | .name = "sti", |
| 102 | .id = -1, | 95 | .id = -1, |
| 103 | .dev = { | ||
| 104 | .release = omap_nop_release, | ||
| 105 | }, | ||
| 106 | .num_resources = ARRAY_SIZE(sti_resources), | 96 | .num_resources = ARRAY_SIZE(sti_resources), |
| 107 | .resource = sti_resources, | 97 | .resource = sti_resources, |
| 108 | }; | 98 | }; |
diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c index 079b67deac0f..5d5d6eb222dd 100644 --- a/arch/arm/plat-omap/devices.c +++ b/arch/arm/plat-omap/devices.c | |||
| @@ -26,14 +26,6 @@ | |||
| 26 | #include <asm/arch/gpio.h> | 26 | #include <asm/arch/gpio.h> |
| 27 | #include <asm/arch/menelaus.h> | 27 | #include <asm/arch/menelaus.h> |
| 28 | 28 | ||
| 29 | |||
| 30 | void omap_nop_release(struct device *dev) | ||
| 31 | { | ||
| 32 | /* Nothing */ | ||
| 33 | } | ||
| 34 | |||
| 35 | /*-------------------------------------------------------------------------*/ | ||
| 36 | |||
| 37 | #if defined(CONFIG_I2C_OMAP) || defined(CONFIG_I2C_OMAP_MODULE) | 29 | #if defined(CONFIG_I2C_OMAP) || defined(CONFIG_I2C_OMAP_MODULE) |
| 38 | 30 | ||
| 39 | #define OMAP1_I2C_BASE 0xfffb3800 | 31 | #define OMAP1_I2C_BASE 0xfffb3800 |
| @@ -59,9 +51,6 @@ static struct resource i2c_resources1[] = { | |||
| 59 | static struct platform_device omap_i2c_device1 = { | 51 | static struct platform_device omap_i2c_device1 = { |
| 60 | .name = "i2c_omap", | 52 | .name = "i2c_omap", |
| 61 | .id = 1, | 53 | .id = 1, |
| 62 | .dev = { | ||
| 63 | .release = omap_nop_release, | ||
| 64 | }, | ||
| 65 | .num_resources = ARRAY_SIZE(i2c_resources1), | 54 | .num_resources = ARRAY_SIZE(i2c_resources1), |
| 66 | .resource = i2c_resources1, | 55 | .resource = i2c_resources1, |
| 67 | }; | 56 | }; |
| @@ -187,7 +176,6 @@ static struct platform_device mmc_omap_device1 = { | |||
| 187 | .name = "mmci-omap", | 176 | .name = "mmci-omap", |
| 188 | .id = 1, | 177 | .id = 1, |
| 189 | .dev = { | 178 | .dev = { |
| 190 | .release = omap_nop_release, | ||
| 191 | .dma_mask = &mmc1_dmamask, | 179 | .dma_mask = &mmc1_dmamask, |
| 192 | .platform_data = &mmc1_conf, | 180 | .platform_data = &mmc1_conf, |
| 193 | }, | 181 | }, |
| @@ -217,7 +205,6 @@ static struct platform_device mmc_omap_device2 = { | |||
| 217 | .name = "mmci-omap", | 205 | .name = "mmci-omap", |
| 218 | .id = 2, | 206 | .id = 2, |
| 219 | .dev = { | 207 | .dev = { |
| 220 | .release = omap_nop_release, | ||
| 221 | .dma_mask = &mmc2_dmamask, | 208 | .dma_mask = &mmc2_dmamask, |
| 222 | .platform_data = &mmc2_conf, | 209 | .platform_data = &mmc2_conf, |
| 223 | }, | 210 | }, |
| @@ -321,9 +308,6 @@ static struct resource uwire_resources[] = { | |||
| 321 | static struct platform_device omap_uwire_device = { | 308 | static struct platform_device omap_uwire_device = { |
| 322 | .name = "omap_uwire", | 309 | .name = "omap_uwire", |
| 323 | .id = -1, | 310 | .id = -1, |
| 324 | .dev = { | ||
| 325 | .release = omap_nop_release, | ||
| 326 | }, | ||
| 327 | .num_resources = ARRAY_SIZE(uwire_resources), | 311 | .num_resources = ARRAY_SIZE(uwire_resources), |
| 328 | .resource = uwire_resources, | 312 | .resource = uwire_resources, |
| 329 | }; | 313 | }; |
| @@ -365,9 +349,6 @@ static struct resource wdt_resources[] = { | |||
| 365 | static struct platform_device omap_wdt_device = { | 349 | static struct platform_device omap_wdt_device = { |
| 366 | .name = "omap_wdt", | 350 | .name = "omap_wdt", |
| 367 | .id = -1, | 351 | .id = -1, |
| 368 | .dev = { | ||
| 369 | .release = omap_nop_release, | ||
| 370 | }, | ||
| 371 | .num_resources = ARRAY_SIZE(wdt_resources), | 352 | .num_resources = ARRAY_SIZE(wdt_resources), |
| 372 | .resource = wdt_resources, | 353 | .resource = wdt_resources, |
| 373 | }; | 354 | }; |
| @@ -401,9 +382,6 @@ static struct resource rng_resources[] = { | |||
| 401 | static struct platform_device omap_rng_device = { | 382 | static struct platform_device omap_rng_device = { |
| 402 | .name = "omap_rng", | 383 | .name = "omap_rng", |
| 403 | .id = -1, | 384 | .id = -1, |
| 404 | .dev = { | ||
| 405 | .release = omap_nop_release, | ||
| 406 | }, | ||
| 407 | .num_resources = ARRAY_SIZE(rng_resources), | 385 | .num_resources = ARRAY_SIZE(rng_resources), |
| 408 | .resource = rng_resources, | 386 | .resource = rng_resources, |
| 409 | }; | 387 | }; |
