summaryrefslogtreecommitdiff
path: root/drivers/dio
diff options
context:
space:
mode:
authorAleksa Vučković <aleksav013@gmail.com>2022-01-27 16:50:49 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-02-04 18:45:39 +0300
commit8a4606c6429d2600deded63d6d3fbe99af99942d (patch)
treedd62880f15d6234ae8ba13657a634ece90e7153a /drivers/dio
parent10f4629f85f1caae6583dc69159740ab26fdf78c (diff)
downloadlinux-8a4606c6429d2600deded63d6d3fbe99af99942d.tar.xz
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)) < [...] Signed-off-by: Aleksa Vučković <aleksav013@gmail.com> Link: https://lore.kernel.org/r/20220127135054.27281-2-aleksav013@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/dio')
-rw-r--r--drivers/dio/dio.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/dio/dio.c b/drivers/dio/dio.c
index 831f36ab6e2b..4a35ca2d0849 100644
--- a/drivers/dio/dio.c
+++ b/drivers/dio/dio.c
@@ -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;