From: Scott Schafer <schaferjscott@gmail.com> To: gregkh@linuxfoundation.org Cc: Scott Schafer <schaferjscott@gmail.com>, Manish Chopra <manishc@marvell.com>, GR-Linux-NIC-Dev@marvell.com, netdev@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 11/23] staging: qlge: Fix CHECK: braces {} should be used on all arms of this statement Date: Wed, 11 Dec 2019 12:12:40 -0600 [thread overview] Message-ID: <0e1fc1a16725094676fdab63d3a24a986309a759.1576086080.git.schaferjscott@gmail.com> (raw) In-Reply-To: <cover.1576086080.git.schaferjscott@gmail.com> Fix CHECK: braces {} should be used on all arms of this statement in qlge_ethtool.c and qlge_mpi.c Signed-off-by: Scott Schafer <schaferjscott@gmail.com> --- drivers/staging/qlge/qlge_ethtool.c | 18 ++++++++++++------ drivers/staging/qlge/qlge_mpi.c | 9 ++++++--- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/drivers/staging/qlge/qlge_ethtool.c b/drivers/staging/qlge/qlge_ethtool.c index 794962ae642c..b9e1e154d646 100644 --- a/drivers/staging/qlge/qlge_ethtool.c +++ b/drivers/staging/qlge/qlge_ethtool.c @@ -260,8 +260,9 @@ static void ql_update_stats(struct ql_adapter *qdev) "Error reading status register 0x%.04x.\n", i); goto end; - } else + } else { *iter = data; + } iter++; } @@ -274,8 +275,9 @@ static void ql_update_stats(struct ql_adapter *qdev) "Error reading status register 0x%.04x.\n", i); goto end; - } else + } else { *iter = data; + } iter++; } @@ -291,8 +293,9 @@ static void ql_update_stats(struct ql_adapter *qdev) "Error reading status register 0x%.04x.\n", i); goto end; - } else + } else { *iter = data; + } iter++; } @@ -305,8 +308,9 @@ static void ql_update_stats(struct ql_adapter *qdev) "Error reading status register 0x%.04x.\n", i); goto end; - } else + } else { *iter = data; + } iter++; } @@ -317,8 +321,9 @@ static void ql_update_stats(struct ql_adapter *qdev) netif_err(qdev, drv, qdev->ndev, "Error reading status register 0x%.04x.\n", i); goto end; - } else + } else { *iter = data; + } end: ql_sem_unlock(qdev, qdev->xg_sem_mask); quit: @@ -489,8 +494,9 @@ static int ql_start_loopback(struct ql_adapter *qdev) if (netif_carrier_ok(qdev->ndev)) { set_bit(QL_LB_LINK_UP, &qdev->flags); netif_carrier_off(qdev->ndev); - } else + } else { clear_bit(QL_LB_LINK_UP, &qdev->flags); + } qdev->link_config |= CFG_LOOPBACK_PCS; return ql_mb_set_port_cfg(qdev); } diff --git a/drivers/staging/qlge/qlge_mpi.c b/drivers/staging/qlge/qlge_mpi.c index 4f8365cf2092..4cff0907625b 100644 --- a/drivers/staging/qlge/qlge_mpi.c +++ b/drivers/staging/qlge/qlge_mpi.c @@ -278,8 +278,9 @@ static void ql_link_up(struct ql_adapter *qdev, struct mbox_params *mbcp) netif_err(qdev, ifup, qdev->ndev, "Failed to init CAM/Routing tables.\n"); return; - } else + } else { clear_bit(QL_CAM_RT_SET, &qdev->flags); + } } /* Queue up a worker to check the frame @@ -351,8 +352,9 @@ static int ql_aen_lost(struct ql_adapter *qdev, struct mbox_params *mbcp) mbcp->out_count = 6; status = ql_get_mb_sts(qdev, mbcp); - if (status) + if (status) { netif_err(qdev, drv, qdev->ndev, "Lost AEN broken!\n"); + } else { int i; @@ -996,8 +998,9 @@ int ql_mb_get_led_cfg(struct ql_adapter *qdev) netif_err(qdev, drv, qdev->ndev, "Failed to get LED Configuration.\n"); status = -EIO; - } else + } else { qdev->led_config = mbcp->mbox_out[1]; + } return status; } -- 2.20.1
WARNING: multiple messages have this Message-ID (diff)
From: Scott Schafer <schaferjscott@gmail.com> To: gregkh@linuxfoundation.org Cc: devel@driverdev.osuosl.org, GR-Linux-NIC-Dev@marvell.com, Manish Chopra <manishc@marvell.com>, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Scott Schafer <schaferjscott@gmail.com> Subject: [PATCH v2 11/23] staging: qlge: Fix CHECK: braces {} should be used on all arms of this statement Date: Wed, 11 Dec 2019 12:12:40 -0600 [thread overview] Message-ID: <0e1fc1a16725094676fdab63d3a24a986309a759.1576086080.git.schaferjscott@gmail.com> (raw) In-Reply-To: <cover.1576086080.git.schaferjscott@gmail.com> Fix CHECK: braces {} should be used on all arms of this statement in qlge_ethtool.c and qlge_mpi.c Signed-off-by: Scott Schafer <schaferjscott@gmail.com> --- drivers/staging/qlge/qlge_ethtool.c | 18 ++++++++++++------ drivers/staging/qlge/qlge_mpi.c | 9 ++++++--- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/drivers/staging/qlge/qlge_ethtool.c b/drivers/staging/qlge/qlge_ethtool.c index 794962ae642c..b9e1e154d646 100644 --- a/drivers/staging/qlge/qlge_ethtool.c +++ b/drivers/staging/qlge/qlge_ethtool.c @@ -260,8 +260,9 @@ static void ql_update_stats(struct ql_adapter *qdev) "Error reading status register 0x%.04x.\n", i); goto end; - } else + } else { *iter = data; + } iter++; } @@ -274,8 +275,9 @@ static void ql_update_stats(struct ql_adapter *qdev) "Error reading status register 0x%.04x.\n", i); goto end; - } else + } else { *iter = data; + } iter++; } @@ -291,8 +293,9 @@ static void ql_update_stats(struct ql_adapter *qdev) "Error reading status register 0x%.04x.\n", i); goto end; - } else + } else { *iter = data; + } iter++; } @@ -305,8 +308,9 @@ static void ql_update_stats(struct ql_adapter *qdev) "Error reading status register 0x%.04x.\n", i); goto end; - } else + } else { *iter = data; + } iter++; } @@ -317,8 +321,9 @@ static void ql_update_stats(struct ql_adapter *qdev) netif_err(qdev, drv, qdev->ndev, "Error reading status register 0x%.04x.\n", i); goto end; - } else + } else { *iter = data; + } end: ql_sem_unlock(qdev, qdev->xg_sem_mask); quit: @@ -489,8 +494,9 @@ static int ql_start_loopback(struct ql_adapter *qdev) if (netif_carrier_ok(qdev->ndev)) { set_bit(QL_LB_LINK_UP, &qdev->flags); netif_carrier_off(qdev->ndev); - } else + } else { clear_bit(QL_LB_LINK_UP, &qdev->flags); + } qdev->link_config |= CFG_LOOPBACK_PCS; return ql_mb_set_port_cfg(qdev); } diff --git a/drivers/staging/qlge/qlge_mpi.c b/drivers/staging/qlge/qlge_mpi.c index 4f8365cf2092..4cff0907625b 100644 --- a/drivers/staging/qlge/qlge_mpi.c +++ b/drivers/staging/qlge/qlge_mpi.c @@ -278,8 +278,9 @@ static void ql_link_up(struct ql_adapter *qdev, struct mbox_params *mbcp) netif_err(qdev, ifup, qdev->ndev, "Failed to init CAM/Routing tables.\n"); return; - } else + } else { clear_bit(QL_CAM_RT_SET, &qdev->flags); + } } /* Queue up a worker to check the frame @@ -351,8 +352,9 @@ static int ql_aen_lost(struct ql_adapter *qdev, struct mbox_params *mbcp) mbcp->out_count = 6; status = ql_get_mb_sts(qdev, mbcp); - if (status) + if (status) { netif_err(qdev, drv, qdev->ndev, "Lost AEN broken!\n"); + } else { int i; @@ -996,8 +998,9 @@ int ql_mb_get_led_cfg(struct ql_adapter *qdev) netif_err(qdev, drv, qdev->ndev, "Failed to get LED Configuration.\n"); status = -EIO; - } else + } else { qdev->led_config = mbcp->mbox_out[1]; + } return status; } -- 2.20.1 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
next prev parent reply other threads:[~2019-12-11 18:15 UTC|newest] Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-12-11 18:12 [PATCH v2 00/23] V2: Break up from one patch to multiple Scott Schafer 2019-12-11 18:12 ` Scott Schafer 2019-12-11 18:12 ` [PATCH v2 01/23] staging: qlge: Fix CHECK extra blank lines in many files Scott Schafer 2019-12-11 18:12 ` Scott Schafer 2019-12-11 18:12 ` [PATCH v2 02/23] staging: qlge: Fix CHECK: Alignment should match open parenthesis Scott Schafer 2019-12-11 18:12 ` Scott Schafer 2019-12-11 18:12 ` [PATCH v2 03/23] staging:qlge: Fix WARNING: Missing a blank line after declarations Scott Schafer 2019-12-11 18:12 ` Scott Schafer 2019-12-17 12:36 ` [PATCH v2 03/23] staging: qlge: " Greg KH 2019-12-17 12:36 ` Greg KH 2019-12-11 18:12 ` [PATCH v2 04/23] " Scott Schafer 2019-12-11 18:12 ` Scott Schafer 2019-12-17 12:37 ` Greg KH 2019-12-17 12:37 ` Greg KH 2019-12-11 18:12 ` [PATCH v2 05/23] staging: qlge: Fix CHECK: Blank lines aren't necessary before a close brace '}' Scott Schafer 2019-12-11 18:12 ` Scott Schafer 2019-12-11 18:12 ` [PATCH v2 06/23] staging: qlge: Fix CHECK: Blank lines aren't necessary after an open brace '{' Scott Schafer 2019-12-11 18:12 ` Scott Schafer 2019-12-11 18:12 ` [PATCH v2 07/23] staging: qlge: Fix WARNING: quoted string split across lines Scott Schafer 2019-12-11 18:12 ` Scott Schafer 2019-12-11 18:12 ` [PATCH v2 08/23] staging: qlge: Fix CHECK: Unnecessary parentheses around mpi_coredump->mpi_global_header Scott Schafer 2019-12-11 18:12 ` Scott Schafer 2019-12-11 18:12 ` [PATCH v2 09/23] staging: qlge: Fix CHECK: No space is necessary after a cast Scott Schafer 2019-12-11 18:12 ` Scott Schafer 2019-12-11 18:12 ` [PATCH v2 10/23] staging: qlge: Fix CHECK: blank line after function/struct/union/enum declarations Scott Schafer 2019-12-11 18:12 ` Scott Schafer 2019-12-11 18:12 ` Scott Schafer [this message] 2019-12-11 18:12 ` [PATCH v2 11/23] staging: qlge: Fix CHECK: braces {} should be used on all arms of this statement Scott Schafer 2019-12-12 12:12 ` Dan Carpenter 2019-12-12 12:12 ` Dan Carpenter 2019-12-12 15:02 ` Scott Schafer 2019-12-12 15:02 ` Scott Schafer 2019-12-12 16:03 ` Greg KH 2019-12-12 16:03 ` Greg KH 2019-12-12 16:31 ` Dan Carpenter 2019-12-12 16:31 ` Dan Carpenter 2019-12-12 19:25 ` David Miller 2019-12-12 19:25 ` David Miller 2019-12-11 18:12 ` [PATCH v2 12/23] staging: qlge: Fix WARNING: please, no space before tabs in qlge.h Scott Schafer 2019-12-11 18:12 ` Scott Schafer 2019-12-11 18:12 ` [PATCH v2 13/23] staging: qlge: Fix CHECK: spaces preferred around that (ctx:VxV) Scott Schafer 2019-12-11 18:12 ` Scott Schafer 2019-12-11 18:12 ` [PATCH v2 14/23] staging: qlge: Fix WARNING: Unnecessary space before function pointer arguments Scott Schafer 2019-12-11 18:12 ` Scott Schafer 2019-12-11 18:12 ` [PATCH v2 15/23] staging: qlge: Fix WARNING: please, no spaces at the start of a line Scott Schafer 2019-12-11 18:12 ` Scott Schafer 2019-12-11 18:12 ` [PATCH v2 16/23] staging: qlge: Fix WARNING: Block comments use a trailing */ on a separate line Scott Schafer 2019-12-11 18:12 ` Scott Schafer 2019-12-11 18:12 ` [PATCH v2 17/23] staging: qlge: Fix WARNING: else is not generally useful after a break or return Scott Schafer 2019-12-11 18:12 ` Scott Schafer 2019-12-11 18:12 ` [PATCH v2 18/23] staging: qlge: Fix CHECK: Prefer using the BIT macro Scott Schafer 2019-12-11 18:12 ` Scott Schafer 2019-12-11 18:12 ` [PATCH v2 19/23] staging: qlge: Fix WARNING: msleep < 20ms can sleep for up to 20ms Scott Schafer 2019-12-11 18:12 ` Scott Schafer 2019-12-11 18:12 ` [PATCH v2 20/23] staging: qlge: Fix CHECK: usleep_range is preferred over udelay Scott Schafer 2019-12-11 18:12 ` Scott Schafer 2019-12-12 10:45 ` Sergei Shtylyov 2019-12-12 10:45 ` Sergei Shtylyov 2019-12-12 11:00 ` Scott Schafer 2019-12-12 11:00 ` Scott Schafer 2019-12-12 11:12 ` Dan Carpenter 2019-12-12 11:12 ` Dan Carpenter 2019-12-12 11:07 ` Dan Carpenter 2019-12-12 11:07 ` Dan Carpenter 2019-12-11 18:12 ` [PATCH v2 21/23] staging: qlge: Fix WARNING: suspect code indent for conditional statements Scott Schafer 2019-12-11 18:12 ` Scott Schafer 2019-12-11 18:12 ` [PATCH v2 22/23] staging: qlge: Fix CHECK: Unbalanced braces around else statement Scott Schafer 2019-12-11 18:12 ` Scott Schafer 2019-12-11 18:12 ` [PATCH v2 23/23] staging: qlge: Fix WARNING: Avoid multiple line dereference Scott Schafer 2019-12-11 18:12 ` Scott Schafer
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=0e1fc1a16725094676fdab63d3a24a986309a759.1576086080.git.schaferjscott@gmail.com \ --to=schaferjscott@gmail.com \ --cc=GR-Linux-NIC-Dev@marvell.com \ --cc=devel@driverdev.osuosl.org \ --cc=gregkh@linuxfoundation.org \ --cc=linux-kernel@vger.kernel.org \ --cc=manishc@marvell.com \ --cc=netdev@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.