소스 검색

This is the only driver that has a genuine reason to call

find_pci_device() directly.
tags/v0.9.3
Michael Brown 19 년 전
부모
커밋
cbd5d4f849
1개의 변경된 파일3개의 추가작업 그리고 8개의 파일을 삭제
  1. 3
    8
      src/drivers/net/sis900.c

+ 3
- 8
src/drivers/net/sis900.c 파일 보기

53
 /* Globals */
53
 /* Globals */
54
 
54
 
55
 static struct nic_operations sis900_operations;
55
 static struct nic_operations sis900_operations;
56
-static struct pci_driver sis900_driver;
57
 
56
 
58
 static int sis900_debug = 0;
57
 static int sis900_debug = 0;
59
 
58
 
128
 
127
 
129
 /* Function Prototypes */
128
 /* Function Prototypes */
130
 
129
 
131
-static int sis900_probe(struct dev *dev);
130
+static int sis900_probe(struct dev *dev,struct pci_device *pci);
132
 
131
 
133
 static u16  sis900_read_eeprom(int location);
132
 static u16  sis900_read_eeprom(int location);
134
 static void sis900_mdio_reset(long mdio_addr);
133
 static void sis900_mdio_reset(long mdio_addr);
310
  * Returns:   struct nic *:          pointer to NIC data structure
309
  * Returns:   struct nic *:          pointer to NIC data structure
311
  */
310
  */
312
 
311
 
313
-static int sis900_probe ( struct dev *dev ) {
312
+static int sis900_probe ( struct dev *dev, struct pci_device *pci ) {
314
     struct nic *nic = nic_device ( dev );
313
     struct nic *nic = nic_device ( dev );
315
-    struct pci_device *pci = pci_device ( dev );
316
     int i;
314
     int i;
317
     int found=0;
315
     int found=0;
318
     int phy_addr;
316
     int phy_addr;
319
     u8 revision;
317
     u8 revision;
320
     int ret;
318
     int ret;
321
 
319
 
322
-    if ( ! find_pci_device ( pci, &sis900_driver ) )
323
-	return 0;
324
-
325
     if (pci->ioaddr == 0)
320
     if (pci->ioaddr == 0)
326
         return 0;
321
         return 0;
327
 
322
 
1265
 static struct pci_driver sis900_driver =
1260
 static struct pci_driver sis900_driver =
1266
 	PCI_DRIVER ( "SIS900", sis900_nics, PCI_NO_CLASS );
1261
 	PCI_DRIVER ( "SIS900", sis900_nics, PCI_NO_CLASS );
1267
 
1262
 
1268
-BOOT_DRIVER ( "SIS900", sis900_probe );
1263
+BOOT_DRIVER ( "SIS900", find_pci_boot_device, sis900_driver, sis900_probe );

Loading…
취소
저장