Skip to contentSkip to conversation

USB: serial: clean up include directives

PATCH In review Johan Hovold 2 participants 10 messages May 11

Subsystems (2)
lore
Share & tools
lore

Johan Hovold

author maintainer
#0 lore raw

cover USB: serial: clean up include directives

Include directives tend to be copied from existing drivers when new drivers are written. Clean up the driver include directives to avoid having to point out unnecessary includes when reviewing new drivers.

Johan

Johan Hovold (8):
USB: serial: drop unused tty_driver includes
USB: serial: drop unused tty_flip includes
USB: serial: xr: add missing uaccess include
USB: serial: drop unused uaccess includes
USB: serial: drop unused moduleparam includes
USB: serial: garmin_gps: drop unused atomic include
USB: serial: add missing atomic includes
USB: serial: whiteheat: drop termbits include

 drivers/usb/serial/ark3116.c          | 1 -
 drivers/usb/serial/belkin_sa.c        | 2 --
 drivers/usb/serial/cyberjack.c        | 2 --
 drivers/usb/serial/cypress_m8.c       | 2 --
 drivers/usb/serial/digi_acceleport.c  | 2 --
 drivers/usb/serial/empeg.c            | 3 ---
 drivers/usb/serial/f81232.c           | 3 ---
 drivers/usb/serial/f81534.c           | 1 -
 drivers/usb/serial/ftdi_sio.c         | 1 -
 drivers/usb/serial/garmin_gps.c       | 3 ---
 drivers/usb/serial/generic.c          | 1 -
 drivers/usb/serial/io_edgeport.c      | 2 +-
 drivers/usb/serial/io_ti.c            | 2 --
 drivers/usb/serial/ipaq.c             | 3 ---
 drivers/usb/serial/ipw.c              | 2 --
 drivers/usb/serial/ir-usb.c           | 2 --
 drivers/usb/serial/iuu_phoenix.c      | 2 --
 drivers/usb/serial/keyspan.c          | 2 --
 drivers/usb/serial/keyspan_pda.c      | 2 --
 drivers/usb/serial/kl5kusb105.c       | 2 --
 drivers/usb/serial/kobil_sct.c        | 2 --
 drivers/usb/serial/mct_u232.c         | 2 --
 drivers/usb/serial/metro-usb.c        | 3 ---
 drivers/usb/serial/mos7720.c          | 3 ++-
 drivers/usb/serial/mos7840.c          | 1 -
 drivers/usb/serial/mxuport.c          | 2 --
 drivers/usb/serial/omninet.c          | 2 --
 drivers/usb/serial/opticon.c          | 2 --
 drivers/usb/serial/option.c           | 1 -
 drivers/usb/serial/oti6858.c          | 3 ---
 drivers/usb/serial/pl2303.c           | 3 ---
 drivers/usb/serial/qcserial.c         | 1 -
 drivers/usb/serial/quatech2.c         | 2 --
 drivers/usb/serial/safe_serial.c      | 2 --
 drivers/usb/serial/spcp8x5.c          | 2 --
 drivers/usb/serial/ssu100.c           | 2 --
 drivers/usb/serial/symbolserial.c     | 2 --
 drivers/usb/serial/ti_usb_3410_5052.c | 2 --
 drivers/usb/serial/usb-serial.c       | 3 ---
 drivers/usb/serial/usb_wwan.c         | 1 -
 drivers/usb/serial/visor.c            | 4 ----
 drivers/usb/serial/whiteheat.c        | 4 ----
 drivers/usb/serial/wishbone-serial.c  | 1 -
 drivers/usb/serial/xr_serial.c        | 1 +
 drivers/usb/serial/xsens_mt.c         | 1 -
 45 files changed, 4 insertions(+), 88 deletions(-)
Signature · 1 line
2.53.0
author maintainer
#1 lore raw

PATCH 1/8 USB: serial: drop unused tty_driver includes

USB serial drivers do not use anything from tty_driver.h directly (only core does) so drop the unnecessary include directives.

---
 drivers/usb/serial/belkin_sa.c        | 1 -
 drivers/usb/serial/cyberjack.c        | 1 -
 drivers/usb/serial/cypress_m8.c       | 1 -
 drivers/usb/serial/digi_acceleport.c  | 1 -
 drivers/usb/serial/empeg.c            | 1 -
 drivers/usb/serial/f81232.c           | 1 -
 drivers/usb/serial/ftdi_sio.c         | 1 -
 drivers/usb/serial/garmin_gps.c       | 1 -
 drivers/usb/serial/io_edgeport.c      | 1 -
 drivers/usb/serial/io_ti.c            | 1 -
 drivers/usb/serial/ipaq.c             | 1 -
 drivers/usb/serial/ir-usb.c           | 1 -
 drivers/usb/serial/iuu_phoenix.c      | 1 -
 drivers/usb/serial/keyspan.c          | 1 -
 drivers/usb/serial/keyspan_pda.c      | 1 -
 drivers/usb/serial/kl5kusb105.c       | 1 -
 drivers/usb/serial/kobil_sct.c        | 1 -
 drivers/usb/serial/mct_u232.c         | 1 -
 drivers/usb/serial/metro-usb.c        | 1 -
 drivers/usb/serial/mos7720.c          | 1 -
 drivers/usb/serial/mos7840.c          | 1 -
 drivers/usb/serial/mxuport.c          | 1 -
 drivers/usb/serial/omninet.c          | 1 -
 drivers/usb/serial/opticon.c          | 1 -
 drivers/usb/serial/oti6858.c          | 1 -
 drivers/usb/serial/pl2303.c           | 1 -
 drivers/usb/serial/quatech2.c         | 1 -
 drivers/usb/serial/safe_serial.c      | 1 -
 drivers/usb/serial/spcp8x5.c          | 1 -
 drivers/usb/serial/ssu100.c           | 1 -
 drivers/usb/serial/symbolserial.c     | 1 -
 drivers/usb/serial/ti_usb_3410_5052.c | 1 -
 drivers/usb/serial/visor.c            | 1 -
 drivers/usb/serial/whiteheat.c        | 1 -
 34 files changed, 34 deletions(-)
drivers/usb/serial/belkin_sa.c +0 -1
index 38ac910b1082..adeb8e3441cf 100644
@@ -23,7 +23,6 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/tty.h>
-#include <linux/tty_driver.h>
 #include <linux/tty_flip.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
drivers/usb/serial/cyberjack.c +0 -1
index 4e8ceb23c27d..f457c8a65934 100644
@@ -28,7 +28,6 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/tty.h>
-#include <linux/tty_driver.h>
 #include <linux/tty_flip.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
drivers/usb/serial/cypress_m8.c +0 -1
index afff1a0f4298..5322f4b3cce6 100644
@@ -25,7 +25,6 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/tty.h>
-#include <linux/tty_driver.h>
 #include <linux/tty_flip.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
drivers/usb/serial/digi_acceleport.c +0 -1
index d515df045c4c..85dbf87aa361 100644
@@ -15,7 +15,6 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/tty.h>
-#include <linux/tty_driver.h>
 #include <linux/tty_flip.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
drivers/usb/serial/empeg.c +0 -1
index aedcf7ebd269..a9f3d57236b2 100644
@@ -16,7 +16,6 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/tty.h>
-#include <linux/tty_driver.h>
 #include <linux/tty_flip.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
drivers/usb/serial/f81232.c +0 -1
index 9262a2ac97f5..74b55fd9fd3f 100644
@@ -11,7 +11,6 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/tty.h>
-#include <linux/tty_driver.h>
 #include <linux/tty_flip.h>
 #include <linux/serial.h>
 #include <linux/module.h>
drivers/usb/serial/ftdi_sio.c +0 -1
index af14548fa03d..88dd32da82c2 100644
@@ -31,7 +31,6 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/tty.h>
-#include <linux/tty_driver.h>
 #include <linux/tty_flip.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
drivers/usb/serial/garmin_gps.c +0 -1
index 7205483a0115..6ab3ad7be7fc 100644
@@ -15,7 +15,6 @@
 #include <linux/slab.h>
 #include <linux/timer.h>
 #include <linux/tty.h>
-#include <linux/tty_driver.h>
 #include <linux/tty_flip.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
drivers/usb/serial/io_edgeport.c +0 -1
index 3f5889145e51..4cf77ead9334 100644
@@ -30,7 +30,6 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/tty.h>
-#include <linux/tty_driver.h>
 #include <linux/tty_flip.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
drivers/usb/serial/io_ti.c +0 -1
index cb55370e036f..21a631d8e88f 100644
@@ -18,7 +18,6 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/tty.h>
-#include <linux/tty_driver.h>
 #include <linux/tty_flip.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
drivers/usb/serial/ipaq.c +0 -1
index 3c6a9b9b9c2b..d9c9b78c41bd 100644
@@ -10,7 +10,6 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/tty.h>
-#include <linux/tty_driver.h>
 #include <linux/tty_flip.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
drivers/usb/serial/ir-usb.c +0 -1
index 12e928d25ba1..bda33a8976c7 100644
@@ -25,7 +25,6 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/tty.h>
-#include <linux/tty_driver.h>
 #include <linux/tty_flip.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
drivers/usb/serial/iuu_phoenix.c +0 -1
index 0ca111b111c7..6f2fd3a39d8e 100644
@@ -14,7 +14,6 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/tty.h>
-#include <linux/tty_driver.h>
 #include <linux/tty_flip.h>
 #include <linux/serial.h>
 #include <linux/module.h>
drivers/usb/serial/keyspan.c +0 -1
index 46448843541a..eb6e3d9d9ea7 100644
@@ -29,7 +29,6 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/tty.h>
-#include <linux/tty_driver.h>
 #include <linux/tty_flip.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
drivers/usb/serial/keyspan_pda.c +0 -1
index 5036600dd334..23a7683669eb 100644
@@ -15,7 +15,6 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/tty.h>
-#include <linux/tty_driver.h>
 #include <linux/tty_flip.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
drivers/usb/serial/kl5kusb105.c +0 -1
index ed8531a64768..64b7539043b1 100644
@@ -35,7 +35,6 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/tty.h>
-#include <linux/tty_driver.h>
 #include <linux/tty_flip.h>
 #include <linux/module.h>
 #include <linux/uaccess.h>
drivers/usb/serial/kobil_sct.c +0 -1
index 6126afd67a7b..2be31d7a7e1f 100644
@@ -23,7 +23,6 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/tty.h>
-#include <linux/tty_driver.h>
 #include <linux/tty_flip.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
drivers/usb/serial/mct_u232.c +0 -1
index 18844b92bd08..e009c2500a91 100644
@@ -21,7 +21,6 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/tty.h>
-#include <linux/tty_driver.h>
 #include <linux/tty_flip.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
drivers/usb/serial/metro-usb.c +0 -1
index bc834cc48550..45e370593d4c 100644
@@ -13,7 +13,6 @@
 #include <linux/usb.h>
 #include <linux/errno.h>
 #include <linux/slab.h>
-#include <linux/tty_driver.h>
 #include <linux/tty_flip.h>
 #include <linux/moduleparam.h>
 #include <linux/spinlock.h>
drivers/usb/serial/mos7720.c +0 -1
index 94459408e7fb..bc3b631041a9 100644
@@ -21,7 +21,6 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/tty.h>
-#include <linux/tty_driver.h>
 #include <linux/tty_flip.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
drivers/usb/serial/mos7840.c +0 -1
index c0d0c24b074b..ef803e74ab4b 100644
@@ -13,7 +13,6 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/tty.h>
-#include <linux/tty_driver.h>
 #include <linux/tty_flip.h>
 #include <linux/module.h>
 #include <linux/serial.h>
drivers/usb/serial/mxuport.c +0 -1
index 591be1fe3737..8f7ff187dbf5 100644
@@ -20,7 +20,6 @@
 #include <linux/serial_reg.h>
 #include <linux/slab.h>
 #include <linux/tty.h>
-#include <linux/tty_driver.h>
 #include <linux/tty_flip.h>
 #include <linux/uaccess.h>
 #include <linux/usb.h>
drivers/usb/serial/omninet.c +0 -1
index aa1e9745f967..3e44250dd360 100644
@@ -14,7 +14,6 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/tty.h>
-#include <linux/tty_driver.h>
 #include <linux/tty_flip.h>
 #include <linux/module.h>
 #include <linux/uaccess.h>
drivers/usb/serial/opticon.c +0 -1
index e2bed477ad57..b0c6e3578cf8 100644
@@ -10,7 +10,6 @@
 
 #include <linux/kernel.h>
 #include <linux/tty.h>
-#include <linux/tty_driver.h>
 #include <linux/slab.h>
 #include <linux/tty_flip.h>
 #include <linux/serial.h>
drivers/usb/serial/oti6858.c +0 -1
index 3ef5b5d8ce1a..bb55bbb7ff25 100644
@@ -38,7 +38,6 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/tty.h>
-#include <linux/tty_driver.h>
 #include <linux/tty_flip.h>
 #include <linux/serial.h>
 #include <linux/module.h>
drivers/usb/serial/pl2303.c +0 -1
index 50dc838e8115..790c44c5d9b6 100644
@@ -15,7 +15,6 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/tty.h>
-#include <linux/tty_driver.h>
 #include <linux/tty_flip.h>
 #include <linux/serial.h>
 #include <linux/module.h>
drivers/usb/serial/quatech2.c +0 -1
index b05c655b3cc4..fc94d6026a62 100644
@@ -13,7 +13,6 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/tty.h>
-#include <linux/tty_driver.h>
 #include <linux/tty_flip.h>
 #include <linux/module.h>
 #include <linux/serial.h>
drivers/usb/serial/safe_serial.c +0 -1
index 238b54993446..fa4128a0c933 100644
@@ -64,7 +64,6 @@
 #include <linux/errno.h>
 #include <linux/gfp.h>
 #include <linux/tty.h>
-#include <linux/tty_driver.h>
 #include <linux/tty_flip.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
drivers/usb/serial/spcp8x5.c +0 -1
index 2fbb48f19efd..5d5ea63da5df 100644
@@ -14,7 +14,6 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/tty.h>
-#include <linux/tty_driver.h>
 #include <linux/tty_flip.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
drivers/usb/serial/ssu100.c +0 -1
index da6316410b77..09fb698d3d89 100644
@@ -9,7 +9,6 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/tty.h>
-#include <linux/tty_driver.h>
 #include <linux/tty_flip.h>
 #include <linux/module.h>
 #include <linux/serial.h>
drivers/usb/serial/symbolserial.c +0 -1
index 7a5aa39172a8..c1f54248ecbb 100644
@@ -10,7 +10,6 @@
 #include <linux/kernel.h>
 #include <linux/tty.h>
 #include <linux/slab.h>
-#include <linux/tty_driver.h>
 #include <linux/tty_flip.h>
 #include <linux/module.h>
 #include <linux/usb.h>
drivers/usb/serial/ti_usb_3410_5052.c +0 -1
index b3591d6d7645..a68d91c548b9 100644
@@ -18,7 +18,6 @@
 #include <linux/firmware.h>
 #include <linux/slab.h>
 #include <linux/tty.h>
-#include <linux/tty_driver.h>
 #include <linux/tty_flip.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
drivers/usb/serial/visor.c +0 -1
index 062a38fe0c1c..8e1c7233ec45 100644
@@ -15,7 +15,6 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/tty.h>
-#include <linux/tty_driver.h>
 #include <linux/tty_flip.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
drivers/usb/serial/whiteheat.c +0 -1
index 6e2b52b2b5f8..2487a4d81b98 100644
@@ -16,7 +16,6 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/tty.h>
-#include <linux/tty_driver.h>
 #include <linux/tty_flip.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
Signature · 1 line
2.53.0
author maintainer
#2 lore raw

PATCH 2/8 USB: serial: drop unused tty_flip includes

In reply to Johan Hovold

These drivers (and usb-serial.c) no longer use anything from tty_flip.h directly so drop the unnecessary include directives.

---
 drivers/usb/serial/empeg.c      | 1 -
 drivers/usb/serial/ipaq.c       | 1 -
 drivers/usb/serial/ipw.c        | 1 -
 drivers/usb/serial/option.c     | 1 -
 drivers/usb/serial/qcserial.c   | 1 -
 drivers/usb/serial/spcp8x5.c    | 1 -
 drivers/usb/serial/usb-serial.c | 1 -
 drivers/usb/serial/visor.c      | 1 -
 drivers/usb/serial/whiteheat.c  | 1 -
 9 files changed, 9 deletions(-)
drivers/usb/serial/empeg.c +0 -1
index a9f3d57236b2..48e1a58ea3f5 100644
@@ -16,7 +16,6 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/tty.h>
-#include <linux/tty_flip.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
 #include <linux/uaccess.h>
drivers/usb/serial/ipaq.c +0 -1
index d9c9b78c41bd..eb9b7a7b1d14 100644
@@ -10,7 +10,6 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/tty.h>
-#include <linux/tty_flip.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
 #include <linux/uaccess.h>
drivers/usb/serial/ipw.c +0 -1
index 83709d678b3a..b900d0317a71 100644
@@ -36,7 +36,6 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/tty.h>
-#include <linux/tty_flip.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
 #include <linux/usb.h>
drivers/usb/serial/option.c +0 -1
index 42e4cecd28ac..fd5f1d9ab2f2 100644
@@ -32,7 +32,6 @@
 #include <linux/jiffies.h>
 #include <linux/errno.h>
 #include <linux/tty.h>
-#include <linux/tty_flip.h>
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/bitops.h>
drivers/usb/serial/qcserial.c +0 -1
index 1a930dc668e4..105c0a0eae86 100644
@@ -8,7 +8,6 @@
  */
 
 #include <linux/tty.h>
-#include <linux/tty_flip.h>
 #include <linux/module.h>
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
drivers/usb/serial/spcp8x5.c +0 -1
index 5d5ea63da5df..c11d64bf08fb 100644
@@ -14,7 +14,6 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/tty.h>
-#include <linux/tty_flip.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
 #include <linux/usb.h>
drivers/usb/serial/usb-serial.c +0 -1
index 0e072fd87c3d..67e880955ce7 100644
@@ -22,7 +22,6 @@
 #include <linux/slab.h>
 #include <linux/tty.h>
 #include <linux/tty_driver.h>
-#include <linux/tty_flip.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/seq_file.h>
drivers/usb/serial/visor.c +0 -1
index 8e1c7233ec45..06e30be10ca6 100644
@@ -15,7 +15,6 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/tty.h>
-#include <linux/tty_flip.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/spinlock.h>
drivers/usb/serial/whiteheat.c +0 -1
index 2487a4d81b98..7ba05a1a3eae 100644
@@ -16,7 +16,6 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/tty.h>
-#include <linux/tty_flip.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
 #include <linux/mutex.h>
Signature · 1 line
2.53.0
author maintainer
#3 lore raw

PATCH 3/8 USB: serial: xr: add missing uaccess include

In reply to Johan Hovold

Add the missing uaccess.h include, which is needed since TIOCSRS485 support was added, instead of relying on the header being included indirectly.

---
 drivers/usb/serial/xr_serial.c | 1 +
 1 file changed, 1 insertion(+)
drivers/usb/serial/xr_serial.c +1 -0
index 9fc4082de770..352c765d8803 100644
@@ -16,6 +16,7 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/tty.h>
+#include <linux/uaccess.h>
 #include <linux/usb.h>
 #include <linux/usb/cdc.h>
 #include <linux/usb/serial.h>
Signature · 1 line
2.53.0
author maintainer
#4 lore raw

PATCH 4/8 USB: serial: drop unused uaccess includes

In reply to Johan Hovold

These drivers (and usb-serial.c) no longer use anything from uaccess.h directly so drop the unnecessary include directives.

---
 drivers/usb/serial/ark3116.c          | 1 -
 drivers/usb/serial/belkin_sa.c        | 1 -
 drivers/usb/serial/cyberjack.c        | 1 -
 drivers/usb/serial/cypress_m8.c       | 1 -
 drivers/usb/serial/digi_acceleport.c  | 1 -
 drivers/usb/serial/empeg.c            | 1 -
 drivers/usb/serial/f81232.c           | 1 -
 drivers/usb/serial/f81534.c           | 1 -
 drivers/usb/serial/garmin_gps.c       | 1 -
 drivers/usb/serial/generic.c          | 1 -
 drivers/usb/serial/io_ti.c            | 1 -
 drivers/usb/serial/ipaq.c             | 1 -
 drivers/usb/serial/ipw.c              | 1 -
 drivers/usb/serial/ir-usb.c           | 1 -
 drivers/usb/serial/iuu_phoenix.c      | 1 -
 drivers/usb/serial/keyspan.c          | 1 -
 drivers/usb/serial/keyspan_pda.c      | 1 -
 drivers/usb/serial/kl5kusb105.c       | 1 -
 drivers/usb/serial/kobil_sct.c        | 1 -
 drivers/usb/serial/mct_u232.c         | 1 -
 drivers/usb/serial/metro-usb.c        | 1 -
 drivers/usb/serial/mxuport.c          | 1 -
 drivers/usb/serial/omninet.c          | 1 -
 drivers/usb/serial/opticon.c          | 1 -
 drivers/usb/serial/oti6858.c          | 1 -
 drivers/usb/serial/pl2303.c           | 1 -
 drivers/usb/serial/quatech2.c         | 1 -
 drivers/usb/serial/safe_serial.c      | 1 -
 drivers/usb/serial/ssu100.c           | 1 -
 drivers/usb/serial/symbolserial.c     | 1 -
 drivers/usb/serial/ti_usb_3410_5052.c | 1 -
 drivers/usb/serial/usb-serial.c       | 1 -
 drivers/usb/serial/usb_wwan.c         | 1 -
 drivers/usb/serial/visor.c            | 1 -
 drivers/usb/serial/whiteheat.c        | 1 -
 drivers/usb/serial/wishbone-serial.c  | 1 -
 drivers/usb/serial/xsens_mt.c         | 1 -
 37 files changed, 37 deletions(-)
drivers/usb/serial/ark3116.c +0 -1
index d974da43fba3..3a574b6ee0c4 100644
@@ -28,7 +28,6 @@
 #include <linux/usb/serial.h>
 #include <linux/serial.h>
 #include <linux/serial_reg.h>
-#include <linux/uaccess.h>
 #include <linux/mutex.h>
 #include <linux/spinlock.h>
 
drivers/usb/serial/belkin_sa.c +0 -1
index adeb8e3441cf..36dcdb15d6ab 100644
@@ -26,7 +26,6 @@
 #include <linux/tty_flip.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
-#include <linux/uaccess.h>
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
 #include "belkin_sa.h"
drivers/usb/serial/cyberjack.c +0 -1
index f457c8a65934..57e20eb02a46 100644
@@ -31,7 +31,6 @@
 #include <linux/tty_flip.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
-#include <linux/uaccess.h>
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
 
drivers/usb/serial/cypress_m8.c +0 -1
index 5322f4b3cce6..1d61968ab69a 100644
@@ -34,7 +34,6 @@
 #include <linux/serial.h>
 #include <linux/kfifo.h>
 #include <linux/delay.h>
-#include <linux/uaccess.h>
 #include <linux/unaligned.h>
 
 #include "cypress_m8.h"
drivers/usb/serial/digi_acceleport.c +0 -1
index 85dbf87aa361..a75813a57fbe 100644
@@ -18,7 +18,6 @@
 #include <linux/tty_flip.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
-#include <linux/uaccess.h>
 #include <linux/usb.h>
 #include <linux/wait.h>
 #include <linux/sched/signal.h>
drivers/usb/serial/empeg.c +0 -1
index 48e1a58ea3f5..4937575caff1 100644
@@ -18,7 +18,6 @@
 #include <linux/tty.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
-#include <linux/uaccess.h>
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
 
drivers/usb/serial/f81232.c +0 -1
index 74b55fd9fd3f..3a32f93a9738 100644
@@ -16,7 +16,6 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/mutex.h>
-#include <linux/uaccess.h>
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
 #include <linux/serial_reg.h>
drivers/usb/serial/f81534.c +0 -1
index 685930ac8383..0037767e4bbf 100644
@@ -28,7 +28,6 @@
 #include <linux/usb/serial.h>
 #include <linux/serial_reg.h>
 #include <linux/module.h>
-#include <linux/uaccess.h>
 
 /* Serial Port register Address */
 #define F81534_UART_BASE_ADDRESS	0x1200
drivers/usb/serial/garmin_gps.c +0 -1
index 6ab3ad7be7fc..9f955962d546 100644
@@ -18,7 +18,6 @@
 #include <linux/tty_flip.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
-#include <linux/uaccess.h>
 #include <linux/atomic.h>
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
drivers/usb/serial/generic.c +0 -1
index 757f0a586ddb..6eaf74930aa3 100644
@@ -17,7 +17,6 @@
 #include <linux/moduleparam.h>
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
-#include <linux/uaccess.h>
 #include <linux/kfifo.h>
 #include <linux/serial.h>
 
drivers/usb/serial/io_ti.c +0 -1
index 21a631d8e88f..28e16515c7f1 100644
@@ -27,7 +27,6 @@
 #include <linux/kfifo.h>
 #include <linux/ioctl.h>
 #include <linux/firmware.h>
-#include <linux/uaccess.h>
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
 
drivers/usb/serial/ipaq.c +0 -1
index eb9b7a7b1d14..c01bdbcb3f55 100644
@@ -12,7 +12,6 @@
 #include <linux/tty.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
-#include <linux/uaccess.h>
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
 
drivers/usb/serial/ipw.c +0 -1
index b900d0317a71..5be153f2c68d 100644
@@ -40,7 +40,6 @@
 #include <linux/spinlock.h>
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
-#include <linux/uaccess.h>
 #include "usb-wwan.h"
 
 #define DRIVER_AUTHOR	"Roelf Diedericks"
drivers/usb/serial/ir-usb.c +0 -1
index bda33a8976c7..aac84539730d 100644
@@ -28,7 +28,6 @@
 #include <linux/tty_flip.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
-#include <linux/uaccess.h>
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
 #include <linux/usb/irda.h>
drivers/usb/serial/iuu_phoenix.c +0 -1
index 6f2fd3a39d8e..3b1f7546fb5c 100644
@@ -19,7 +19,6 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/spinlock.h>
-#include <linux/uaccess.h>
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
 #include "iuu_phoenix.h"
drivers/usb/serial/keyspan.c +0 -1
index eb6e3d9d9ea7..4eea5ced2199 100644
@@ -32,7 +32,6 @@
 #include <linux/tty_flip.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
-#include <linux/uaccess.h>
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
 #include <linux/usb/ezusb.h>
drivers/usb/serial/keyspan_pda.c +0 -1
index 23a7683669eb..3b99f9676c35 100644
@@ -19,7 +19,6 @@
 #include <linux/module.h>
 #include <linux/spinlock.h>
 #include <linux/workqueue.h>
-#include <linux/uaccess.h>
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
 #include <linux/usb/ezusb.h>
drivers/usb/serial/kl5kusb105.c +0 -1
index 64b7539043b1..e7917871ddf1 100644
@@ -37,7 +37,6 @@
 #include <linux/tty.h>
 #include <linux/tty_flip.h>
 #include <linux/module.h>
-#include <linux/uaccess.h>
 #include <linux/unaligned.h>
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
drivers/usb/serial/kobil_sct.c +0 -1
index 2be31d7a7e1f..4a622cf8e6ae 100644
@@ -26,7 +26,6 @@
 #include <linux/tty_flip.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
-#include <linux/uaccess.h>
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
 #include <linux/ioctl.h>
drivers/usb/serial/mct_u232.c +0 -1
index e009c2500a91..0e59289e7518 100644
@@ -24,7 +24,6 @@
 #include <linux/tty_flip.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
-#include <linux/uaccess.h>
 #include <linux/unaligned.h>
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
drivers/usb/serial/metro-usb.c +0 -1
index 45e370593d4c..5fcd89f57ef3 100644
@@ -16,7 +16,6 @@
 #include <linux/tty_flip.h>
 #include <linux/moduleparam.h>
 #include <linux/spinlock.h>
-#include <linux/uaccess.h>
 #include <linux/usb/serial.h>
 
 #define DRIVER_DESC "Metrologic Instruments Inc. - USB-POS driver"
drivers/usb/serial/mxuport.c +0 -1
index 8f7ff187dbf5..9bdc5e2fee96 100644
@@ -21,7 +21,6 @@
 #include <linux/slab.h>
 #include <linux/tty.h>
 #include <linux/tty_flip.h>
-#include <linux/uaccess.h>
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
 #include <linux/unaligned.h>
drivers/usb/serial/omninet.c +0 -1
index 3e44250dd360..1f35a7e7654f 100644
@@ -16,7 +16,6 @@
 #include <linux/tty.h>
 #include <linux/tty_flip.h>
 #include <linux/module.h>
-#include <linux/uaccess.h>
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
 
drivers/usb/serial/opticon.c +0 -1
index b0c6e3578cf8..152dfc901cd8 100644
@@ -16,7 +16,6 @@
 #include <linux/module.h>
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
-#include <linux/uaccess.h>
 
 #define CONTROL_RTS			0x02
 #define RESEND_CTS_STATE	0x03
drivers/usb/serial/oti6858.c +0 -1
index bb55bbb7ff25..77f34d7651d6 100644
@@ -45,7 +45,6 @@
 #include <linux/spinlock.h>
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
-#include <linux/uaccess.h>
 #include <linux/kfifo.h>
 #include "oti6858.h"
 
drivers/usb/serial/pl2303.c +0 -1
index 790c44c5d9b6..128c80f11f49 100644
@@ -20,7 +20,6 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/spinlock.h>
-#include <linux/uaccess.h>
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
 #include <linux/unaligned.h>
drivers/usb/serial/quatech2.c +0 -1
index fc94d6026a62..dc2b39810a26 100644
@@ -19,7 +19,6 @@
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
 #include <linux/serial_reg.h>
-#include <linux/uaccess.h>
 
 /* default urb timeout for usb operations */
 #define QT2_USB_TIMEOUT USB_CTRL_SET_TIMEOUT
drivers/usb/serial/safe_serial.c +0 -1
index fa4128a0c933..a82b6453d79c 100644
@@ -67,7 +67,6 @@
 #include <linux/tty_flip.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
-#include <linux/uaccess.h>
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
 
drivers/usb/serial/ssu100.c +0 -1
index 09fb698d3d89..b0d51558b73c 100644
@@ -15,7 +15,6 @@
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
 #include <linux/serial_reg.h>
-#include <linux/uaccess.h>
 
 #define QT_OPEN_CLOSE_CHANNEL       0xca
 #define QT_SET_GET_DEVICE           0xc2
drivers/usb/serial/symbolserial.c +0 -1
index c1f54248ecbb..8823671a9c7a 100644
@@ -14,7 +14,6 @@
 #include <linux/module.h>
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
-#include <linux/uaccess.h>
 
 static const struct usb_device_id id_table[] = {
 	{ USB_DEVICE(0x05e0, 0x0600) },
drivers/usb/serial/ti_usb_3410_5052.c +0 -1
index a68d91c548b9..b3f00e315815 100644
@@ -25,7 +25,6 @@
 #include <linux/serial.h>
 #include <linux/kfifo.h>
 #include <linux/mutex.h>
-#include <linux/uaccess.h>
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
 
drivers/usb/serial/usb-serial.c +0 -1
index 67e880955ce7..45e8a0b8d438 100644
@@ -28,7 +28,6 @@
 #include <linux/spinlock.h>
 #include <linux/mutex.h>
 #include <linux/list.h>
-#include <linux/uaccess.h>
 #include <linux/serial.h>
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
drivers/usb/serial/usb_wwan.c +0 -1
index e752ffa4dc62..a183cc4515ed 100644
@@ -27,7 +27,6 @@
 #include <linux/tty_flip.h>
 #include <linux/module.h>
 #include <linux/bitops.h>
-#include <linux/uaccess.h>
 #include <linux/usb.h>
 #include <linux/usb/cdc.h>
 #include <linux/usb/serial.h>
drivers/usb/serial/visor.c +0 -1
index 06e30be10ca6..75f290a67cb4 100644
@@ -18,7 +18,6 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/spinlock.h>
-#include <linux/uaccess.h>
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
 #include <linux/usb/cdc.h>
drivers/usb/serial/whiteheat.c +0 -1
index 7ba05a1a3eae..106e9b5443d3 100644
@@ -19,7 +19,6 @@
 #include <linux/module.h>
 #include <linux/spinlock.h>
 #include <linux/mutex.h>
-#include <linux/uaccess.h>
 #include <asm/termbits.h>
 #include <linux/usb.h>
 #include <linux/serial_reg.h>
drivers/usb/serial/wishbone-serial.c +0 -1
index 670d573f6b63..4a1fed4cb57b 100644
@@ -11,7 +11,6 @@
 #include <linux/module.h>
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
-#include <linux/uaccess.h>
 
 #define GSI_VENDOR_OPENCLOSE 0xB0
 
drivers/usb/serial/xsens_mt.c +0 -1
index 382b3698c1d5..151a6e893ba2 100644
@@ -10,7 +10,6 @@
 #include <linux/module.h>
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
-#include <linux/uaccess.h>
 
 #define XSENS_VID 0x2639
 
Signature · 1 line
2.53.0
author maintainer
#5 lore raw

PATCH 5/8 USB: serial: drop unused moduleparam includes

In reply to Johan Hovold

These drivers (and usb-serial.c) no longer use anything from moduleparam.h so drop the unnecessary include directives.

---
 drivers/usb/serial/f81232.c     | 1 -
 drivers/usb/serial/metro-usb.c  | 1 -
 drivers/usb/serial/oti6858.c    | 1 -
 drivers/usb/serial/pl2303.c     | 1 -
 drivers/usb/serial/usb-serial.c | 1 -
 drivers/usb/serial/visor.c      | 1 -
 6 files changed, 6 deletions(-)
drivers/usb/serial/f81232.c +0 -1
index 3a32f93a9738..dcceb95d7d99 100644
@@ -14,7 +14,6 @@
 #include <linux/tty_flip.h>
 #include <linux/serial.h>
 #include <linux/module.h>
-#include <linux/moduleparam.h>
 #include <linux/mutex.h>
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
drivers/usb/serial/metro-usb.c +0 -1
index 5fcd89f57ef3..35473544f1c8 100644
@@ -14,7 +14,6 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/tty_flip.h>
-#include <linux/moduleparam.h>
 #include <linux/spinlock.h>
 #include <linux/usb/serial.h>
 
drivers/usb/serial/oti6858.c +0 -1
index 77f34d7651d6..c6364e8ff71f 100644
@@ -41,7 +41,6 @@
 #include <linux/tty_flip.h>
 #include <linux/serial.h>
 #include <linux/module.h>
-#include <linux/moduleparam.h>
 #include <linux/spinlock.h>
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
drivers/usb/serial/pl2303.c +0 -1
index 128c80f11f49..0bcbdcea52af 100644
@@ -18,7 +18,6 @@
 #include <linux/tty_flip.h>
 #include <linux/serial.h>
 #include <linux/module.h>
-#include <linux/moduleparam.h>
 #include <linux/spinlock.h>
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
drivers/usb/serial/usb-serial.c +0 -1
index 45e8a0b8d438..17edc057a311 100644
@@ -23,7 +23,6 @@
 #include <linux/tty.h>
 #include <linux/tty_driver.h>
 #include <linux/module.h>
-#include <linux/moduleparam.h>
 #include <linux/seq_file.h>
 #include <linux/spinlock.h>
 #include <linux/mutex.h>
drivers/usb/serial/visor.c +0 -1
index 75f290a67cb4..5706c46c49c2 100644
@@ -16,7 +16,6 @@
 #include <linux/slab.h>
 #include <linux/tty.h>
 #include <linux/module.h>
-#include <linux/moduleparam.h>
 #include <linux/spinlock.h>
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
Signature · 1 line
2.53.0
author maintainer
#6 lore raw

PATCH 6/8 USB: serial: garmin_gps: drop unused atomic include

In reply to Johan Hovold

This driver no longer uses anything from atomic.h so drop the unused include directive.

---
 drivers/usb/serial/garmin_gps.c | 1 -
 1 file changed, 1 deletion(-)
drivers/usb/serial/garmin_gps.c +0 -1
index 9f955962d546..8020149f5658 100644
@@ -18,7 +18,6 @@
 #include <linux/tty_flip.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
-#include <linux/atomic.h>
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
 
Signature · 1 line
2.53.0
author maintainer
#7 lore raw

PATCH 7/8 USB: serial: add missing atomic includes

In reply to Johan Hovold

Add the missing atomic.h include to the two driver that use it but did not include it directly.

---
 drivers/usb/serial/io_edgeport.c | 1 +
 drivers/usb/serial/mos7720.c     | 2 ++
 2 files changed, 3 insertions(+)
drivers/usb/serial/io_edgeport.c +1 -0
index 4cf77ead9334..34ccf7820537 100644
@@ -25,6 +25,7 @@
  *
  */
 
+#include <linux/atomic.h>
 #include <linux/kernel.h>
 #include <linux/jiffies.h>
 #include <linux/errno.h>
drivers/usb/serial/mos7720.c +2 -0
index bc3b631041a9..104f43a8f4d8 100644
@@ -17,6 +17,8 @@
  *	Copyright (C) 2000 Inside Out Networks, All rights reserved.
  *	Copyright (C) 2001-2002 Greg Kroah-Hartman <[email protected]>
  */
+
+#include <linux/atomic.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/slab.h>
Signature · 1 line
2.53.0
author maintainer
#8 lore raw

PATCH 8/8 USB: serial: whiteheat: drop termbits include

In reply to Johan Hovold

The termios definitions are provided by the termios.h header file which is included by tty.h so drop the redundant asm/termbits.h include directive.

---
 drivers/usb/serial/whiteheat.c | 1 -
 1 file changed, 1 deletion(-)
drivers/usb/serial/whiteheat.c +0 -1
index 106e9b5443d3..a2d83f69e00e 100644
@@ -19,7 +19,6 @@
 #include <linux/module.h>
 #include <linux/spinlock.h>
 #include <linux/mutex.h>
-#include <asm/termbits.h>
 #include <linux/usb.h>
 #include <linux/serial_reg.h>
 #include <linux/serial.h>
Signature · 1 line
2.53.0
maintainer Reviewed-by on the v1 series
#9 lore raw
In reply to Johan Hovold
Quoted 7 lines · Johan Hovold

Include directives tend to be copied from existing drivers when new drivers are written. Clean up the driver include directives to avoid having to point out unnecessary includes when reviewing new drivers.

Johan

Quoted 9 lines

Johan Hovold (8):
USB: serial: drop unused tty_driver includes
USB: serial: drop unused tty_flip includes
USB: serial: xr: add missing uaccess include
USB: serial: drop unused uaccess includes
USB: serial: drop unused moduleparam includes
USB: serial: garmin_gps: drop unused atomic include
USB: serial: add missing atomic includes
USB: serial: whiteheat: drop termbits include