Skip to content

Commit 7bf350b

Browse files
committed
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>
1 parent 810b7e0 commit 7bf350b

9 files changed

Lines changed: 25 additions & 18 deletions

File tree

drivers/mtd/devices/mtd_dataflash.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -705,7 +705,7 @@ struct flash_info {
705705
#define IS_POW2PS 0x0001 /* uses 2^N byte pages */
706706
};
707707

708-
static struct flash_info dataflash_data [] = {
708+
static struct flash_info dataflash_data[] = {
709709

710710
/*
711711
* NOTE: chips with SUP_POW2PS (rev D and up) need two entries,

drivers/mtd/maps/amd76xrom.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ static void amd76xrom_cleanup(struct amd76xrom_window *window)
100100
}
101101

102102

103-
static int amd76xrom_init_one (struct pci_dev *pdev,
104-
const struct pci_device_id *ent)
103+
static int amd76xrom_init_one(struct pci_dev *pdev,
104+
const struct pci_device_id *ent)
105105
{
106106
static char *rom_probe_types[] = { "cfi_probe", "jedec_probe", NULL };
107107
u8 byte;
@@ -289,7 +289,7 @@ static int amd76xrom_init_one (struct pci_dev *pdev,
289289
}
290290

291291

292-
static void amd76xrom_remove_one (struct pci_dev *pdev)
292+
static void amd76xrom_remove_one(struct pci_dev *pdev)
293293
{
294294
struct amd76xrom_window *window = &amd76xrom_window;
295295

@@ -347,4 +347,3 @@ module_exit(cleanup_amd76xrom);
347347
MODULE_LICENSE("GPL");
348348
MODULE_AUTHOR("Eric Biederman <ebiederman@lnxi.com>");
349349
MODULE_DESCRIPTION("MTD map driver for BIOS chips on the AMD76X southbridge");
350-

drivers/mtd/maps/bfin-async-flash.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030
#include <linux/io.h>
3131
#include <asm/unaligned.h>
3232

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); })
3435

3536
#define DRIVER_NAME "bfin-async-flash"
3637

drivers/mtd/maps/ck804xrom.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ static void ck804xrom_cleanup(struct ck804xrom_window *window)
112112
}
113113

114114

115-
static int ck804xrom_init_one (struct pci_dev *pdev,
116-
const struct pci_device_id *ent)
115+
static int ck804xrom_init_one(struct pci_dev *pdev,
116+
const struct pci_device_id *ent)
117117
{
118118
static char *rom_probe_types[] = { "cfi_probe", "jedec_probe", NULL };
119119
u8 byte;
@@ -320,7 +320,7 @@ static int ck804xrom_init_one (struct pci_dev *pdev,
320320
}
321321

322322

323-
static void ck804xrom_remove_one (struct pci_dev *pdev)
323+
static void ck804xrom_remove_one(struct pci_dev *pdev)
324324
{
325325
struct ck804xrom_window *window = &ck804xrom_window;
326326

drivers/mtd/maps/esb2rom.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ static int esb2rom_init_one(struct pci_dev *pdev,
378378
return 0;
379379
}
380380

381-
static void esb2rom_remove_one (struct pci_dev *pdev)
381+
static void esb2rom_remove_one(struct pci_dev *pdev)
382382
{
383383
struct esb2rom_window *window = &esb2rom_window;
384384
esb2rom_cleanup(window);

drivers/mtd/maps/gpio-addr-flash.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
#include <linux/slab.h>
2727
#include <linux/types.h>
2828

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); })
3031

3132
#define DRIVER_NAME "gpio-addr-flash"
3233
#define PFX DRIVER_NAME ": "
@@ -142,7 +143,8 @@ static void gf_write(struct map_info *map, map_word d1, unsigned long ofs)
142143
*
143144
* See gf_copy_from() caveat.
144145
*/
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)
146148
{
147149
struct async_state *state = gf_map_info_to_state(map);
148150

drivers/mtd/maps/ichxrom.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ static void ichxrom_cleanup(struct ichxrom_window *window)
8484
}
8585

8686

87-
static int ichxrom_init_one (struct pci_dev *pdev,
88-
const struct pci_device_id *ent)
87+
static int ichxrom_init_one(struct pci_dev *pdev,
88+
const struct pci_device_id *ent)
8989
{
9090
static char *rom_probe_types[] = { "cfi_probe", "jedec_probe", NULL };
9191
struct ichxrom_window *window = &ichxrom_window;
@@ -315,7 +315,7 @@ static int ichxrom_init_one (struct pci_dev *pdev,
315315
}
316316

317317

318-
static void ichxrom_remove_one (struct pci_dev *pdev)
318+
static void ichxrom_remove_one(struct pci_dev *pdev)
319319
{
320320
struct ichxrom_window *window = &ichxrom_window;
321321
ichxrom_cleanup(window);

drivers/mtd/maps/sa1100-flash.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,8 @@ static void sa1100_destroy(struct sa_info *info, struct flash_platform_data *pla
149149
plat->exit();
150150
}
151151

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)
153154
{
154155
struct sa_info *info;
155156
int nr, size, i, ret = 0;

drivers/mtd/nand/jz4740_nand.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -316,13 +316,17 @@ static int jz_nand_ioremap_resource(struct platform_device *pdev,
316316
return ret;
317317
}
318318

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)
320321
{
321322
iounmap(base);
322323
release_mem_region(res->start, resource_size(res));
323324
}
324325

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) {
326330
int ret;
327331
int gpio;
328332
char gpio_name[9];

0 commit comments

Comments
 (0)