atm: nicstar: re-use native mac_pton() helper
Subsystems (3)
PATCH v2 1/2 atm: nicstar: re-use native mac_pton() helper
From: Andy Shevchenko <[email protected]>
There is a nice helper to parse MAC. Let's use it and remove custom implementation.
--- drivers/atm/nicstar.c | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-)
drivers/atm/nicstar.c +1 -25
@@ -153,7 +153,6 @@ static int ns_ioctl(struct atm_dev *dev, unsigned int cmd, void __user * arg);static void which_list (ns_dev * card,struct sk_buff *skb);#endif static void ns_poll (unsigned long arg); -static int ns_parse_mac (char *mac,unsigned char *esi);static void ns_phy_put (struct atm_dev *dev,unsigned char value,unsigned long addr);static unsigned char ns_phy_get (struct atm_dev *dev,unsigned long addr);
@@ -779,7 +778,7 @@ static int ns_init_card(int i, struct pci_dev *pcidev)return error; } -if (ns_parse_mac (mac[i], card->atmdev->esi)) { +if (mac[i] ==NULL ||mac_pton (mac[i], card->atmdev->esi)) {nicstar_read_eprom (card->membase,NICSTAR_EPROM_MAC_ADDR_OFFSET , card->atmdev->esi,6 ); if (memcmp(card->atmdev->esi, "\x00\x00\x00\x00\x00\x00", 6) ==
@@ -2802,29 +2801,6 @@ static void ns_poll(unsigned long arg)PRINTK ("nicstar: Leaving ns_poll().\n" ); } -static int ns_parse_mac (char *mac,unsigned char *esi) -{ -int i, j; -short byte1, byte0; - -if (mac ==NULL || esi ==NULL ) -return -1 ; - j =0 ; -for (i =0 ; i <6 ; i++) { -if ((byte1 =hex_to_bin (mac[j++])) <0 ) -return -1 ; -if ((byte0 =hex_to_bin (mac[j++])) <0 ) -return -1 ; - esi[i] = (unsigned char )(byte1 *16 + byte0); -if (i <5 ) { -if (mac[j++] !=':' ) -return -1 ; - } - } -return 0 ; -} - -static void ns_phy_put (struct atm_dev *dev,unsigned char value,unsigned long addr) {
Signature · 1 line
1.8.4.rc3
PATCH v2 2/2 atm: he: print MAC via %pM
--- drivers/atm/he.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)
drivers/atm/he.c +2 -9
@@ -1088,15 +1088,8 @@ static int he_start(struct atm_dev *dev)for (i =0 ; i <6 ; ++i) dev->esi[i] =read_prom_byte (he_dev,MAC_ADDR + i); -hprintk ("%s%s, %x:%x:%x:%x:%x:%x\n" , - he_dev->prod_id, - he_dev->media &0x40 ?"SM" :"MM" , - dev->esi[0 ], - dev->esi[1 ], - dev->esi[2 ], - dev->esi[3 ], - dev->esi[4 ], - dev->esi[5 ]); +hprintk ("%s%s, %*pM\n" , he_dev->prod_id, + he_dev->media &0x40 ?"SM" :"MM" , dev->esi); he_dev->atm_dev->link_rate =he_is622 (he_dev) ?ATM_OC12_PCR :ATM_OC3_PCR ;
Signature · 1 line
1.8.4.rc3
PATCH 1/1 atm: he: print MAC via %pM
--- drivers/atm/he.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)
drivers/atm/he.c +2 -9
@@ -1088,15 +1088,8 @@ static int he_start(struct atm_dev *dev)for (i =0 ; i <6 ; ++i) dev->esi[i] =read_prom_byte (he_dev,MAC_ADDR + i); -hprintk ("%s%s, %x:%x:%x:%x:%x:%x\n" , - he_dev->prod_id, - he_dev->media &0x40 ?"SM" :"MM" , - dev->esi[0 ], - dev->esi[1 ], - dev->esi[2 ], - dev->esi[3 ], - dev->esi[4 ], - dev->esi[5 ]); +hprintk ("%s%s, %pM\n" , he_dev->prod_id, + he_dev->media &0x40 ?"SM" :"MM" , dev->esi); he_dev->atm_dev->link_rate =he_is622 (he_dev) ?ATM_OC12_PCR :ATM_OC3_PCR ;
Signature · 1 line
1.8.4.rc3
Re: [PATCH v2 2/2] atm: he: print MAC via %pM
In reply to Andy ShevchenkoOn Tue, 2013-09-03 at 15:13 +0300, Andy Shevchenko wrote:
[]
drivers/atm/he.c
Quoted 1 line
drivers/atm/he.c +0
-0
[]
Quoted 5 lines
drivers/atm/he.c +0
-1@@ -1088,15 +1088,8 @@ static int he_start(struct atm_dev *dev)for (i =0 ; i <6 ; ++i) dev->esi[i] =read_prom_byte (he_dev,MAC_ADDR + i); - hprintk("%s%s, %x:%x:%x:%x:%x:%x\n",
drivers/atm/he.c static int he_start(struct atm_dev *dev) · line 1092
Quoted 10 lines
drivers/atm/he.c +2
-8- he_dev->prod_id, - he_dev->media &0x40 ?"SM" :"MM" , - dev->esi[0 ], - dev->esi[1 ], - dev->esi[2 ], - dev->esi[3 ], - dev->esi[4 ], - dev->esi[5]); +hprintk ("%s%s, %*pM\n" , he_dev->prod_id, + he_dev->media &0x40 ?"SM" :"MM" , dev->esi);
%*pM?
Did this compile cleanly?
Re: [PATCH v2 2/2] atm: he: print MAC via %pM
Quoted 22 lines · Joe Perches
On Tue, 2013-09-03 at 15:13 +0300, Andy Shevchenko wrote:
[]drivers/atm/he.c
Quoted 1 line
drivers/atm/he.c +0
-0[]
Quoted 5 lines
drivers/atm/he.c +0
-1@@ -1088,15 +1088,8 @@ static int he_start(struct atm_dev *dev)for (i =0 ; i <6 ; ++i) dev->esi[i] =read_prom_byte (he_dev,MAC_ADDR + i); - hprintk("%s%s, %x:%x:%x:%x:%x:%x\n",drivers/atm/he.c static int he_start(struct atm_dev *dev) · line 1092
Quoted 10 lines
drivers/atm/he.c +2
-8- he_dev->prod_id, - he_dev->media &0x40 ?"SM" :"MM" , - dev->esi[0 ], - dev->esi[1 ], - dev->esi[2 ], - dev->esi[3 ], - dev->esi[4 ], - dev->esi[5]); +hprintk ("%s%s, %*pM\n" , he_dev->prod_id, + he_dev->media &0x40 ?"SM" :"MM" , dev->esi);%*pM?
Quoted 1 line
Did this compile cleanly?
See v2.1 of this patch, and sorry for this typo.
Signature · 2 lines
Andy Shevchenko <[email protected]> Intel Finland Oy
Re: [PATCH v2 2/2] atm: he: print MAC via %pM
In reply to Andy ShevchenkoFrom: Andy Shevchenko <[email protected]>
Date: Tue, 3 Sep 2013 15:13:44 +0300
Quoted 1 line
Signed-off-by Andy Shevchenko <[email protected]>
Applied.
From: Andy Shevchenko <[email protected]>
Date: Tue, 3 Sep 2013 15:13:43 +0300
Quoted 6 lines
From: Andy Shevchenko <[email protected]>
There is a nice helper to parse MAC. Let's use it and remove custom implementation.
Signed-off-by Andy Shevchenko <[email protected]>
Applied.