diff options
author | Martin Michlmayr <tbm@cyrius.com> | 2009-05-19 06:30:52 -0400 |
---|---|---|
committer | Nicolas Pitre <nico@cam.org> | 2009-05-21 16:45:20 -0400 |
commit | 85bc26211c6a2c6e82c2403697f8ce44e9587215 (patch) | |
tree | ae7016cb1cc27e3e554f64b56c7bb3209c96fea1 | |
parent | 385aa9e7012d35b017981e67b3464aef4e1e7108 (diff) |
[ARM] Orion: Remove explicit name for platform device resources
Remove explicit names from platform device resources since they will
automatically be named after the platform device they're associated
with.
Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
Acked-by: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Nicolas Pitre <nico@marvell.com>
-rw-r--r-- | arch/arm/mach-kirkwood/common.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-mv78xx0/common.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-orion5x/common.c | 2 |
3 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c index eeb00240d784..3fab82a4c8fc 100644 --- a/arch/arm/mach-kirkwood/common.c +++ b/arch/arm/mach-kirkwood/common.c | |||
@@ -386,12 +386,10 @@ static struct mv64xxx_i2c_pdata kirkwood_i2c_pdata = { | |||
386 | 386 | ||
387 | static struct resource kirkwood_i2c_resources[] = { | 387 | static struct resource kirkwood_i2c_resources[] = { |
388 | { | 388 | { |
389 | .name = "i2c", | ||
390 | .start = I2C_PHYS_BASE, | 389 | .start = I2C_PHYS_BASE, |
391 | .end = I2C_PHYS_BASE + 0x1f, | 390 | .end = I2C_PHYS_BASE + 0x1f, |
392 | .flags = IORESOURCE_MEM, | 391 | .flags = IORESOURCE_MEM, |
393 | }, { | 392 | }, { |
394 | .name = "i2c", | ||
395 | .start = IRQ_KIRKWOOD_TWSI, | 393 | .start = IRQ_KIRKWOOD_TWSI, |
396 | .end = IRQ_KIRKWOOD_TWSI, | 394 | .end = IRQ_KIRKWOOD_TWSI, |
397 | .flags = IORESOURCE_IRQ, | 395 | .flags = IORESOURCE_IRQ, |
diff --git a/arch/arm/mach-mv78xx0/common.c b/arch/arm/mach-mv78xx0/common.c index 9ba595083dab..0d88eea6a09c 100644 --- a/arch/arm/mach-mv78xx0/common.c +++ b/arch/arm/mach-mv78xx0/common.c | |||
@@ -532,12 +532,10 @@ static struct mv64xxx_i2c_pdata mv78xx0_i2c_0_pdata = { | |||
532 | 532 | ||
533 | static struct resource mv78xx0_i2c_0_resources[] = { | 533 | static struct resource mv78xx0_i2c_0_resources[] = { |
534 | { | 534 | { |
535 | .name = "i2c 0 base", | ||
536 | .start = I2C_0_PHYS_BASE, | 535 | .start = I2C_0_PHYS_BASE, |
537 | .end = I2C_0_PHYS_BASE + 0x1f, | 536 | .end = I2C_0_PHYS_BASE + 0x1f, |
538 | .flags = IORESOURCE_MEM, | 537 | .flags = IORESOURCE_MEM, |
539 | }, { | 538 | }, { |
540 | .name = "i2c 0 irq", | ||
541 | .start = IRQ_MV78XX0_I2C_0, | 539 | .start = IRQ_MV78XX0_I2C_0, |
542 | .end = IRQ_MV78XX0_I2C_0, | 540 | .end = IRQ_MV78XX0_I2C_0, |
543 | .flags = IORESOURCE_IRQ, | 541 | .flags = IORESOURCE_IRQ, |
@@ -567,12 +565,10 @@ static struct mv64xxx_i2c_pdata mv78xx0_i2c_1_pdata = { | |||
567 | 565 | ||
568 | static struct resource mv78xx0_i2c_1_resources[] = { | 566 | static struct resource mv78xx0_i2c_1_resources[] = { |
569 | { | 567 | { |
570 | .name = "i2c 1 base", | ||
571 | .start = I2C_1_PHYS_BASE, | 568 | .start = I2C_1_PHYS_BASE, |
572 | .end = I2C_1_PHYS_BASE + 0x1f, | 569 | .end = I2C_1_PHYS_BASE + 0x1f, |
573 | .flags = IORESOURCE_MEM, | 570 | .flags = IORESOURCE_MEM, |
574 | }, { | 571 | }, { |
575 | .name = "i2c 1 irq", | ||
576 | .start = IRQ_MV78XX0_I2C_1, | 572 | .start = IRQ_MV78XX0_I2C_1, |
577 | .end = IRQ_MV78XX0_I2C_1, | 573 | .end = IRQ_MV78XX0_I2C_1, |
578 | .flags = IORESOURCE_IRQ, | 574 | .flags = IORESOURCE_IRQ, |
diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c index 6af99ddabdfb..a51fb9dd65a7 100644 --- a/arch/arm/mach-orion5x/common.c +++ b/arch/arm/mach-orion5x/common.c | |||
@@ -248,12 +248,10 @@ static struct mv64xxx_i2c_pdata orion5x_i2c_pdata = { | |||
248 | 248 | ||
249 | static struct resource orion5x_i2c_resources[] = { | 249 | static struct resource orion5x_i2c_resources[] = { |
250 | { | 250 | { |
251 | .name = "i2c base", | ||
252 | .start = I2C_PHYS_BASE, | 251 | .start = I2C_PHYS_BASE, |
253 | .end = I2C_PHYS_BASE + 0x1f, | 252 | .end = I2C_PHYS_BASE + 0x1f, |
254 | .flags = IORESOURCE_MEM, | 253 | .flags = IORESOURCE_MEM, |
255 | }, { | 254 | }, { |
256 | .name = "i2c irq", | ||
257 | .start = IRQ_ORION5X_I2C, | 255 | .start = IRQ_ORION5X_I2C, |
258 | .end = IRQ_ORION5X_I2C, | 256 | .end = IRQ_ORION5X_I2C, |
259 | .flags = IORESOURCE_IRQ, | 257 | .flags = IORESOURCE_IRQ, |