drivers: dio: Use <linux/io.h> instead <asm/io.h>
PATCH 1/7 drivers: dio: Use <linux/io.h> instead <asm/io.h>
This patch fixes the checkpatch.pl warning:
< WARNING: Use #include <linux/io.h> instead of <asm/io.h> < #36: FILE: drivers/dio/dio.c:36:
< +#include <asm/io.h> /* readb() */
--- drivers/dio/dio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dio/dio.c +1 -1
@@ -33,7 +33,7 @@#include <linux/dio.h> #include <linux/slab.h> /* kmalloc() */ #include <linux/uaccess.h> -#include <asm/io.h> /* readb() */ +#include <linux/io.h> /* readb() */ struct dio_bus dio_bus = { .resources = {
Signature · 1 line
2.35.0
PATCH 2/7 drivers: dio: brace should be on the previous line
This patch fixes the checkpatch.pl errors and warnings:
< ERROR: open brace '{' following struct go on the same line < +struct dioname
< +{
<
< ERROR: that open brace { should be on the previous line < +static struct dioname names[] =
< +{
<
< ERROR: that open brace { should be on the previous line
< + for (scode = 0; scode < DIO_SCMAX; ++scode)
< + {
<
< WARNING: braces {} are not necessary for any arm of this statement
< + if (scode >= DIOII_SCBASE) {
< [...]
< + } else if (scode > DIO_SCMAX || scode < 0)
< [...]
< + else if (DIO_SCINHOLE(scode))
< [...]
--- drivers/dio/dio.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
drivers/dio/dio.c +5 -8
@@ -57,8 +57,7 @@ struct dio_bus dio_bus = {* I think we do this by copying them into newly kmalloc()ed memory and * marking the names[] array as .initdata ? */ -struct dioname -{ +struct dioname {int id;const char *name; };
@@ -67,8 +66,7 @@ struct dioname#define DIONAME (x) { DIO_ID_##x, DIO_DESC_##x }#define DIOFBNAME (x) { DIO_ENCODE_ID( DIO_ID_FBUFFER, DIO_ID2_##x), DIO_DESC2_##x } -static struct dioname names[] = -{ +static struct dioname names[] = {DIONAME (DCA0 ),DIONAME (DCA0REM ),DIONAME (DCA1 ),DIONAME (DCA1REM ),DIONAME (DCM ),DIONAME (DCMREM ),DIONAME (LAN ),
@@ -190,8 +188,7 @@ static int __init dio_init(void)request_resource (&iomem_resource, &dio_bus.resources[i]);/* Register all devices */ -for (scode =0 ; scode <DIO_SCMAX ; ++scode) - { +for (scode =0 ; scode <DIO_SCMAX ; ++scode) {u_char prid, secid =0 ;/* primary, secondary ID bytes */ u_char *va;unsigned long pa;
@@ -267,9 +264,9 @@ subsys_initcall(dio_init);*/ unsigned long dio_scodetophysaddr (int scode) { -if (scode >=DIOII_SCBASE ) { +if (scode >=DIOII_SCBASE )return (DIOII_BASE + (scode -132 ) *DIOII_DEVSIZE ); - }else if (scode >DIO_SCMAX || scode <0 ) +else if (scode >DIO_SCMAX || scode <0 )return 0 ;else if (DIO_SCINHOLE (scode))return 0 ;
Signature · 1 line
2.35.0
PATCH 3/7 drivers: dio: trailing whitespace
In reply to Aleksa VučkovićThis patch fixes the checkpatch.pl errors and warnings:
< ERROR: trailing whitespace
< #5: FILE: drivers/dio/dio.c:5:
< + * $
<
< ERROR: trailing whitespace
< #11: FILE: drivers/dio/dio.c:11:
< + * This means that framebuffers should pass it as $
<
< ERROR: trailing whitespace
< #17: FILE: drivers/dio/dio.c:17:
< + * Every DIO card has a fixed interrupt priority level. This
function $
<
< ERROR: trailing whitespace
< #20: FILE: drivers/dio/dio.c:20:
< + * Return a character string describing this board [might be "" if
$
<
< ERROR: trailing whitespace
< #25: FILE: drivers/dio/dio.c:25:
< + * This file is based on the way the Amiga port handles Zorro II cards, $
+ 15 more errors and warnings of type "trailing whitespace"
--- drivers/dio/dio.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
drivers/dio/dio.c +12 -12
@@ -2,27 +2,27 @@/* Code to support devices on the DIO and DIO-II bus * Copyright (C) 05/1998 Peter Maydell <[email protected]> * Copyright (C) 2004 Jochen Friedrich <[email protected]> -* +* * This code has basically these routines at the moment: * int dio_find(u_int deviceid) * Search the list of DIO devices and return the select code * of the next unconfigured device found that matches the given device ID. * Note that the deviceid parameter should be the encoded ID. -* This means that framebuffers should pass it as +* This means that framebuffers should pass it as * DIO_ENCODE_ID(DIO_ID_FBUFFER,DIO_ID2_TOPCAT) * (or whatever); everybody else just uses DIO_ID_FOOBAR. * unsigned long dio_scodetophysaddr(int scode) * Return the physical address corresponding to the given select code. * int dio_scodetoipl(int scode) -* Every DIO card has a fixed interrupt priority level. This function +* Every DIO card has a fixed interrupt priority level. This function * returns it, whatever it is. * const char *dio_scodetoname(int scode) -* Return a character string describing this board [might be "" if +* Return a character string describing this board [might be "" if * not CONFIG_DIO_CONSTANTS] * void dio_config_board(int scode) mark board as configured in the list * void dio_unconfig_board(int scode) mark board as no longer configured * -* This file is based on the way the Amiga port handles Zorro II cards, +* This file is based on the way the Amiga port handles Zorro II cards, * although we aren't so complicated... */ #include <linux/module.h>
@@ -52,9 +52,9 @@ struct dio_bus dio_bus = {/* We associate each numeric ID with an appropriate descriptive string * using a constant array of these structs. * FIXME: we should be able to arrange to throw away most of the strings -* using the initdata stuff. Then we wouldn't need to worry about +* using the initdata stuff. Then we wouldn't need to worry about * carrying them around... -* I think we do this by copying them into newly kmalloc()ed memory and +* I think we do this by copying them into newly kmalloc()ed memory and * marking the names[] array as .initdata ? */ struct dioname {
@@ -76,12 +76,12 @@ static struct dioname names[] = {DIONAME (PARALLEL ),DIONAME (VME ),DIONAME (DCL ),DIONAME (DCLREM ),DIONAME (MISC0 ),DIONAME (MISC1 ),DIONAME (MISC2 ),DIONAME (MISC3 ),DIONAME (MISC4 ),DIONAME (MISC5 ),DIONAME (MISC6 ),DIONAME (MISC7 ), -DIONAME (MISC8 ),DIONAME (MISC9 ),DIONAME (MISC10 ),DIONAME (MISC11 ), +DIONAME (MISC8 ),DIONAME (MISC9 ),DIONAME (MISC10 ),DIONAME (MISC11 ),DIONAME (MISC12 ),DIONAME (MISC13 ),DIOFBNAME (GATORBOX ),DIOFBNAME (TOPCAT ),DIOFBNAME (RENAISSANCE ),DIOFBNAME (LRCATSEYE ),DIOFBNAME (HRCCATSEYE ),DIOFBNAME (HRMCATSEYE ),DIOFBNAME (DAVINCI ),DIOFBNAME (XXXCATSEYE ),DIOFBNAME (HYPERION ), -DIOFBNAME (XGENESIS ),DIOFBNAME (TIGER ),DIOFBNAME (YGENESIS ) +DIOFBNAME (XGENESIS ),DIOFBNAME (TIGER ),DIOFBNAME (YGENESIS ) };#undef DIONAME
@@ -95,7 +95,7 @@ static const char *dio_getname(int id)/* return pointer to a constant string describing the board with given ID */ unsigned int i;for (i =0 ; i <ARRAY_SIZE (names); i++) -if (names[i].id == id) +if (names[i].id == id)return names[i].name;return unknowndioname;
@@ -173,7 +173,7 @@ static int __init dio_init(void)printk (KERN_INFO "Scanning for DIO devices...\n" ); -/* Initialize the DIO bus */ +/* Initialize the DIO bus */ INIT_LIST_HEAD (&dio_bus.devices);dev_set_name (&dio_bus.dev,"dio" ); error =device_register (&dio_bus.dev);
@@ -192,7 +192,7 @@ static int __init dio_init(void)u_char prid, secid =0 ;/* primary, secondary ID bytes */ u_char *va;unsigned long pa; - +if (DIO_SCINHOLE (scode))continue ;
Signature · 1 line
2.35.0
PATCH 4/7 drivers: dio: space prohibited after parenthesis
In reply to Aleksa VučkovićThis patch fixes the checkpatch.pl error:
< ERROR: space prohibited after that open parenthesis '('
< #67: FILE: drivers/dio/dio.c:67:
< +#define DIOFBNAME(x) { DIO_ENCODE_ID( DIO_ID_FBUFFER, DIO_ID2_##x), DIO_DESC2_##x }
--- drivers/dio/dio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dio/dio.c +1 -1
@@ -64,7 +64,7 @@ struct dioname {/* useful macro */ #define DIONAME (x) { DIO_ID_##x, DIO_DESC_##x } -#define DIOFBNAME (x) { DIO_ENCODE_ID( DIO_ID_FBUFFER, DIO_ID2_##x), DIO_DESC2_##x } +#define DIOFBNAME (x) { DIO_ENCODE_ID(DIO_ID_FBUFFER, DIO_ID2_##x), DIO_DESC2_##x }static struct dioname names[] = {DIONAME (DCA0 ),DIONAME (DCA0REM ),DIONAME (DCA1 ),DIONAME (DCA1REM ),
Signature · 1 line
2.35.0
PATCH 5/7 drivers: dio: space required after that ','
In reply to Aleksa VučkovićThis patch fixes the checkpatch.pl error:
< ERROR: space required after that ',' (ctx:VxV)
< #239: FILE: drivers/dio/dio.c:239:
< + strcpy(dev->name,dio_getname(dev->id));
--- drivers/dio/dio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dio/dio.c +1 -1
@@ -236,7 +236,7 @@ static int __init dio_init(void) dev->id = prid; dev->ipl =DIO_IPL (va); -strcpy (dev->name,dio_getname (dev->id)); +strcpy (dev->name,dio_getname (dev->id));printk (KERN_INFO "select code %3d: ipl %d: ID %02X" , dev->scode, dev->ipl, prid);if (DIO_NEEDSSECID (prid))printk (":%02X" , secid);
Signature · 1 line
2.35.0
PATCH 6/7 drivers: dio: code indent should use tabs
In reply to Aleksa VučkovićThis patch fixes the checkpatch.pl error:
< ERROR: code indent should use tabs where possible < #61: FILE: drivers/dio/dio.c:61:
< + int id;$
<
< WARNING: please, no spaces at the start of a line < #61: FILE: drivers/dio/dio.c:61:
< + int id;$
<
< ERROR: code indent should use tabs where possible < #62: FILE: drivers/dio/dio.c:62:
< + const char *name;$
<
< WARNING: please, no spaces at the start of a line < #62: FILE: drivers/dio/dio.c:62:
< + const char *name;$
+ 44 more errors of type "code indent should use tabs where possible"
+ 41 more warnings of type "please, no spaces at the start of a line"
--- drivers/dio/dio.c | 92 +++++++++++++++++++++++------------------------ 1 file changed, 46 insertions(+), 46 deletions(-)
drivers/dio/dio.c +46 -46
@@ -58,8 +58,8 @@ struct dio_bus dio_bus = {* marking the names[] array as .initdata ? */ struct dioname { -int id; -const char *name; +int id; +const char *name; };/* useful macro */
@@ -67,20 +67,20 @@ struct dioname {#define DIOFBNAME (x) { DIO_ENCODE_ID(DIO_ID_FBUFFER, DIO_ID2_##x), DIO_DESC2_##x }static struct dioname names[] = { -DIONAME (DCA0 ),DIONAME (DCA0REM ),DIONAME (DCA1 ),DIONAME (DCA1REM ), -DIONAME (DCM ),DIONAME (DCMREM ), -DIONAME (LAN ), -DIONAME (FHPIB ),DIONAME (NHPIB ), -DIONAME (SCSI0 ),DIONAME (SCSI1 ),DIONAME (SCSI2 ),DIONAME (SCSI3 ), -DIONAME (FBUFFER ), -DIONAME (PARALLEL ),DIONAME (VME ),DIONAME (DCL ),DIONAME (DCLREM ), -DIONAME (MISC0 ),DIONAME (MISC1 ),DIONAME (MISC2 ),DIONAME (MISC3 ), -DIONAME (MISC4 ),DIONAME (MISC5 ),DIONAME (MISC6 ),DIONAME (MISC7 ), +DIONAME (DCA0 ),DIONAME (DCA0REM ),DIONAME (DCA1 ),DIONAME (DCA1REM ), +DIONAME (DCM ),DIONAME (DCMREM ), +DIONAME (LAN ), +DIONAME (FHPIB ),DIONAME (NHPIB ), +DIONAME (SCSI0 ),DIONAME (SCSI1 ),DIONAME (SCSI2 ),DIONAME (SCSI3 ), +DIONAME (FBUFFER ), +DIONAME (PARALLEL ),DIONAME (VME ),DIONAME (DCL ),DIONAME (DCLREM ), +DIONAME (MISC0 ),DIONAME (MISC1 ),DIONAME (MISC2 ),DIONAME (MISC3 ), +DIONAME (MISC4 ),DIONAME (MISC5 ),DIONAME (MISC6 ),DIONAME (MISC7 ),DIONAME (MISC8 ),DIONAME (MISC9 ),DIONAME (MISC10 ),DIONAME (MISC11 ), -DIONAME (MISC12 ),DIONAME (MISC13 ), -DIOFBNAME (GATORBOX ),DIOFBNAME (TOPCAT ),DIOFBNAME (RENAISSANCE ), -DIOFBNAME (LRCATSEYE ),DIOFBNAME (HRCCATSEYE ),DIOFBNAME (HRMCATSEYE ), -DIOFBNAME (DAVINCI ),DIOFBNAME (XXXCATSEYE ),DIOFBNAME (HYPERION ), +DIONAME (MISC12 ),DIONAME (MISC13 ), +DIOFBNAME (GATORBOX ),DIOFBNAME (TOPCAT ),DIOFBNAME (RENAISSANCE ), +DIOFBNAME (LRCATSEYE ),DIOFBNAME (HRCCATSEYE ),DIOFBNAME (HRMCATSEYE ), +DIOFBNAME (DAVINCI ),DIOFBNAME (XXXCATSEYE ),DIOFBNAME (HYPERION ),DIOFBNAME (XGENESIS ),DIOFBNAME (TIGER ),DIOFBNAME (YGENESIS ) };
@@ -92,13 +92,13 @@ static const char unknowndioname[]static const char *dio_getname (int id) { -/* return pointer to a constant string describing the board with given ID */ +/* return pointer to a constant string describing the board with given ID */ unsigned int i;for (i =0 ; i <ARRAY_SIZE (names); i++)if (names[i].id == id) -return names[i].name; +return names[i].name; -return unknowndioname; +return unknowndioname; }#else
@@ -120,10 +120,10 @@ int __init dio_find(int deviceid)void *va;unsigned long pa; -if (DIO_SCINHOLE (scode)) -continue ; +if (DIO_SCINHOLE (scode)) +continue ; - pa =dio_scodetophysaddr (scode); + pa =dio_scodetophysaddr (scode);if (!pa)continue ;
@@ -137,15 +137,15 @@ int __init dio_find(int deviceid) (unsigned char *)va + DIO_IDOFF, 1)) {if (scode >=DIOII_SCBASE )iounmap (va); -continue ;/* no board present at that select code */ +continue ;/* no board present at that select code */ } prid =DIO_ID (va); -if (DIO_NEEDSSECID (prid)) { - secid =DIO_SECID (va); - id =DIO_ENCODE_ID (prid, secid); - }else +if (DIO_NEEDSSECID (prid)) { + secid =DIO_SECID (va); + id =DIO_ENCODE_ID (prid, secid); + }else id = prid;if (id == deviceid) {
@@ -189,12 +189,12 @@ static int __init dio_init(void)/* Register all devices */ for (scode =0 ; scode <DIO_SCMAX ; ++scode) { -u_char prid, secid =0 ;/* primary, secondary ID bytes */ -u_char *va; +u_char prid, secid =0 ;/* primary, secondary ID bytes */ +u_char *va;unsigned long pa; -if (DIO_SCINHOLE (scode)) -continue ; +if (DIO_SCINHOLE (scode)) +continue ; pa =dio_scodetophysaddr (scode);
@@ -210,10 +210,10 @@ static int __init dio_init(void) (unsigned char *)va + DIO_IDOFF, 1)) {if (scode >=DIOII_SCBASE )iounmap (va); -continue ;/* no board present at that select code */ +continue ;/* no board present at that select code */ } -/* Found a board, allocate it an entry in the list */ +/* Found a board, allocate it an entry in the list */ dev =kzalloc (sizeof (struct dio_dev ),GFP_KERNEL );if (!dev)return -ENOMEM ;
@@ -226,19 +226,19 @@ static int __init dio_init(void) dev->resource.end = pa +DIO_SIZE (scode, va);dev_set_name (&dev->dev,"%02x" , scode); -/* read the ID byte(s) and encode if necessary. */ +/* read the ID byte(s) and encode if necessary. */ prid =DIO_ID (va); -if (DIO_NEEDSSECID (prid)) { - secid =DIO_SECID (va); - dev->id =DIO_ENCODE_ID (prid, secid); - }else - dev->id = prid; +if (DIO_NEEDSSECID (prid)) { + secid =DIO_SECID (va); + dev->id =DIO_ENCODE_ID (prid, secid); + }else + dev->id = prid; - dev->ipl =DIO_IPL (va); + dev->ipl =DIO_IPL (va);strcpy (dev->name,dio_getname (dev->id));printk (KERN_INFO "select code %3d: ipl %d: ID %02X" , dev->scode, dev->ipl, prid); -if (DIO_NEEDSSECID (prid)) +if (DIO_NEEDSSECID (prid))printk (":%02X" , secid);printk (": %s\n" , dev->name);
@@ -253,7 +253,7 @@ static int __init dio_init(void) error =dio_create_sysfs_dev_files (dev);if (error)dev_err (&dev->dev,"Error creating sysfs files\n" ); - } + }return 0 ; }
@@ -265,11 +265,11 @@ subsys_initcall(dio_init);unsigned long dio_scodetophysaddr (int scode) {if (scode >=DIOII_SCBASE ) -return (DIOII_BASE + (scode -132 ) *DIOII_DEVSIZE ); +return (DIOII_BASE + (scode -132 ) *DIOII_DEVSIZE );else if (scode >DIO_SCMAX || scode <0 ) -return 0 ; -else if (DIO_SCINHOLE (scode)) -return 0 ; +return 0 ; +else if (DIO_SCINHOLE (scode)) +return 0 ; -return (DIO_BASE + scode *DIO_DEVSIZE ); +return (DIO_BASE + scode *DIO_DEVSIZE ); }
Signature · 1 line
2.35.0
PATCH 7/7 drivers: Missing a blank line after declarations
In reply to Aleksa VučkovićThis patch fixes the checkpatch.pl error:
< WARNING: Missing a blank line after declarations < #97: FILE: drivers/dio/dio.c:97:
< + unsigned int i;
< + for (i = 0; i < ARRAY_SIZE(names); i++)
--- drivers/dio/dio.c | 1 + 1 file changed, 1 insertion(+)
drivers/dio/dio.c +1 -0
@@ -94,6 +94,7 @@ static const char *dio_getname(int id) {/* return pointer to a constant string describing the board with given ID */ unsigned int i; +for (i =0 ; i <ARRAY_SIZE (names); i++)if (names[i].id == id)return names[i].name;
Signature · 1 line
2.35.0