Automatically updated with the program

#!/usr/bin/perl -w -pi -0777

use strict;

( my $type ) = /find_(\w+?)_boot_device/ or die "Could not find type\n";

( my $disable ) = /\.disable\s*=\s*(\w+)/ or die "Could not locate disable\n";

s/(${disable}\s*\(\s*struct\s+nic\s+\*nic)(\s*\)\s*\{)(\s*)/${1}, struct ${type}_device \*${type} __unused${2}${3}nic_disable ( nic );${3}/s;

s/(${disable}\s*\(\s*struct\s+nic\s+\*nic)(\s*\)\s*;)/${1}, struct ${type}_device \*${type}${2}/g;

s/^\s*.disable\s*=\s*${disable}\s*,\s*?$//m;

s/(_probe\s*\(\s*)struct\s+dev\s+\*dev/${1}struct nic \*nic/g;

s/^\s*struct\s+nic\s+\*nic\s*=\s*nic_device\s*\(\s*dev\s*\)\s*;\s*?$//m;

s/^(\s*)(nic->(ioaddr|irqno)\s*=\s*${type})/${1}${type}_fill_nic ( nic, ${type} );\n${1}${2}/m;

1 files changed, 7 insertions, 5 deletions

diff --git a/src/drivers/net/r8169.c b/src/drivers/net/r8169.c
index 2ede1976..653489b5 100644
--- a/src/drivers/net/r8169.c
+++ b/src/drivers/net/r8169.c
@@ -707,7 +707,7 @@ static struct nic_operations r8169_operations = {
 	.poll		= r8169_poll,
 	.transmit	= r8169_transmit,
 	.irq		= r8169_irq,
-	.disable	= r8169_disable,
+
 };
 
 static struct pci_id r8169_nics[] = {
@@ -715,7 +715,7 @@ static struct pci_id r8169_nics[] = {
 };
 
 static struct pci_driver r8169_driver =
-	PCI_DRIVER ( "r8169/PCI", r8169_nics, PCI_NO_CLASS );
+	PCI_DRIVER ( r8169_nics, PCI_NO_CLASS );
 
 /**************************************************************************
 PROBE - Look for an adapter, this routine's visible to the outside
@@ -723,8 +723,8 @@ PROBE - Look for an adapter, this routine's visible to the outside
 
 #define board_found 1
 #define valid_link 0
-static int r8169_probe ( struct dev *dev, struct pci_device *pci ) {
-	struct nic *nic = nic_device ( dev );
+static int r8169_probe ( struct nic *nic, struct pci_device *pci ) {
+
 	static int board_idx = -1;
 	static int printed_version = 0;
 	int i, rc;
@@ -844,10 +844,12 @@ static int r8169_probe ( struct dev *dev, struct pci_device *pci ) {
 	r8169_reset(nic);
 	/* point to NIC specific routines */
 	nic->nic_op	= &r8169_operations;
+	pci_fill_nic ( nic, pci );
 	nic->irqno = pci->irq;
 	nic->ioaddr = ioaddr;
 	return 1;
 
 }
 
-BOOT_DRIVER ( "r8169/PCI", find_pci_boot_device, r8169_driver, r8169_probe );
+DRIVER ( "r8169/PCI", nic_driver, pci_driver, r8169_driver,
+	 r8169_probe, r8169_disable );