Message ID | 20190904141730.31497-1-kw@linux.com |
---|---|
State | Accepted |
Delegated to: | David Miller |
Headers | show |
Series | net: qed: Move static keyword to the front of declaration | expand |
> From: Krzysztof Wilczynski <kswilczynski@gmail.com> On Behalf Of Krzysztof > Wilczynski > > External Email > > ---------------------------------------------------------------------- > Move the static keyword to the front of declaration of iwarp_state_names, > and resolve the following compiler warning that can be seen when building > with warnings enabled (W=1): > > drivers/net/ethernet/qlogic/qed/qed_iwarp.c:385:1: warning: > ‘static’ is not at beginning of declaration [-Wold-style-declaration] > > Also, resolve checkpatch.pl script warning: > > WARNING: static const char * array should probably be > static const char * const > > Signed-off-by: Krzysztof Wilczynski <kw@linux.com> > --- > Related: https://lore.kernel.org/r/20190827233017.GK9987@google.com > > drivers/net/ethernet/qlogic/qed/qed_iwarp.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/qlogic/qed/qed_iwarp.c > b/drivers/net/ethernet/qlogic/qed/qed_iwarp.c > index f380fae8799d..65ec16a31658 100644 > --- a/drivers/net/ethernet/qlogic/qed/qed_iwarp.c > +++ b/drivers/net/ethernet/qlogic/qed/qed_iwarp.c > @@ -382,7 +382,7 @@ qed_iwarp2roce_state(enum qed_iwarp_qp_state > state) > } > } > > -const static char *iwarp_state_names[] = { > +static const char * const iwarp_state_names[] = { > "IDLE", > "RTS", > "TERMINATE", Thanks, Acked-by: Michal Kalderon <michal.kalderon@marvell.com> > -- > 2.22.1
From: Krzysztof Wilczynski <kw@linux.com> Date: Wed, 4 Sep 2019 16:17:30 +0200 > Move the static keyword to the front of declaration of iwarp_state_names, > and resolve the following compiler warning that can be seen when building > with warnings enabled (W=1): > > drivers/net/ethernet/qlogic/qed/qed_iwarp.c:385:1: warning: > ‘static’ is not at beginning of declaration [-Wold-style-declaration] > > Also, resolve checkpatch.pl script warning: > > WARNING: static const char * array should probably be > static const char * const > > Signed-off-by: Krzysztof Wilczynski <kw@linux.com> Applied to net-next.
diff --git a/drivers/net/ethernet/qlogic/qed/qed_iwarp.c b/drivers/net/ethernet/qlogic/qed/qed_iwarp.c index f380fae8799d..65ec16a31658 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_iwarp.c +++ b/drivers/net/ethernet/qlogic/qed/qed_iwarp.c @@ -382,7 +382,7 @@ qed_iwarp2roce_state(enum qed_iwarp_qp_state state) } } -const static char *iwarp_state_names[] = { +static const char * const iwarp_state_names[] = { "IDLE", "RTS", "TERMINATE",
Move the static keyword to the front of declaration of iwarp_state_names, and resolve the following compiler warning that can be seen when building with warnings enabled (W=1): drivers/net/ethernet/qlogic/qed/qed_iwarp.c:385:1: warning: ‘static’ is not at beginning of declaration [-Wold-style-declaration] Also, resolve checkpatch.pl script warning: WARNING: static const char * array should probably be static const char * const Signed-off-by: Krzysztof Wilczynski <kw@linux.com> --- Related: https://lore.kernel.org/r/20190827233017.GK9987@google.com drivers/net/ethernet/qlogic/qed/qed_iwarp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)