Remove conditionals based on #if defined(i386) which wrapped code which was

unused.  Gcc does not define 'i386' anyway, it uses __i386__.

This also fixes some clang issues.

Requested-by: Alex Hornung

diff --git a/sys/dev/disk/ncv/ncr53c500var.h b/sys/dev/disk/ncv/ncr53c500var.h
index 0ab8a04..958e610 100644 (file)
--- a/sys/dev/disk/ncv/ncr53c500var.h
+++ b/sys/dev/disk/ncv/ncr53c500var.h
@@ -96,9 +96,6 @@ void ncvattachsubr (struct ncv_softc *);
 int ncvprint (void *, const char *);
 int ncvintr (void *);
 
-#if    defined(i386)
-#define        SOFT_INTR_REQUIRED(slp) (softintr((slp)->sl_irq))
-#else  /* !i386 */
 #define        SOFT_INTR_REQUIRED(slp)
-#endif /* !i386 */
+
 #endif /* !_NCR53C500VAR_H_ */

diff --git a/sys/dev/disk/nsp/nspvar.h b/sys/dev/disk/nsp/nspvar.h
index 67d9b8e..4ddb98b 100644 (file)
--- a/sys/dev/disk/nsp/nspvar.h
+++ b/sys/dev/disk/nsp/nspvar.h
@@ -106,9 +106,6 @@ void nspattachsubr (struct nsp_softc *);
 int nspprint (void *, const char *);
 int nspintr (void *);
 
-#if    defined(i386)
-#define        SOFT_INTR_REQUIRED(slp) (softintr((slp)->sl_irq))
-#else  /* !i386 */
 #define        SOFT_INTR_REQUIRED(slp)
-#endif /* !i386 */
+
 #endif /* !_NSPVAR_H_ */

diff --git a/sys/dev/disk/stg/tmc18c30var.h b/sys/dev/disk/stg/tmc18c30var.h
index 037cc52..7ec3a36 100644 (file)
--- a/sys/dev/disk/stg/tmc18c30var.h
+++ b/sys/dev/disk/stg/tmc18c30var.h
@@ -104,9 +104,6 @@ void stgattachsubr (struct stg_softc *);
 int stgprint (void *, const char *);
 int stgintr (void *);
 
-#if    defined(i386)
-#define        SOFT_INTR_REQUIRED(slp) (softintr((slp)->sl_irq))
-#else  /* !i386 */
 #define        SOFT_INTR_REQUIRED(slp)
-#endif /* !i386 */
+
 #endif /* !_TMC18C30VAR_H_ */