diff options
| author | imp <imp@FreeBSD.org> | 2008-06-06 05:25:24 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2008-06-06 05:25:24 +0000 |
| commit | 65134490dcc1e3fd448e367e4b961bbe06d063b5 (patch) | |
| tree | f1b0213eb74cd220989bbefa87c4269450dfa070 /sys/dev/cs/if_cs_isa.c | |
| parent | dd14f4af05e3464783370bc5d4728e4c0c3fb6dd (diff) | |
| download | FreeBSD-src-65134490dcc1e3fd448e367e4b961bbe06d063b5.zip FreeBSD-src-65134490dcc1e3fd448e367e4b961bbe06d063b5.tar.gz | |
Minor clean up to shave about 1.5k off the size of the driver:
o remove unused fields from softc and args from cs_alloc_irq
o remove some commented code that will never be implemented.
o Don't try to send a packet and see if it worked. We don't
need this anymore, and it doesn't add any value.
o tweaks for BNC and AUI.
o limit possible time hung in the kernel to 4s rather than 40s.
Diffstat (limited to 'sys/dev/cs/if_cs_isa.c')
| -rw-r--r-- | sys/dev/cs/if_cs_isa.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sys/dev/cs/if_cs_isa.c b/sys/dev/cs/if_cs_isa.c index 780afd8..b08c1a2 100644 --- a/sys/dev/cs/if_cs_isa.c +++ b/sys/dev/cs/if_cs_isa.c @@ -48,8 +48,8 @@ __FBSDID("$FreeBSD$"); #include <dev/cs/if_csvar.h> #include <dev/cs/if_csreg.h> -static int cs_isa_probe (device_t); -static int cs_isa_attach (device_t); +static int cs_isa_probe(device_t); +static int cs_isa_attach(device_t); static struct isa_pnp_id cs_ids[] = { { 0x4060630e, NULL }, /* CSC6040 */ @@ -72,11 +72,9 @@ cs_isa_probe(device_t dev) if (error == ENXIO) goto end; - /* If we had some other problem. */ - if (!(error == 0 || error == ENOENT)) - goto end; - - error = cs_cs89x0_probe(dev); + /* If we've matched, or there's no PNP ID, probe chip */ + if (error == 0 || error == ENOENT) + error = cs_cs89x0_probe(dev); end: /* Make sure IRQ is assigned for probe message and available */ if (error == 0) |
