diff options
author | Artem Bityutskiy <artem.bityutskiy@linux.intel.com> | 2012-11-22 05:16:28 -0500 |
---|---|---|
committer | Artem Bityutskiy <artem.bityutskiy@linux.intel.com> | 2012-11-22 05:16:28 -0500 |
commit | 7bf350b7245b40fe6a57b79ec4a04c85195dc648 (patch) | |
tree | 9f0d310cc067eff97d78361e41372fd6c9b81126 | |
parent | 810b7e060c14110d8f580daaf77fab3a7d950483 (diff) |
mtd: fix a number of checkpatch complaints
While checking the "__devinit" removal patches with checkpatch.pl, I
noticed several warnings related to a space between the function name
and '(', as well as long lines. I fixed the warnings up in this patch.
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
-rw-r--r-- | drivers/mtd/devices/mtd_dataflash.c | 2 | ||||
-rw-r--r-- | drivers/mtd/maps/amd76xrom.c | 7 | ||||
-rw-r--r-- | drivers/mtd/maps/bfin-async-flash.c | 3 | ||||
-rw-r--r-- | drivers/mtd/maps/ck804xrom.c | 6 | ||||
-rw-r--r-- | drivers/mtd/maps/esb2rom.c | 2 | ||||
-rw-r--r-- | drivers/mtd/maps/gpio-addr-flash.c | 6 | ||||
-rw-r--r-- | drivers/mtd/maps/ichxrom.c | 6 | ||||
-rw-r--r-- | drivers/mtd/maps/sa1100-flash.c | 3 | ||||
-rw-r--r-- | drivers/mtd/nand/jz4740_nand.c | 8 |
9 files changed, 25 insertions, 18 deletions
diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c index 0caefb400f0c..ea7ea7b595d8 100644 --- a/drivers/mtd/devices/mtd_dataflash.c +++ b/drivers/mtd/devices/mtd_dataflash.c | |||
@@ -705,7 +705,7 @@ struct flash_info { | |||
705 | #define IS_POW2PS 0x0001 /* uses 2^N byte pages */ | 705 | #define IS_POW2PS 0x0001 /* uses 2^N byte pages */ |
706 | }; | 706 | }; |
707 | 707 | ||
708 | static struct flash_info dataflash_data [] = { | 708 | static struct flash_info dataflash_data[] = { |
709 | 709 | ||
710 | /* | 710 | /* |
711 | * NOTE: chips with SUP_POW2PS (rev D and up) need two entries, | 711 | * NOTE: chips with SUP_POW2PS (rev D and up) need two entries, |
diff --git a/drivers/mtd/maps/amd76xrom.c b/drivers/mtd/maps/amd76xrom.c index 31ee5c8dd5f4..f7207b0a76dc 100644 --- a/drivers/mtd/maps/amd76xrom.c +++ b/drivers/mtd/maps/amd76xrom.c | |||
@@ -100,8 +100,8 @@ static void amd76xrom_cleanup(struct amd76xrom_window *window) | |||
100 | } | 100 | } |
101 | 101 | ||
102 | 102 | ||
103 | static int amd76xrom_init_one (struct pci_dev *pdev, | 103 | static int amd76xrom_init_one(struct pci_dev *pdev, |
104 | const struct pci_device_id *ent) | 104 | const struct pci_device_id *ent) |
105 | { | 105 | { |
106 | static char *rom_probe_types[] = { "cfi_probe", "jedec_probe", NULL }; | 106 | static char *rom_probe_types[] = { "cfi_probe", "jedec_probe", NULL }; |
107 | u8 byte; | 107 | u8 byte; |
@@ -289,7 +289,7 @@ static int amd76xrom_init_one (struct pci_dev *pdev, | |||
289 | } | 289 | } |
290 | 290 | ||
291 | 291 | ||
292 | static void amd76xrom_remove_one (struct pci_dev *pdev) | 292 | static void amd76xrom_remove_one(struct pci_dev *pdev) |
293 | { | 293 | { |
294 | struct amd76xrom_window *window = &amd76xrom_window; | 294 | struct amd76xrom_window *window = &amd76xrom_window; |
295 | 295 | ||
@@ -347,4 +347,3 @@ module_exit(cleanup_amd76xrom); | |||
347 | MODULE_LICENSE("GPL"); | 347 | MODULE_LICENSE("GPL"); |
348 | MODULE_AUTHOR("Eric Biederman <ebiederman@lnxi.com>"); | 348 | MODULE_AUTHOR("Eric Biederman <ebiederman@lnxi.com>"); |
349 | MODULE_DESCRIPTION("MTD map driver for BIOS chips on the AMD76X southbridge"); | 349 | MODULE_DESCRIPTION("MTD map driver for BIOS chips on the AMD76X southbridge"); |
350 | |||
diff --git a/drivers/mtd/maps/bfin-async-flash.c b/drivers/mtd/maps/bfin-async-flash.c index 7d484de4abea..f833edfaab79 100644 --- a/drivers/mtd/maps/bfin-async-flash.c +++ b/drivers/mtd/maps/bfin-async-flash.c | |||
@@ -30,7 +30,8 @@ | |||
30 | #include <linux/io.h> | 30 | #include <linux/io.h> |
31 | #include <asm/unaligned.h> | 31 | #include <asm/unaligned.h> |
32 | 32 | ||
33 | #define pr_devinit(fmt, args...) ({ static const char __fmt[] = fmt; printk(__fmt, ## args); }) | 33 | #define pr_devinit(fmt, args...) \ |
34 | ({ static const char __fmt[] = fmt; printk(__fmt, ## args); }) | ||
34 | 35 | ||
35 | #define DRIVER_NAME "bfin-async-flash" | 36 | #define DRIVER_NAME "bfin-async-flash" |
36 | 37 | ||
diff --git a/drivers/mtd/maps/ck804xrom.c b/drivers/mtd/maps/ck804xrom.c index 0ac41f2e3013..586a1c77e48a 100644 --- a/drivers/mtd/maps/ck804xrom.c +++ b/drivers/mtd/maps/ck804xrom.c | |||
@@ -112,8 +112,8 @@ static void ck804xrom_cleanup(struct ck804xrom_window *window) | |||
112 | } | 112 | } |
113 | 113 | ||
114 | 114 | ||
115 | static int ck804xrom_init_one (struct pci_dev *pdev, | 115 | static int ck804xrom_init_one(struct pci_dev *pdev, |
116 | const struct pci_device_id *ent) | 116 | const struct pci_device_id *ent) |
117 | { | 117 | { |
118 | static char *rom_probe_types[] = { "cfi_probe", "jedec_probe", NULL }; | 118 | static char *rom_probe_types[] = { "cfi_probe", "jedec_probe", NULL }; |
119 | u8 byte; | 119 | u8 byte; |
@@ -320,7 +320,7 @@ static int ck804xrom_init_one (struct pci_dev *pdev, | |||
320 | } | 320 | } |
321 | 321 | ||
322 | 322 | ||
323 | static void ck804xrom_remove_one (struct pci_dev *pdev) | 323 | static void ck804xrom_remove_one(struct pci_dev *pdev) |
324 | { | 324 | { |
325 | struct ck804xrom_window *window = &ck804xrom_window; | 325 | struct ck804xrom_window *window = &ck804xrom_window; |
326 | 326 | ||
diff --git a/drivers/mtd/maps/esb2rom.c b/drivers/mtd/maps/esb2rom.c index 6d6cb8857e40..ff8681a25831 100644 --- a/drivers/mtd/maps/esb2rom.c +++ b/drivers/mtd/maps/esb2rom.c | |||
@@ -378,7 +378,7 @@ static int esb2rom_init_one(struct pci_dev *pdev, | |||
378 | return 0; | 378 | return 0; |
379 | } | 379 | } |
380 | 380 | ||
381 | static void esb2rom_remove_one (struct pci_dev *pdev) | 381 | static void esb2rom_remove_one(struct pci_dev *pdev) |
382 | { | 382 | { |
383 | struct esb2rom_window *window = &esb2rom_window; | 383 | struct esb2rom_window *window = &esb2rom_window; |
384 | esb2rom_cleanup(window); | 384 | esb2rom_cleanup(window); |
diff --git a/drivers/mtd/maps/gpio-addr-flash.c b/drivers/mtd/maps/gpio-addr-flash.c index 41aa8db36020..7b643de2500b 100644 --- a/drivers/mtd/maps/gpio-addr-flash.c +++ b/drivers/mtd/maps/gpio-addr-flash.c | |||
@@ -26,7 +26,8 @@ | |||
26 | #include <linux/slab.h> | 26 | #include <linux/slab.h> |
27 | #include <linux/types.h> | 27 | #include <linux/types.h> |
28 | 28 | ||
29 | #define pr_devinit(fmt, args...) ({ static const char __fmt[] = fmt; printk(__fmt, ## args); }) | 29 | #define pr_devinit(fmt, args...) \ |
30 | ({ static const char __fmt[] = fmt; printk(__fmt, ## args); }) | ||
30 | 31 | ||
31 | #define DRIVER_NAME "gpio-addr-flash" | 32 | #define DRIVER_NAME "gpio-addr-flash" |
32 | #define PFX DRIVER_NAME ": " | 33 | #define PFX DRIVER_NAME ": " |
@@ -142,7 +143,8 @@ static void gf_write(struct map_info *map, map_word d1, unsigned long ofs) | |||
142 | * | 143 | * |
143 | * See gf_copy_from() caveat. | 144 | * See gf_copy_from() caveat. |
144 | */ | 145 | */ |
145 | static void gf_copy_to(struct map_info *map, unsigned long to, const void *from, ssize_t len) | 146 | static void gf_copy_to(struct map_info *map, unsigned long to, |
147 | const void *from, ssize_t len) | ||
146 | { | 148 | { |
147 | struct async_state *state = gf_map_info_to_state(map); | 149 | struct async_state *state = gf_map_info_to_state(map); |
148 | 150 | ||
diff --git a/drivers/mtd/maps/ichxrom.c b/drivers/mtd/maps/ichxrom.c index 03d60efda277..c7478e18f485 100644 --- a/drivers/mtd/maps/ichxrom.c +++ b/drivers/mtd/maps/ichxrom.c | |||
@@ -84,8 +84,8 @@ static void ichxrom_cleanup(struct ichxrom_window *window) | |||
84 | } | 84 | } |
85 | 85 | ||
86 | 86 | ||
87 | static int ichxrom_init_one (struct pci_dev *pdev, | 87 | static int ichxrom_init_one(struct pci_dev *pdev, |
88 | const struct pci_device_id *ent) | 88 | const struct pci_device_id *ent) |
89 | { | 89 | { |
90 | static char *rom_probe_types[] = { "cfi_probe", "jedec_probe", NULL }; | 90 | static char *rom_probe_types[] = { "cfi_probe", "jedec_probe", NULL }; |
91 | struct ichxrom_window *window = &ichxrom_window; | 91 | struct ichxrom_window *window = &ichxrom_window; |
@@ -315,7 +315,7 @@ static int ichxrom_init_one (struct pci_dev *pdev, | |||
315 | } | 315 | } |
316 | 316 | ||
317 | 317 | ||
318 | static void ichxrom_remove_one (struct pci_dev *pdev) | 318 | static void ichxrom_remove_one(struct pci_dev *pdev) |
319 | { | 319 | { |
320 | struct ichxrom_window *window = &ichxrom_window; | 320 | struct ichxrom_window *window = &ichxrom_window; |
321 | ichxrom_cleanup(window); | 321 | ichxrom_cleanup(window); |
diff --git a/drivers/mtd/maps/sa1100-flash.c b/drivers/mtd/maps/sa1100-flash.c index 7aebc82a5c6d..f694417cf7e6 100644 --- a/drivers/mtd/maps/sa1100-flash.c +++ b/drivers/mtd/maps/sa1100-flash.c | |||
@@ -149,7 +149,8 @@ static void sa1100_destroy(struct sa_info *info, struct flash_platform_data *pla | |||
149 | plat->exit(); | 149 | plat->exit(); |
150 | } | 150 | } |
151 | 151 | ||
152 | static struct sa_info *sa1100_setup_mtd(struct platform_device *pdev, struct flash_platform_data *plat) | 152 | static struct sa_info *sa1100_setup_mtd(struct platform_device *pdev, |
153 | struct flash_platform_data *plat) | ||
153 | { | 154 | { |
154 | struct sa_info *info; | 155 | struct sa_info *info; |
155 | int nr, size, i, ret = 0; | 156 | int nr, size, i, ret = 0; |
diff --git a/drivers/mtd/nand/jz4740_nand.c b/drivers/mtd/nand/jz4740_nand.c index 72ac26e1ddf4..8d415f014e1d 100644 --- a/drivers/mtd/nand/jz4740_nand.c +++ b/drivers/mtd/nand/jz4740_nand.c | |||
@@ -316,13 +316,17 @@ err: | |||
316 | return ret; | 316 | return ret; |
317 | } | 317 | } |
318 | 318 | ||
319 | static inline void jz_nand_iounmap_resource(struct resource *res, void __iomem *base) | 319 | static inline void jz_nand_iounmap_resource(struct resource *res, |
320 | void __iomem *base) | ||
320 | { | 321 | { |
321 | iounmap(base); | 322 | iounmap(base); |
322 | release_mem_region(res->start, resource_size(res)); | 323 | release_mem_region(res->start, resource_size(res)); |
323 | } | 324 | } |
324 | 325 | ||
325 | static int jz_nand_detect_bank(struct platform_device *pdev, struct jz_nand *nand, unsigned char bank, size_t chipnr, uint8_t *nand_maf_id, uint8_t *nand_dev_id) { | 326 | static int jz_nand_detect_bank(struct platform_device *pdev, |
327 | struct jz_nand *nand, unsigned char bank, | ||
328 | size_t chipnr, uint8_t *nand_maf_id, | ||
329 | uint8_t *nand_dev_id) { | ||
326 | int ret; | 330 | int ret; |
327 | int gpio; | 331 | int gpio; |
328 | char gpio_name[9]; | 332 | char gpio_name[9]; |