Hi!
Here are small cleanups for pcnet32 driver. It touches no code. Please
apply at least for 2.5.
[Version was wrong, DO_DXSUFLO was unneccessarily ugly, and
pcnet32_probe_vlbus was dead code.]
Pavel
--- clean.2.4//drivers/net/pcnet32.c Thu Feb 28 11:18:16 2002
+++ linux-swsusp.24/drivers/net/pcnet32.c Mon Mar 4 23:30:04 2002
@@ -22,8 +22,8 @@
*************************************************************************/
#define DRV_NAME "pcnet32"
-#define DRV_VERSION "1.25kf"
-#define DRV_RELDATE "17.11.2001"
+#define DRV_VERSION "1.27"
+#define DRV_RELDATE "4.3.2002"
static const char *version =
DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " tsbogend@alpha.franken.de\n";
@@ -186,7 +186,8 @@
* v1.25kf Added No Interrupt on successful Tx for some Tx's <kaf@fc.hp.com>
* v1.26 Converted to pci_alloc_consistent, Jamey Hicks / George France
* <jamey@crl.dec.com>
- * v1.26p Fix oops on rmmod+insmod; plug i/o resource leak - Paul Gortmaker
+ * v1.26p Fix oops on rmmod+insmod; plug i/o resource leak - Paul Gortmaker
+ * v1.27 Small cleanups - Pavel Machek <pavel@ucw.cz>
*/
@@ -290,16 +291,13 @@
char tx_full;
int options;
int shared_irq:1, /* shared irq possible */
- ltint:1,
-#ifdef DO_DXSUFLO
- dxsuflo:1, /* disable transmit stop on uflo */
-#endif
- mii:1; /* mii port available */
+ ltint:1,
+ dxsuflo:1, /* disable transmit stop on uflo */
+ mii:1; /* mii port available */
struct net_device *next;
struct mii_if_info mii_if;
};
-static int pcnet32_probe_vlbus(int cards_found);
static int pcnet32_probe_pci(struct pci_dev *, const struct pci_device_id *);
static int pcnet32_probe1(unsigned long, unsigned char, int, int, struct pci_dev *);
static int pcnet32_open(struct net_device *);
@@ -438,47 +436,8 @@
pcnet32_dwio_read_rap,
pcnet32_dwio_write_rap,
pcnet32_dwio_reset
-
};
-
-
-/* only probes for non-PCI devices, the rest are handled by pci_register_driver via pcnet32_probe_pci*/
-static int __init pcnet32_probe_vlbus(int cards_found)
-{
- unsigned long ioaddr = 0; // FIXME dev ? dev->base_addr: 0;
- unsigned int irq_line = 0; // FIXME dev ? dev->irq : 0;
- int *port;
-
- printk(KERN_INFO "pcnet32_probe_vlbus: cards_found=%d\n", cards_found);
-#ifndef __powerpc__
- if (ioaddr > 0x1ff) {
- if (check_region(ioaddr, PCNET32_TOTAL_SIZE) == 0)
- return pcnet32_probe1(ioaddr, irq_line, 0, 0, NULL);
- else
- return -ENODEV;
- } else
-#endif
- if (ioaddr != 0)
- return -ENXIO;
-
- /* now look for PCnet32 VLB cards */
- for (port = pcnet32_portlist; *port; port++) {
- unsigned long ioaddr = *port;
-
- if ( check_region(ioaddr, PCNET32_TOTAL_SIZE) == 0) {
- /* check if there is really a pcnet chip on that ioaddr */
- if ((inb(ioaddr + 14) == 0x57) &&
- (inb(ioaddr + 15) == 0x57) &&
- (pcnet32_probe1(ioaddr, 0, 0, 0, NULL) == 0))
- cards_found++;
- }
- }
- return cards_found ? 0: -ENODEV;
-}
-
-
-
static int __devinit
pcnet32_probe_pci(struct pci_dev *pdev, const struct pci_device_id *ent)
{
@@ -521,9 +480,7 @@
struct resource *res;
dma_addr_t lp_dma_addr;
int i,media,fdx = 0, mii = 0, fset = 0;
-#ifdef DO_DXSUFLO
int dxsuflo = 0;
-#endif
int ltint = 0;
int chip_version;
char *chipname;
@@ -589,12 +546,6 @@
*/
/* switch to home wiring mode */
media = a->read_bcr (ioaddr, 49);
-#if 0
- if (pcnet32_debug > 2)
- printk(KERN_DEBUG "pcnet32: pcnet32 media value %#x.\n", media);
- media &= ~3;
- media |= 1;
-#endif
if (pcnet32_debug > 2)
printk(KERN_DEBUG "pcnet32: pcnet32 media reset to %#x.\n", media);
a->write_bcr (ioaddr, 49, media);
@@ -719,9 +670,7 @@
lp->name = chipname;
lp->shared_irq = shared;
lp->mii_if.full_duplex = fdx;
-#ifdef DO_DXSUFLO
lp->dxsuflo = dxsuflo;
-#endif
lp->ltint = ltint;
lp->mii = mii;
if (options[card_idx] > sizeof (options_mapping))
@@ -1179,19 +1128,12 @@
if (err_status & 0x04000000) lp->stats.tx_aborted_errors++;
if (err_status & 0x08000000) lp->stats.tx_carrier_errors++;
if (err_status & 0x10000000) lp->stats.tx_window_errors++;
-#ifndef DO_DXSUFLO
if (err_status & 0x40000000) {
lp->stats.tx_fifo_errors++;
- /* Ackk! On FIFO errors the Tx unit is turned off! */
- /* Remove this verbosity later! */
- printk(KERN_ERR "%s: Tx FIFO error! CSR0=%4.4x\n",
- dev->name, csr0);
- must_restart = 1;
- }
-#else
- if (err_status & 0x40000000) {
- lp->stats.tx_fifo_errors++;
- if (! lp->dxsuflo) { /* If controller doesn't recover ... */
+#ifdef DO_DXSUFLO
+ if (! lp->dxsuflo)
+#endif
+ { /* If controller doesn't recover ... */
/* Ackk! On FIFO errors the Tx unit is turned off! */
/* Remove this verbosity later! */
printk(KERN_ERR "%s: Tx FIFO error! CSR0=%4.4x\n",
@@ -1199,7 +1141,6 @@
must_restart = 1;
}
}
-#endif
} else {
if (status & 0x1800)
lp->stats.collisions++;
@@ -1688,36 +1633,19 @@
static int __init pcnet32_init_module(void)
{
- int cards_found = 0;
- int err;
+ int cards_found = 0;
+ int err;
- if (debug > 0)
- pcnet32_debug = debug;
- if ((tx_start_pt >= 0) && (tx_start_pt <= 3))
- tx_start = tx_start_pt;
-
- pcnet32_dev = NULL;
- /* find the PCI devices */
-#define USE_PCI_REGISTER_DRIVER
-#ifdef USE_PCI_REGISTER_DRIVER
- if ((err = pci_module_init(&pcnet32_driver)) < 0 )
- return err;
-#else
- {
- struct pci_device_id *devid = pcnet32_pci_tbl;
- for (devid = pcnet32_pci_tbl; devid != NULL && devid->vendor != 0; devid++) {
- struct pci_dev *pdev = pci_find_subsys(devid->vendor, devid->device, devid->subvendor, devid->subdevice, NULL);
- if (pdev != NULL) {
- if (pcnet32_probe_pci(pdev, devid) >= 0) {
- cards_found++;
- }
- }
- }
- }
-#endif
- return 0;
- /* find any remaining VLbus devices */
- return pcnet32_probe_vlbus(cards_found);
+ if (debug > 0)
+ pcnet32_debug = debug;
+ if ((tx_start_pt >= 0) && (tx_start_pt <= 3))
+ tx_start = tx_start_pt;
+
+ pcnet32_dev = NULL;
+ /* find the PCI devices */
+ if ((err = pci_module_init(&pcnet32_driver)) < 0 )
+ return err;
+ return 0;
}
static void __exit pcnet32_cleanup_module(void)
--
(about SSSCA) "I don't say this lightly. However, I really think that the U.S.
no longer is classifiable as a democracy, but rather as a plutocracy." --hpa
-
: send the line "unsubscribe linux-net" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
