diff options
author | Mike Frysinger <michael.frysinger@analog.com> | 2007-07-12 10:58:21 -0400 |
---|---|---|
committer | Bryan Wu <bryan.wu@analog.com> | 2007-07-12 10:58:21 -0400 |
commit | 1f83b8f148a1eb967d2a628cbb741cd56fb54572 (patch) | |
tree | 43b56238822ab35ec90a9ee9e9c014247950622f /arch/blackfin/mach-bf537/boards/stamp.c | |
parent | 669b792c77bbc30e9f4d9c95dbc918dc348c49c2 (diff) |
Blackfin arch: cleanup warnings from checkpatch -- no functional changes
Signed-off-by: Mike Frysinger <michael.frysinger@analog.com>
Signed-off-by: Bryan Wu <bryan.wu@analog.com>
Diffstat (limited to 'arch/blackfin/mach-bf537/boards/stamp.c')
-rw-r--r-- | arch/blackfin/mach-bf537/boards/stamp.c | 51 |
1 files changed, 24 insertions, 27 deletions
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c index 3a29b4d15f25..c6373530898f 100644 --- a/arch/blackfin/mach-bf537/boards/stamp.c +++ b/arch/blackfin/mach-bf537/boards/stamp.c | |||
@@ -37,12 +37,10 @@ | |||
37 | #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) | 37 | #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) |
38 | #include <linux/usb_isp1362.h> | 38 | #include <linux/usb_isp1362.h> |
39 | #endif | 39 | #endif |
40 | #include <asm/irq.h> | ||
41 | #include <linux/irq.h> | 40 | #include <linux/irq.h> |
42 | #include <linux/interrupt.h> | 41 | #include <linux/interrupt.h> |
43 | #include <asm/bfin5xx_spi.h> | ||
44 | #include <linux/usb_sl811.h> | 42 | #include <linux/usb_sl811.h> |
45 | 43 | #include <asm/bfin5xx_spi.h> | |
46 | #include <linux/spi/ad7877.h> | 44 | #include <linux/spi/ad7877.h> |
47 | 45 | ||
48 | /* | 46 | /* |
@@ -85,7 +83,7 @@ static struct platform_device *bfin_isp1761_devices[] = { | |||
85 | 83 | ||
86 | int __init bfin_isp1761_init(void) | 84 | int __init bfin_isp1761_init(void) |
87 | { | 85 | { |
88 | unsigned int num_devices=ARRAY_SIZE(bfin_isp1761_devices); | 86 | unsigned int num_devices = ARRAY_SIZE(bfin_isp1761_devices); |
89 | 87 | ||
90 | printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__); | 88 | printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__); |
91 | set_irq_type(ISP1761_IRQ, IRQF_TRIGGER_FALLING); | 89 | set_irq_type(ISP1761_IRQ, IRQF_TRIGGER_FALLING); |
@@ -107,15 +105,15 @@ static struct resource bfin_pcmcia_cf_resources[] = { | |||
107 | .start = 0x20310000, /* IO PORT */ | 105 | .start = 0x20310000, /* IO PORT */ |
108 | .end = 0x20312000, | 106 | .end = 0x20312000, |
109 | .flags = IORESOURCE_MEM, | 107 | .flags = IORESOURCE_MEM, |
110 | },{ | 108 | }, { |
111 | .start = 0x20311000, /* Attribute Memory */ | 109 | .start = 0x20311000, /* Attribute Memory */ |
112 | .end = 0x20311FFF, | 110 | .end = 0x20311FFF, |
113 | .flags = IORESOURCE_MEM, | 111 | .flags = IORESOURCE_MEM, |
114 | },{ | 112 | }, { |
115 | .start = IRQ_PF4, | 113 | .start = IRQ_PF4, |
116 | .end = IRQ_PF4, | 114 | .end = IRQ_PF4, |
117 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL, | 115 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL, |
118 | },{ | 116 | }, { |
119 | .start = 6, /* Card Detect PF6 */ | 117 | .start = 6, /* Card Detect PF6 */ |
120 | .end = 6, | 118 | .end = 6, |
121 | .flags = IORESOURCE_IRQ, | 119 | .flags = IORESOURCE_IRQ, |
@@ -144,7 +142,7 @@ static struct resource smc91x_resources[] = { | |||
144 | .start = 0x20300300, | 142 | .start = 0x20300300, |
145 | .end = 0x20300300 + 16, | 143 | .end = 0x20300300 + 16, |
146 | .flags = IORESOURCE_MEM, | 144 | .flags = IORESOURCE_MEM, |
147 | },{ | 145 | }, { |
148 | 146 | ||
149 | .start = IRQ_PF7, | 147 | .start = IRQ_PF7, |
150 | .end = IRQ_PF7, | 148 | .end = IRQ_PF7, |
@@ -165,11 +163,11 @@ static struct resource sl811_hcd_resources[] = { | |||
165 | .start = 0x20340000, | 163 | .start = 0x20340000, |
166 | .end = 0x20340000, | 164 | .end = 0x20340000, |
167 | .flags = IORESOURCE_MEM, | 165 | .flags = IORESOURCE_MEM, |
168 | },{ | 166 | }, { |
169 | .start = 0x20340004, | 167 | .start = 0x20340004, |
170 | .end = 0x20340004, | 168 | .end = 0x20340004, |
171 | .flags = IORESOURCE_MEM, | 169 | .flags = IORESOURCE_MEM, |
172 | },{ | 170 | }, { |
173 | .start = CONFIG_USB_SL811_BFIN_IRQ, | 171 | .start = CONFIG_USB_SL811_BFIN_IRQ, |
174 | .end = CONFIG_USB_SL811_BFIN_IRQ, | 172 | .end = CONFIG_USB_SL811_BFIN_IRQ, |
175 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, | 173 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, |
@@ -216,11 +214,11 @@ static struct resource isp1362_hcd_resources[] = { | |||
216 | .start = 0x20360000, | 214 | .start = 0x20360000, |
217 | .end = 0x20360000, | 215 | .end = 0x20360000, |
218 | .flags = IORESOURCE_MEM, | 216 | .flags = IORESOURCE_MEM, |
219 | },{ | 217 | }, { |
220 | .start = 0x20360004, | 218 | .start = 0x20360004, |
221 | .end = 0x20360004, | 219 | .end = 0x20360004, |
222 | .flags = IORESOURCE_MEM, | 220 | .flags = IORESOURCE_MEM, |
223 | },{ | 221 | }, { |
224 | .start = CONFIG_USB_ISP1362_BFIN_GPIO_IRQ, | 222 | .start = CONFIG_USB_ISP1362_BFIN_GPIO_IRQ, |
225 | .end = CONFIG_USB_ISP1362_BFIN_GPIO_IRQ, | 223 | .end = CONFIG_USB_ISP1362_BFIN_GPIO_IRQ, |
226 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, | 224 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, |
@@ -261,7 +259,7 @@ static struct resource net2272_bfin_resources[] = { | |||
261 | .start = 0x20300000, | 259 | .start = 0x20300000, |
262 | .end = 0x20300000 + 0x100, | 260 | .end = 0x20300000 + 0x100, |
263 | .flags = IORESOURCE_MEM, | 261 | .flags = IORESOURCE_MEM, |
264 | },{ | 262 | }, { |
265 | .start = IRQ_PF7, | 263 | .start = IRQ_PF7, |
266 | .end = IRQ_PF7, | 264 | .end = IRQ_PF7, |
267 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, | 265 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, |
@@ -287,11 +285,11 @@ static struct mtd_partition bfin_spi_flash_partitions[] = { | |||
287 | .size = 0x00020000, | 285 | .size = 0x00020000, |
288 | .offset = 0, | 286 | .offset = 0, |
289 | .mask_flags = MTD_CAP_ROM | 287 | .mask_flags = MTD_CAP_ROM |
290 | },{ | 288 | }, { |
291 | .name = "kernel", | 289 | .name = "kernel", |
292 | .size = 0xe0000, | 290 | .size = 0xe0000, |
293 | .offset = 0x20000 | 291 | .offset = 0x20000 |
294 | },{ | 292 | }, { |
295 | .name = "file system", | 293 | .name = "file system", |
296 | .size = 0x700000, | 294 | .size = 0x700000, |
297 | .offset = 0x00100000, | 295 | .offset = 0x00100000, |
@@ -361,7 +359,6 @@ static struct bfin5xx_spi_chip ad5304_chip_info = { | |||
361 | 359 | ||
362 | #if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE) | 360 | #if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE) |
363 | static struct bfin5xx_spi_chip spi_ad7877_chip_info = { | 361 | static struct bfin5xx_spi_chip spi_ad7877_chip_info = { |
364 | // .cs_change_per_word = 1, | ||
365 | .enable_dma = 0, | 362 | .enable_dma = 0, |
366 | .bits_per_word = 16, | 363 | .bits_per_word = 16, |
367 | }; | 364 | }; |
@@ -449,19 +446,19 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
449 | #endif | 446 | #endif |
450 | #if defined(CONFIG_PBX) | 447 | #if defined(CONFIG_PBX) |
451 | { | 448 | { |
452 | .modalias = "fxs-spi", | 449 | .modalias = "fxs-spi", |
453 | .max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */ | 450 | .max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */ |
454 | .bus_num = 1, | 451 | .bus_num = 1, |
455 | .chip_select = 3, | 452 | .chip_select = 3, |
456 | .controller_data= &spi_si3xxx_chip_info, | 453 | .controller_data = &spi_si3xxx_chip_info, |
457 | .mode = SPI_MODE_3, | 454 | .mode = SPI_MODE_3, |
458 | }, | 455 | }, |
459 | { | 456 | { |
460 | .modalias = "fxo-spi", | 457 | .modalias = "fxo-spi", |
461 | .max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */ | 458 | .max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */ |
462 | .bus_num = 1, | 459 | .bus_num = 1, |
463 | .chip_select = 2, | 460 | .chip_select = 2, |
464 | .controller_data= &spi_si3xxx_chip_info, | 461 | .controller_data = &spi_si3xxx_chip_info, |
465 | .mode = SPI_MODE_3, | 462 | .mode = SPI_MODE_3, |
466 | }, | 463 | }, |
467 | #endif | 464 | #endif |
@@ -516,7 +513,7 @@ static struct resource bfin_uart_resources[] = { | |||
516 | .start = 0xFFC00400, | 513 | .start = 0xFFC00400, |
517 | .end = 0xFFC004FF, | 514 | .end = 0xFFC004FF, |
518 | .flags = IORESOURCE_MEM, | 515 | .flags = IORESOURCE_MEM, |
519 | },{ | 516 | }, { |
520 | .start = 0xFFC02000, | 517 | .start = 0xFFC02000, |
521 | .end = 0xFFC020FF, | 518 | .end = 0xFFC020FF, |
522 | .flags = IORESOURCE_MEM, | 519 | .flags = IORESOURCE_MEM, |