summaryrefslogtreecommitdiffstats
path: root/sys/dev
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2001-01-23 22:18:07 +0000
committerjhb <jhb@FreeBSD.org>2001-01-23 22:18:07 +0000
commite01b490c7ece060fc1ea1e6d3da399bd9fbe1108 (patch)
tree06c5791c0390b7db7203695305fbca7fe08b37aa /sys/dev
parentf2a437953472eba0c50e52939c039f5c1088ccfe (diff)
downloadFreeBSD-src-e01b490c7ece060fc1ea1e6d3da399bd9fbe1108.zip
FreeBSD-src-e01b490c7ece060fc1ea1e6d3da399bd9fbe1108.tar.gz
- Move stg_card_intr()'s prototype and definition inside appropriate
#ifdef's as it is is only used on older versions of FreeBSD. - #ifdef a local variable only used on older versions of FreeBSD.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/stg/tmc18c30_pccard.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/sys/dev/stg/tmc18c30_pccard.c b/sys/dev/stg/tmc18c30_pccard.c
index 7d05a67..7798b48 100644
--- a/sys/dev/stg/tmc18c30_pccard.c
+++ b/sys/dev/stg/tmc18c30_pccard.c
@@ -92,10 +92,10 @@ extern struct stg_softc *stgdata[];
static int stgprobe(DEVPORT_PDEVICE devi);
static int stgattach(DEVPORT_PDEVICE devi);
-static int stg_card_intr __P((DEVPORT_PDEVICE));
static void stg_card_unload __P((DEVPORT_PDEVICE));
#if defined(__FreeBSD__) && __FreeBSD_version < 400001
static int stg_card_init __P((DEVPORT_PDEVICE));
+static int stg_card_intr __P((DEVPORT_PDEVICE));
#endif
#if defined(__FreeBSD__) && __FreeBSD_version >= 400001
@@ -301,6 +301,13 @@ stg_card_init(DEVPORT_PDEVICE devi)
return (0);
}
+
+static int
+stg_card_intr(DEVPORT_PDEVICE devi)
+{
+ stgintr(DEVPORT_PDEVGET_SOFTC(devi));
+ return 1;
+}
#endif
static void
@@ -314,13 +321,6 @@ stg_card_unload(DEVPORT_PDEVICE devi)
}
static int
-stg_card_intr(DEVPORT_PDEVICE devi)
-{
- stgintr(DEVPORT_PDEVGET_SOFTC(devi));
- return 1;
-}
-
-static int
stgprobe(DEVPORT_PDEVICE devi)
{
int rv;
@@ -341,7 +341,9 @@ stgprobe(DEVPORT_PDEVICE devi)
static int
stgattach(DEVPORT_PDEVICE devi)
{
+#if defined(__FreeBSD__) && __FreeBSD_version < 400001
int unit = DEVPORT_PDEVUNIT(devi);
+#endif
struct stg_softc *sc;
struct scsi_low_softc *slp;
u_int32_t flags = DEVPORT_PDEVFLAGS(devi);
OpenPOWER on IntegriCloud