[PATCH net] ethernet: xircom: small clean up in setup_xirc2ps_cs()

Subsystems: networking drivers, the rest

STALE3341d

4 messages, 3 authors, 2017-08-22 · open the first message on its own page

[PATCH net] ethernet: xircom: small clean up in setup_xirc2ps_cs()

From: Dan Carpenter <hidden>
Date: 2017-08-21 09:49:41

The get_options() function takes the whole ARRAY_SIZE().  It doesn't
matter here because we don't use more than 7 elements.

Signed-off-by: Dan Carpenter <redacted>
diff --git a/drivers/net/ethernet/xircom/xirc2ps_cs.c b/drivers/net/ethernet/xircom/xirc2ps_cs.c
index f71883264cc0..fd5288ff53b5 100644
--- a/drivers/net/ethernet/xircom/xirc2ps_cs.c
+++ b/drivers/net/ethernet/xircom/xirc2ps_cs.c
@@ -1781,7 +1781,7 @@ static int __init setup_xirc2ps_cs(char *str)
 	 */
 	int ints[10] = { -1 };
 
-	str = get_options(str, 9, ints);
+	str = get_options(str, ARRAY_SIZE(ints), ints);
 
 #define MAYBE_SET(X,Y) if (ints[0] >= Y && ints[Y] != -1) { X = ints[Y]; }
 	MAYBE_SET(if_port, 3);

RE: [PATCH net] ethernet: xircom: small clean up in setup_xirc2ps_cs()

From: David Laight <hidden>
Date: 2017-08-21 14:52:46

From: Dan Carpenter
quoted hunk
Sent: 21 August 2017 10:48
The get_options() function takes the whole ARRAY_SIZE().  It doesn't
matter here because we don't use more than 7 elements.

Signed-off-by: Dan Carpenter <redacted>
diff --git a/drivers/net/ethernet/xircom/xirc2ps_cs.c b/drivers/net/ethernet/xircom/xirc2ps_cs.c
index f71883264cc0..fd5288ff53b5 100644
--- a/drivers/net/ethernet/xircom/xirc2ps_cs.c
+++ b/drivers/net/ethernet/xircom/xirc2ps_cs.c
@@ -1781,7 +1781,7 @@ static int __init setup_xirc2ps_cs(char *str)
 	 */
 	int ints[10] = { -1 };

-	str = get_options(str, 9, ints);
+	str = get_options(str, ARRAY_SIZE(ints), ints);

 #define MAYBE_SET(X,Y) if (ints[0] >= Y && ints[Y] != -1) { X = ints[Y]; }
 	MAYBE_SET(if_port, 3);
That code looks very dubious to me.
It looks as though it expects all of the ints[] array to be initialised
to -1, not just the first element.

	David

Re: [PATCH net] ethernet: xircom: small clean up in setup_xirc2ps_cs()

From: Dan Carpenter <hidden>
Date: 2017-08-21 14:58:59

On Mon, Aug 21, 2017 at 02:52:34PM +0000, David Laight wrote:
From: Dan Carpenter
quoted
Sent: 21 August 2017 10:48
The get_options() function takes the whole ARRAY_SIZE().  It doesn't
matter here because we don't use more than 7 elements.

Signed-off-by: Dan Carpenter <redacted>
diff --git a/drivers/net/ethernet/xircom/xirc2ps_cs.c b/drivers/net/ethernet/xircom/xirc2ps_cs.c
index f71883264cc0..fd5288ff53b5 100644
--- a/drivers/net/ethernet/xircom/xirc2ps_cs.c
+++ b/drivers/net/ethernet/xircom/xirc2ps_cs.c
@@ -1781,7 +1781,7 @@ static int __init setup_xirc2ps_cs(char *str)
 	 */
 	int ints[10] = { -1 };

-	str = get_options(str, 9, ints);
+	str = get_options(str, ARRAY_SIZE(ints), ints);

 #define MAYBE_SET(X,Y) if (ints[0] >= Y && ints[Y] != -1) { X = ints[Y]; }
 	MAYBE_SET(if_port, 3);
That code looks very dubious to me.
It looks as though it expects all of the ints[] array to be initialised
to -1, not just the first element.
I'm pretty sure you're right and I thought about changing it when I sent
the patch but it doesn't matter.  It's not required to initialize that
code anyway because either get_options() will initialize it or it won't
be used.

regards,
dan carpenter

Re: [PATCH net] ethernet: xircom: small clean up in setup_xirc2ps_cs()

From: David Miller <davem@davemloft.net>
Date: 2017-08-22 17:30:22

From: Dan Carpenter <redacted>
Date: Mon, 21 Aug 2017 12:47:30 +0300
The get_options() function takes the whole ARRAY_SIZE().  It doesn't
matter here because we don't use more than 7 elements.

Signed-off-by: Dan Carpenter <redacted>
Applied, thanks.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help