From d147c94391cf5cc415970d2b885fcc931026c34e Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Sat, 28 Mar 2020 14:00:49 +0100 Subject: [PATCH] kernel: Remove from all files that don't need it (2/2). 98% of these were remains from porting from FreeBSD which could have been removed after converting to lockmgr(), etc. Due to an issue in my checking earlier, not everything was cleaned up correctly. --- sys/bus/u4b/controller/ohci.c | 1 - sys/bus/u4b/input/uep.c | 1 - sys/bus/u4b/input/uhid.c | 1 - sys/bus/u4b/net/if_cdce.c | 1 - sys/bus/u4b/net/if_udav.c | 1 - sys/bus/u4b/storage/ustorage_fs.c | 1 - sys/bus/u4b/usb_busdma.c | 1 - sys/bus/u4b/usb_dev.c | 1 - sys/bus/u4b/usb_device.c | 1 - sys/bus/u4b/usb_dynamic.c | 1 - sys/bus/u4b/usb_generic.c | 1 - sys/bus/u4b/usb_handle_request.c | 1 - sys/bus/u4b/usb_hub.c | 1 - sys/bus/u4b/usb_msctest.c | 1 - sys/bus/u4b/usb_process.c | 1 - sys/bus/u4b/usb_transfer.c | 1 - sys/bus/u4b/wlan/if_urtwn.c | 1 - sys/dev/misc/kbdmux/kbdmux.c | 1 - sys/dev/netif/ath/ath/if_ath.c | 1 - sys/dev/netif/ath/ath/if_ath_ahb.c | 1 - sys/dev/netif/ath/ath/if_ath_beacon.c | 1 - sys/dev/netif/ath/ath/if_ath_descdma.c | 1 - sys/dev/netif/ath/ath/if_ath_led.c | 1 - sys/dev/netif/ath/ath/if_ath_rx.c | 1 - sys/dev/netif/ath/ath/if_ath_rx_edma.c | 1 - sys/dev/netif/ath/ath/if_ath_tx.c | 1 - sys/dev/netif/ath/ath/if_ath_tx_edma.c | 1 - sys/dev/netif/ath/ath_rate/amrr/amrr.c | 1 - sys/dev/netif/ath/ath_rate/onoe/onoe.c | 1 - sys/dev/netif/ath/ath_rate/sample/sample.c | 1 - sys/dev/netif/bwn/bwn/if_bwn.c | 1 - sys/dev/netif/bwn/bwn/if_bwn_phy_g.c | 1 - sys/dev/netif/bwn/siba/siba_bwn.c | 1 - sys/dev/netif/iwi/if_iwi.c | 1 - sys/dev/netif/ral/rt2560.c | 1 - sys/dev/netif/ral/rt2661.c | 1 - sys/dev/netif/ral/rt2860.c | 1 - sys/dev/powermng/intpm/intpm.c | 1 - sys/dev/sound/midi/midi.c | 1 - sys/dev/sound/midi/mpu401.c | 1 - sys/dev/sound/midi/sequencer.c | 1 - sys/dev/virtual/virtio/balloon/virtio_balloon.c | 1 - sys/emulation/ndis/kern_ndis.c | 1 - sys/net/pf/pf_ioctl.c | 1 - sys/netgraph7/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c | 1 - sys/vfs/hammer2/hammer2_iocom.c | 2 -- 46 files changed, 47 deletions(-) diff --git a/sys/bus/u4b/controller/ohci.c b/sys/bus/u4b/controller/ohci.c index 4eb38af2a2..ef0df21331 100644 --- a/sys/bus/u4b/controller/ohci.c +++ b/sys/bus/u4b/controller/ohci.c @@ -42,7 +42,6 @@ #include #include #include -#include #include #include #include diff --git a/sys/bus/u4b/input/uep.c b/sys/bus/u4b/input/uep.c index 06f7e9f844..23adfd528b 100644 --- a/sys/bus/u4b/input/uep.c +++ b/sys/bus/u4b/input/uep.c @@ -37,7 +37,6 @@ #include #include #include -#include #include #include diff --git a/sys/bus/u4b/input/uhid.c b/sys/bus/u4b/input/uhid.c index 9997834f3f..6dbb2d62b9 100644 --- a/sys/bus/u4b/input/uhid.c +++ b/sys/bus/u4b/input/uhid.c @@ -55,7 +55,6 @@ #include #include #include -#include #include "usbdevs.h" #include diff --git a/sys/bus/u4b/net/if_cdce.c b/sys/bus/u4b/net/if_cdce.c index 8af13a1f44..acf6bc9aa2 100644 --- a/sys/bus/u4b/net/if_cdce.c +++ b/sys/bus/u4b/net/if_cdce.c @@ -56,7 +56,6 @@ #include #include #include -#include #include #include #include diff --git a/sys/bus/u4b/net/if_udav.c b/sys/bus/u4b/net/if_udav.c index 21153d511f..e1d43b72db 100644 --- a/sys/bus/u4b/net/if_udav.c +++ b/sys/bus/u4b/net/if_udav.c @@ -52,7 +52,6 @@ #include #include #include -#include #include #include #include diff --git a/sys/bus/u4b/storage/ustorage_fs.c b/sys/bus/u4b/storage/ustorage_fs.c index 46168c5c74..cb15f16458 100644 --- a/sys/bus/u4b/storage/ustorage_fs.c +++ b/sys/bus/u4b/storage/ustorage_fs.c @@ -45,7 +45,6 @@ #include #include #include -#include #include #include #include diff --git a/sys/bus/u4b/usb_busdma.c b/sys/bus/u4b/usb_busdma.c index 1eec76ef95..71d0c82f4d 100644 --- a/sys/bus/u4b/usb_busdma.c +++ b/sys/bus/u4b/usb_busdma.c @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include diff --git a/sys/bus/u4b/usb_dev.c b/sys/bus/u4b/usb_dev.c index 8efd3d506e..be0a4502b2 100644 --- a/sys/bus/u4b/usb_dev.c +++ b/sys/bus/u4b/usb_dev.c @@ -36,7 +36,6 @@ #include #include #include -#include #include #include #include diff --git a/sys/bus/u4b/usb_device.c b/sys/bus/u4b/usb_device.c index 036ddd806f..b5f96f3227 100644 --- a/sys/bus/u4b/usb_device.c +++ b/sys/bus/u4b/usb_device.c @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include diff --git a/sys/bus/u4b/usb_dynamic.c b/sys/bus/u4b/usb_dynamic.c index 5b6df6dc77..1c2959f1bb 100644 --- a/sys/bus/u4b/usb_dynamic.c +++ b/sys/bus/u4b/usb_dynamic.c @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include diff --git a/sys/bus/u4b/usb_generic.c b/sys/bus/u4b/usb_generic.c index 798b3f8749..299f769c23 100644 --- a/sys/bus/u4b/usb_generic.c +++ b/sys/bus/u4b/usb_generic.c @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include diff --git a/sys/bus/u4b/usb_handle_request.c b/sys/bus/u4b/usb_handle_request.c index 82180caee4..0b9fedbfc3 100644 --- a/sys/bus/u4b/usb_handle_request.c +++ b/sys/bus/u4b/usb_handle_request.c @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include diff --git a/sys/bus/u4b/usb_hub.c b/sys/bus/u4b/usb_hub.c index 89b7c4838b..804b3b1d84 100644 --- a/sys/bus/u4b/usb_hub.c +++ b/sys/bus/u4b/usb_hub.c @@ -39,7 +39,6 @@ #include #include #include -#include #include #include #include diff --git a/sys/bus/u4b/usb_msctest.c b/sys/bus/u4b/usb_msctest.c index 7bdc07667d..383a69b999 100644 --- a/sys/bus/u4b/usb_msctest.c +++ b/sys/bus/u4b/usb_msctest.c @@ -41,7 +41,6 @@ #include #include #include -#include #include #include #include diff --git a/sys/bus/u4b/usb_process.c b/sys/bus/u4b/usb_process.c index ba15e5fb30..7afdc40ec6 100644 --- a/sys/bus/u4b/usb_process.c +++ b/sys/bus/u4b/usb_process.c @@ -35,7 +35,6 @@ #include #include #include -#include #include #include #include diff --git a/sys/bus/u4b/usb_transfer.c b/sys/bus/u4b/usb_transfer.c index 3d4861b2c8..5a5d4fd90d 100644 --- a/sys/bus/u4b/usb_transfer.c +++ b/sys/bus/u4b/usb_transfer.c @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include diff --git a/sys/bus/u4b/wlan/if_urtwn.c b/sys/bus/u4b/wlan/if_urtwn.c index fd5580a2b4..244b2e3d1a 100644 --- a/sys/bus/u4b/wlan/if_urtwn.c +++ b/sys/bus/u4b/wlan/if_urtwn.c @@ -32,7 +32,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include diff --git a/sys/dev/misc/kbdmux/kbdmux.c b/sys/dev/misc/kbdmux/kbdmux.c index 29bfa0b393..e29be84a03 100644 --- a/sys/dev/misc/kbdmux/kbdmux.c +++ b/sys/dev/misc/kbdmux/kbdmux.c @@ -43,7 +43,6 @@ #include #include #include -#include #include #include #include diff --git a/sys/dev/netif/ath/ath/if_ath.c b/sys/dev/netif/ath/ath/if_ath.c index a46a10afe9..f9dcf979ec 100644 --- a/sys/dev/netif/ath/ath/if_ath.c +++ b/sys/dev/netif/ath/ath/if_ath.c @@ -59,7 +59,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include diff --git a/sys/dev/netif/ath/ath/if_ath_ahb.c b/sys/dev/netif/ath/ath/if_ath_ahb.c index 26e28bec12..276f5b916d 100644 --- a/sys/dev/netif/ath/ath/if_ath_ahb.c +++ b/sys/dev/netif/ath/ath/if_ath_ahb.c @@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #if defined(__DragonFly__) diff --git a/sys/dev/netif/ath/ath/if_ath_beacon.c b/sys/dev/netif/ath/ath/if_ath_beacon.c index 491aada20c..c96a6347d7 100644 --- a/sys/dev/netif/ath/ath/if_ath_beacon.c +++ b/sys/dev/netif/ath/ath/if_ath_beacon.c @@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include diff --git a/sys/dev/netif/ath/ath/if_ath_descdma.c b/sys/dev/netif/ath/ath/if_ath_descdma.c index c01468d0e5..05f9a074ac 100644 --- a/sys/dev/netif/ath/ath/if_ath_descdma.c +++ b/sys/dev/netif/ath/ath/if_ath_descdma.c @@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include diff --git a/sys/dev/netif/ath/ath/if_ath_led.c b/sys/dev/netif/ath/ath/if_ath_led.c index e616d4ac3f..4a4f7681af 100644 --- a/sys/dev/netif/ath/ath/if_ath_led.c +++ b/sys/dev/netif/ath/ath/if_ath_led.c @@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include diff --git a/sys/dev/netif/ath/ath/if_ath_rx.c b/sys/dev/netif/ath/ath/if_ath_rx.c index 3d16482271..6ed4089890 100644 --- a/sys/dev/netif/ath/ath/if_ath_rx.c +++ b/sys/dev/netif/ath/ath/if_ath_rx.c @@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include diff --git a/sys/dev/netif/ath/ath/if_ath_rx_edma.c b/sys/dev/netif/ath/ath/if_ath_rx_edma.c index 67401ba446..2e9b0c7f6e 100644 --- a/sys/dev/netif/ath/ath/if_ath_rx_edma.c +++ b/sys/dev/netif/ath/ath/if_ath_rx_edma.c @@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include diff --git a/sys/dev/netif/ath/ath/if_ath_tx.c b/sys/dev/netif/ath/ath/if_ath_tx.c index 049b99b27b..363aa45f93 100644 --- a/sys/dev/netif/ath/ath/if_ath_tx.c +++ b/sys/dev/netif/ath/ath/if_ath_tx.c @@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include diff --git a/sys/dev/netif/ath/ath/if_ath_tx_edma.c b/sys/dev/netif/ath/ath/if_ath_tx_edma.c index 4c5c259aae..a8c1eb4438 100644 --- a/sys/dev/netif/ath/ath/if_ath_tx_edma.c +++ b/sys/dev/netif/ath/ath/if_ath_tx_edma.c @@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include diff --git a/sys/dev/netif/ath/ath_rate/amrr/amrr.c b/sys/dev/netif/ath/ath_rate/amrr/amrr.c index 7a24227699..7a88704ae9 100644 --- a/sys/dev/netif/ath/ath_rate/amrr/amrr.c +++ b/sys/dev/netif/ath/ath_rate/amrr/amrr.c @@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #if defined(__DragonFly__) diff --git a/sys/dev/netif/ath/ath_rate/onoe/onoe.c b/sys/dev/netif/ath/ath_rate/onoe/onoe.c index ac68545250..1b9691d659 100644 --- a/sys/dev/netif/ath/ath_rate/onoe/onoe.c +++ b/sys/dev/netif/ath/ath_rate/onoe/onoe.c @@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #if defined(__DragonFly__) diff --git a/sys/dev/netif/ath/ath_rate/sample/sample.c b/sys/dev/netif/ath/ath_rate/sample/sample.c index 908b3a4c3b..4c3f1fd8cb 100644 --- a/sys/dev/netif/ath/ath_rate/sample/sample.c +++ b/sys/dev/netif/ath/ath_rate/sample/sample.c @@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #if defined(__DragonFly__) diff --git a/sys/dev/netif/bwn/bwn/if_bwn.c b/sys/dev/netif/bwn/bwn/if_bwn.c index b3f5bfdfaf..461ebc1186 100644 --- a/sys/dev/netif/bwn/bwn/if_bwn.c +++ b/sys/dev/netif/bwn/bwn/if_bwn.c @@ -45,7 +45,6 @@ #include #include #include -#include #if !defined(__DragonFly__) #include #include diff --git a/sys/dev/netif/bwn/bwn/if_bwn_phy_g.c b/sys/dev/netif/bwn/bwn/if_bwn_phy_g.c index 1356b9c829..367c15e3c9 100644 --- a/sys/dev/netif/bwn/bwn/if_bwn_phy_g.c +++ b/sys/dev/netif/bwn/bwn/if_bwn_phy_g.c @@ -42,7 +42,6 @@ #include #include #include -#include #if !defined(__DragonFly__) #include #include diff --git a/sys/dev/netif/bwn/siba/siba_bwn.c b/sys/dev/netif/bwn/siba/siba_bwn.c index 7210fa2991..c7710c91e5 100644 --- a/sys/dev/netif/bwn/siba/siba_bwn.c +++ b/sys/dev/netif/bwn/siba/siba_bwn.c @@ -44,7 +44,6 @@ __FBSDID("$FreeBSD: head/sys/dev/siba/siba_bwn.c 299409 2016-05-11 06:27:46Z adr #include #include #include -#include #include #if !defined(__DragonFly__) #include diff --git a/sys/dev/netif/iwi/if_iwi.c b/sys/dev/netif/iwi/if_iwi.c index 2f06a6860c..a45a5eb86e 100644 --- a/sys/dev/netif/iwi/if_iwi.c +++ b/sys/dev/netif/iwi/if_iwi.c @@ -43,7 +43,6 @@ #include #include #include -#include #include #include #include diff --git a/sys/dev/netif/ral/rt2560.c b/sys/dev/netif/ral/rt2560.c index b2612d7756..c72dd850a4 100644 --- a/sys/dev/netif/ral/rt2560.c +++ b/sys/dev/netif/ral/rt2560.c @@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include diff --git a/sys/dev/netif/ral/rt2661.c b/sys/dev/netif/ral/rt2661.c index e7b3f4e5a1..15de3bf643 100644 --- a/sys/dev/netif/ral/rt2661.c +++ b/sys/dev/netif/ral/rt2661.c @@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include diff --git a/sys/dev/netif/ral/rt2860.c b/sys/dev/netif/ral/rt2860.c index 72b0bf5274..4e16695a3f 100644 --- a/sys/dev/netif/ral/rt2860.c +++ b/sys/dev/netif/ral/rt2860.c @@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include diff --git a/sys/dev/powermng/intpm/intpm.c b/sys/dev/powermng/intpm/intpm.c index c3b376b5fa..d246bceb4d 100644 --- a/sys/dev/powermng/intpm/intpm.c +++ b/sys/dev/powermng/intpm/intpm.c @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c index 63f41e33da..d49f8848bb 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -41,7 +41,6 @@ __FBSDID("$FreeBSD: head/sys/dev/sound/midi/midi.c 227309 2011-11-07 15:43:11Z e #include #include #include -#include #include #include #include diff --git a/sys/dev/sound/midi/mpu401.c b/sys/dev/sound/midi/mpu401.c index eaf5e3b717..2628bf0438 100644 --- a/sys/dev/sound/midi/mpu401.c +++ b/sys/dev/sound/midi/mpu401.c @@ -32,7 +32,6 @@ __FBSDID("$FreeBSD: head/sys/dev/sound/midi/mpu401.c 193979 2009-06-11 09:06:09Z #include #include #include -#include #include #include #include diff --git a/sys/dev/sound/midi/sequencer.c b/sys/dev/sound/midi/sequencer.c index 30ecdcdb75..fd4b1054ad 100644 --- a/sys/dev/sound/midi/sequencer.c +++ b/sys/dev/sound/midi/sequencer.c @@ -57,7 +57,6 @@ __FBSDID("$FreeBSD: head/sys/dev/sound/midi/sequencer.c 274035 2014-11-03 11:11: #include #include #include -#include #include #include #include diff --git a/sys/dev/virtual/virtio/balloon/virtio_balloon.c b/sys/dev/virtual/virtio/balloon/virtio_balloon.c index e364e94024..80c1b326b3 100644 --- a/sys/dev/virtual/virtio/balloon/virtio_balloon.c +++ b/sys/dev/virtual/virtio/balloon/virtio_balloon.c @@ -75,7 +75,6 @@ #include #include #include -#include #include #include diff --git a/sys/emulation/ndis/kern_ndis.c b/sys/emulation/ndis/kern_ndis.c index 681d459051..6cbba4f216 100644 --- a/sys/emulation/ndis/kern_ndis.c +++ b/sys/emulation/ndis/kern_ndis.c @@ -44,7 +44,6 @@ #include #include #include -#include #include #include diff --git a/sys/net/pf/pf_ioctl.c b/sys/net/pf/pf_ioctl.c index 41ec1e53a5..77a6fe0cc4 100644 --- a/sys/net/pf/pf_ioctl.c +++ b/sys/net/pf/pf_ioctl.c @@ -88,7 +88,6 @@ #include #include -#include u_int rt_numfibs = RT_NUMFIBS; diff --git a/sys/netgraph7/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c b/sys/netgraph7/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c index 46ba3e678e..af801c80d2 100644 --- a/sys/netgraph7/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c +++ b/sys/netgraph7/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c @@ -40,7 +40,6 @@ #include #include #include -#include #include #include #include diff --git a/sys/vfs/hammer2/hammer2_iocom.c b/sys/vfs/hammer2/hammer2_iocom.c index 0d0bcb6954..f120c2d321 100644 --- a/sys/vfs/hammer2/hammer2_iocom.c +++ b/sys/vfs/hammer2/hammer2_iocom.c @@ -52,8 +52,6 @@ #include #include -#include - #include "hammer2.h" #include "hammer2_disk.h" #include "hammer2_mount.h" -- 2.11.4.GIT