mirror of
https://github.com/opnsense/src.git
synced 2026-05-28 04:12:45 -04:00
Remove #if NFOO > 0 (it's not required in most cases) and also where it
isn't used as a result, remove #include "foo.h". Many of these drivers still use NFOO for softc struct sizing etc however.
This commit is contained in:
parent
db8ba2ef83
commit
e27c1addaa
14 changed files with 0 additions and 61 deletions
|
|
@ -35,7 +35,6 @@
|
|||
|
||||
#include "rc.h"
|
||||
|
||||
#if NRC > 0
|
||||
/*#define RCDEBUG*/
|
||||
|
||||
#include <sys/param.h>
|
||||
|
|
@ -1452,5 +1451,3 @@ rc_wait0(nec, unit, chan, line)
|
|||
printf("rc%d/%d: channel command timeout, rc.c line: %d\n",
|
||||
unit, chan, line);
|
||||
}
|
||||
|
||||
#endif /* NRC */
|
||||
|
|
|
|||
|
|
@ -48,7 +48,6 @@
|
|||
#define SCD_DEBUG 0
|
||||
|
||||
#include "scd.h"
|
||||
#if NSCD > 0
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/conf.h>
|
||||
|
|
@ -1551,5 +1550,3 @@ scd_toc_entry (int unit, struct ioc_read_toc_single_entry *te)
|
|||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#endif /* NSCD > 0 */
|
||||
|
|
|
|||
|
|
@ -7,10 +7,6 @@
|
|||
* $FreeBSD$
|
||||
*/
|
||||
|
||||
#include "speaker.h"
|
||||
|
||||
#if NSPEAKER > 0
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/kernel.h>
|
||||
|
|
@ -597,5 +593,4 @@ spkr_drvinit(void *unused)
|
|||
SYSINIT(spkrdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,spkr_drvinit,NULL)
|
||||
|
||||
|
||||
#endif /* NSPEAKER > 0 */
|
||||
/* spkr.c ends here */
|
||||
|
|
|
|||
|
|
@ -35,7 +35,6 @@
|
|||
|
||||
#include "rc.h"
|
||||
|
||||
#if NRC > 0
|
||||
/*#define RCDEBUG*/
|
||||
|
||||
#include <sys/param.h>
|
||||
|
|
@ -1452,5 +1451,3 @@ rc_wait0(nec, unit, chan, line)
|
|||
printf("rc%d/%d: channel command timeout, rc.c line: %d\n",
|
||||
unit, chan, line);
|
||||
}
|
||||
|
||||
#endif /* NRC */
|
||||
|
|
|
|||
|
|
@ -48,7 +48,6 @@
|
|||
#define SCD_DEBUG 0
|
||||
|
||||
#include "scd.h"
|
||||
#if NSCD > 0
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/conf.h>
|
||||
|
|
@ -1551,5 +1550,3 @@ scd_toc_entry (int unit, struct ioc_read_toc_single_entry *te)
|
|||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#endif /* NSCD > 0 */
|
||||
|
|
|
|||
|
|
@ -7,10 +7,6 @@
|
|||
* $FreeBSD$
|
||||
*/
|
||||
|
||||
#include "speaker.h"
|
||||
|
||||
#if NSPEAKER > 0
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/kernel.h>
|
||||
|
|
@ -597,5 +593,4 @@ spkr_drvinit(void *unused)
|
|||
SYSINIT(spkrdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,spkr_drvinit,NULL)
|
||||
|
||||
|
||||
#endif /* NSPEAKER > 0 */
|
||||
/* spkr.c ends here */
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@
|
|||
*/
|
||||
|
||||
#include "tw.h"
|
||||
#if NTW > 0
|
||||
|
||||
/*
|
||||
* Driver configuration parameters
|
||||
|
|
@ -1153,5 +1152,3 @@ static int twchecktime(int target, int tol)
|
|||
}
|
||||
}
|
||||
#endif /* HIRESTIME */
|
||||
|
||||
#endif /* NTW */
|
||||
|
|
|
|||
|
|
@ -28,11 +28,6 @@
|
|||
* $FreeBSD$
|
||||
*/
|
||||
|
||||
#include "wdc.h"
|
||||
#include "wcd.h"
|
||||
|
||||
#if NWCD > 0 && NWDC > 0
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/kernel.h>
|
||||
|
|
@ -1482,4 +1477,3 @@ acd_drvinit(void *unused)
|
|||
}
|
||||
|
||||
SYSINIT(acddev, SI_SUB_DRIVERS, SI_ORDER_MIDDLE + CDEV_MAJOR, acd_drvinit, NULL)
|
||||
#endif /* NWCD && NWDC */
|
||||
|
|
|
|||
|
|
@ -31,9 +31,6 @@
|
|||
*/
|
||||
|
||||
#include "wdc.h"
|
||||
#include "wfd.h"
|
||||
|
||||
#if NWFD > 0 && NWDC > 0
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
|
@ -728,5 +725,3 @@ static void wfd_drvinit(void *unused)
|
|||
}
|
||||
|
||||
SYSINIT(wfddev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,wfd_drvinit,NULL)
|
||||
|
||||
#endif /* NWFD && NWDC */
|
||||
|
|
|
|||
|
|
@ -29,11 +29,8 @@
|
|||
*/
|
||||
|
||||
#include "wdc.h"
|
||||
#include "wst.h"
|
||||
#include "opt_ddb.h"
|
||||
|
||||
#if NWST > 0 && NWDC > 0
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/kernel.h>
|
||||
|
|
@ -775,5 +772,3 @@ wst_drvinit(void *unused)
|
|||
}
|
||||
|
||||
SYSINIT(wstdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,wst_drvinit,NULL)
|
||||
|
||||
#endif /* NWST && NWDC */
|
||||
|
|
|
|||
|
|
@ -58,8 +58,6 @@
|
|||
*/
|
||||
|
||||
#include "wt.h"
|
||||
#if NWT > 0
|
||||
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
|
@ -978,5 +976,3 @@ wtstatus (wtinfo_t *t)
|
|||
splx(x);
|
||||
return (1);
|
||||
}
|
||||
|
||||
#endif /* NWT */
|
||||
|
|
|
|||
|
|
@ -28,11 +28,6 @@
|
|||
* $FreeBSD$
|
||||
*/
|
||||
|
||||
#include "wdc.h"
|
||||
#include "wcd.h"
|
||||
|
||||
#if NWCD > 0 && NWDC > 0
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/kernel.h>
|
||||
|
|
@ -1482,4 +1477,3 @@ acd_drvinit(void *unused)
|
|||
}
|
||||
|
||||
SYSINIT(acddev, SI_SUB_DRIVERS, SI_ORDER_MIDDLE + CDEV_MAJOR, acd_drvinit, NULL)
|
||||
#endif /* NWCD && NWDC */
|
||||
|
|
|
|||
|
|
@ -31,9 +31,6 @@
|
|||
*/
|
||||
|
||||
#include "wdc.h"
|
||||
#include "wfd.h"
|
||||
|
||||
#if NWFD > 0 && NWDC > 0
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
|
@ -728,5 +725,3 @@ static void wfd_drvinit(void *unused)
|
|||
}
|
||||
|
||||
SYSINIT(wfddev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,wfd_drvinit,NULL)
|
||||
|
||||
#endif /* NWFD && NWDC */
|
||||
|
|
|
|||
|
|
@ -29,11 +29,8 @@
|
|||
*/
|
||||
|
||||
#include "wdc.h"
|
||||
#include "wst.h"
|
||||
#include "opt_ddb.h"
|
||||
|
||||
#if NWST > 0 && NWDC > 0
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/kernel.h>
|
||||
|
|
@ -775,5 +772,3 @@ wst_drvinit(void *unused)
|
|||
}
|
||||
|
||||
SYSINIT(wstdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,wst_drvinit,NULL)
|
||||
|
||||
#endif /* NWST && NWDC */
|
||||
|
|
|
|||
Loading…
Reference in a new issue