Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1426881

[PATCH v4 net-next v4 07/14] net: dsa: mv88e6xxx: remove table args in info lookup

From Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Newsgroups linux.kernel
Subject [PATCH v4 net-next v4 07/14] net: dsa: mv88e6xxx: remove table args in info lookup
Date 2016-06-20 20:00 +0200
Message-ID <rMbEl-2RX-29@gated-at.bofh.it> (permalink)
References <rM9VT-215-3@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


The mv88e6xxx_table array and the mv88e6xxx_lookup_info function are
static, so remove the table and size arguments from the lookup function.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
---
 drivers/net/dsa/mv88e6xxx.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/drivers/net/dsa/mv88e6xxx.c b/drivers/net/dsa/mv88e6xxx.c
index ec28465..75e5408 100644
--- a/drivers/net/dsa/mv88e6xxx.c
+++ b/drivers/net/dsa/mv88e6xxx.c
@@ -3590,15 +3590,13 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
 	},
 };
 
-static const struct mv88e6xxx_info *
-mv88e6xxx_lookup_info(unsigned int prod_num, const struct mv88e6xxx_info *table,
-		      unsigned int num)
+static const struct mv88e6xxx_info *mv88e6xxx_lookup_info(unsigned int prod_num)
 {
 	int i;
 
-	for (i = 0; i < num; ++i)
-		if (table[i].prod_num == prod_num)
-			return &table[i];
+	for (i = 0; i < ARRAY_SIZE(mv88e6xxx_table); ++i)
+		if (mv88e6xxx_table[i].prod_num == prod_num)
+			return &mv88e6xxx_table[i];
 
 	return NULL;
 }
@@ -3625,8 +3623,7 @@ static const char *mv88e6xxx_drv_probe(struct device *dsa_dev,
 	prod_num = (id & 0xfff0) >> 4;
 	rev = id & 0x000f;
 
-	info = mv88e6xxx_lookup_info(prod_num, mv88e6xxx_table,
-				     ARRAY_SIZE(mv88e6xxx_table));
+	info = mv88e6xxx_lookup_info(prod_num);
 	if (!info)
 		return NULL;
 
@@ -3739,8 +3736,7 @@ static int mv88e6xxx_probe(struct mdio_device *mdiodev)
 	prod_num = (id & 0xfff0) >> 4;
 	rev = id & 0x000f;
 
-	ps->info = mv88e6xxx_lookup_info(prod_num, mv88e6xxx_table,
-					 ARRAY_SIZE(mv88e6xxx_table));
+	ps->info = mv88e6xxx_lookup_info(prod_num);
 	if (!ps->info)
 		return -ENODEV;
 
-- 
2.9.0

Back to linux.kernel | Previous | NextPrevious in thread | Next in thread | Find similar | Unroll thread


Thread

[PATCH v4 net-next v4 00/14] net: dsa: mv88e6xxx: probe compatible Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2016-06-20 18:10 +0200
  [PATCH v4 net-next v4 02/14] net: dsa: mv88e6xxx: remove redundant assignments Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2016-06-20 18:10 +0200
  [PATCH v4 net-next v4 11/14] net: dsa: mv88e6xxx: add detection helper Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2016-06-20 18:10 +0200
  [PATCH v4 net-next v4 09/14] net: dsa: mv88e6xxx: add chip allocation helper Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2016-06-20 18:10 +0200
  [PATCH v4 net-next v4 06/14] net: dsa: mv88e6xxx: use gpio get optional variant Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2016-06-20 18:10 +0200
  [PATCH v4 net-next v4 14/14] net: dsa: mv88e6xxx: abstract switch registers accesses Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2016-06-20 18:10 +0200
    Re: [PATCH v4 net-next v4 14/14] net: dsa: mv88e6xxx: abstract  switch registers accesses Andrew Lunn <andrew@lunn.ch> - 2016-06-20 18:40 +0200
      Re: [PATCH v4 net-next v4 14/14] net: dsa: mv88e6xxx: abstract switch registers accesses Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2016-06-20 20:00 +0200
  [PATCH v4 net-next v4 13/14] net: dsa: mv88e6xxx: add port base address to info Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2016-06-20 18:10 +0200
  [PATCH v4 net-next v4 12/14] net: dsa: mv88e6xxx: pass compatible info Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2016-06-20 18:10 +0200
  [PATCH v4 net-next v4 08/14] net: dsa: mv88e6xxx: rename smi_mutex to reg_lock Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2016-06-20 18:10 +0200
  [PATCH v4 net-next v4 05/14] net: dsa: mv88e6xxx: add switch register helpers Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2016-06-20 20:00 +0200
  [PATCH v4 net-next v4 01/14] net: dsa: mv88e6xxx: fix style issues Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2016-06-20 20:00 +0200
  [PATCH v4 net-next v4 03/14] net: dsa: mv88e6xxx: use already declared variables Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2016-06-20 20:00 +0200
  [PATCH v4 net-next v4 07/14] net: dsa: mv88e6xxx: remove table args in info lookup Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2016-06-20 20:00 +0200
  [PATCH v4 net-next v4 04/14] net: dsa: mv88e6xxx: do not increment bus refcount Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2016-06-20 20:00 +0200

csiph-web