Skip to contentSkip to conversation

drivers/net/skfp/drvfbi.c: trivial cleanup

PATCH In review Frank Seidel 2 participants 3 messages May 14, 2007 – May 15, 2007 Network drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drivers/net/skfp/drvfbi.c: trivial cleanup

This patch (for 2.6.21-mm2) contains a trivial cleanup:
- removes unused exist_board() variation
- removed part is depecrated and doesn't compile anymore

---
 drivers/net/skfp/drvfbi.c |   40 ----------------------------------------
 1 file changed, 40 deletions(-)
drivers/net/skfp/drvfbi.c +0 -40
Index: b/drivers/net/skfp/drvfbi.c
===================================================================
@@ -1224,46 +1224,6 @@ int get_board_para(struct s_smc *smc, in
 }
 #endif	/* ISA */
 
-#ifdef PCI
-#ifdef USE_BIOS_FUN
-int exist_board(struct s_smc *smc, int slot)
-{
-	u_short dev_id ;
-	u_short ven_id ;
-	int found ; 
-	int i ;
-
-	found = FALSE ;		/* make sure we returned with adatper not found*/
-				/* if an empty oemids.h was included */
-
-#ifdef MULT_OEM
-        smc->hw.oem_id = (struct s_oem_ids *) &oem_ids[0] ;
-	for (; smc->hw.oem_id->oi_status != OI_STAT_LAST; smc->hw.oem_id++) {
-		if (smc->hw.oem_id->oi_status < smc->hw.oem_min_status)
-			continue ;
-#endif
-		ven_id = OEMID(smc,0) + (OEMID(smc,1) << 8) ; 
-		dev_id = OEMID(smc,2) + (OEMID(smc,3) << 8) ; 
-		for (i = 0; i < slot; i++) {
-			if (pci_find_device(i,&smc->hw.pci_handle,
-				dev_id,ven_id) != 0) {
-
-				found = FALSE ;
-			} else {
-				found = TRUE ;
-			}
-		}
-		if (found) {
-			return(1) ;	/* adapter was found */
-		}
-#ifdef MULT_OEM
-	}
-#endif
-	return(0) ;	/* adapter was not found */
-}
-#endif	/* PCI */
-#endif	/* USE_BIOS_FUNC */
-
 void driver_get_bia(struct s_smc *smc, struct fddi_addr *bia_addr)
 {
 	int i ;
#1 lore raw

Vielen Dank Herr Seidel fuer Ihr Feedback.

Mit freundlichen Gruessen
Jamal

Marvell® Semiconductor Germany GmbH
-------------------------------------
Dipl. -Ing. Karim Jamal
Technical Support Engineer
--------------------------------------
Phone: +49 (0) 7243502-330
Fax: +49 (0) 7243502-364
Mail: [email protected]
Web: http:\\www.syskonnect.de
Marvell Semiconductor Germany GmbH, Siemensstr. 23, 76275 Ettlingen, Amtsgericht Karlsruhe HRB 1620 E Geschäftsführer: Dipl.-Volksw. Mathias Horak, Thomas Ruf

-----Ursprüngliche Nachricht-----
Von: Frank Seidel [mailto:[email protected]]
Gesendet: Montag, 14. Mai 2007 23:28
An: Linux Kernel
Cc: [email protected]
Betreff: [PATCH] drivers/net/skfp/drvfbi.c: trivial cleanup

This patch (for 2.6.21-mm2) contains a trivial cleanup:
- removes unused exist_board() variation
- removed part is depecrated and doesn't compile anymore

---
 drivers/net/skfp/drvfbi.c |   40 ----------------------------------------
 1 file changed, 40 deletions(-)

Index: b/drivers/net/skfp/drvfbi.c ===================================================================

drivers/net/skfp/drvfbi.c +0 -40
@@ -1224,46 +1224,6 @@ int get_board_para(struct s_smc *smc, in  }
 #endif	/* ISA */
 
-#ifdef PCI
-#ifdef USE_BIOS_FUN
-int exist_board(struct s_smc *smc, int slot)
-{
-	u_short dev_id ;
-	u_short ven_id ;
-	int found ; 
-	int i ;
-
-	found = FALSE ;		/* make sure we returned with adatper not found*/
-				/* if an empty oemids.h was included */
-
-#ifdef MULT_OEM
-        smc->hw.oem_id = (struct s_oem_ids *) &oem_ids[0] ;
-	for (; smc->hw.oem_id->oi_status != OI_STAT_LAST; smc->hw.oem_id++) {
-		if (smc->hw.oem_id->oi_status < smc->hw.oem_min_status)
-			continue ;
-#endif
-		ven_id = OEMID(smc,0) + (OEMID(smc,1) << 8) ; 
-		dev_id = OEMID(smc,2) + (OEMID(smc,3) << 8) ; 
-		for (i = 0; i < slot; i++) {
-			if (pci_find_device(i,&smc->hw.pci_handle,
-				dev_id,ven_id) != 0) {
-
-				found = FALSE ;
-			} else {
-				found = TRUE ;
-			}
-		}
-		if (found) {
-			return(1) ;	/* adapter was found */
-		}
-#ifdef MULT_OEM
-	}
-#endif
-	return(0) ;	/* adapter was not found */
-}
-#endif	/* PCI */
-#endif	/* USE_BIOS_FUNC */
-
 void driver_get_bia(struct s_smc *smc, struct fddi_addr *bia_addr)  {
 	int i ;
 
#2 lore raw
Quoted 4 lines · Abdelkarim Jamal

Vielen Dank Herr Seidel fuer Ihr Feedback.

Mit freundlichen Gruessen
Jamal

My pleasure! Just a small side note/question: On my first
mail i CCed Christoph Goos who is noted in skfddi.c to
be the maintainer,
but i finally received a failure notice containing
Remote host said: 550 5.2.1 <[email protected]>... Mailbox disabled for this recipient

So, are you Mr. Goos' successor and to be contacted on changes/suggestions for the skfp driver in the future?

Thanks,
Frank