Commit b91ecb00 authored by Tilman Schmidt's avatar Tilman Schmidt Committed by David S. Miller

gigaset: include cleanup cleanup

Commit 5a0e3ad6 causes slab.h to be included twice in many of the
Gigaset driver's source files, first via the common include file
gigaset.h and then a second time directly. Drop the spares, and
use the opportunity to clean up a few more similar cases.

Impact: cleanup, no functional change
Signed-off-by: default avatarTilman Schmidt <tilman@imap.cc>
CC: Tejun Heo <tj@kernel.org>
Acked-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1c4f0197
...@@ -14,11 +14,6 @@ ...@@ -14,11 +14,6 @@
*/ */
#include "gigaset.h" #include "gigaset.h"
#include <linux/errno.h>
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/timer.h>
#include <linux/usb.h> #include <linux/usb.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
......
...@@ -12,8 +12,6 @@ ...@@ -12,8 +12,6 @@
*/ */
#include "gigaset.h" #include "gigaset.h"
#include <linux/slab.h>
#include <linux/ctype.h>
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/isdn/capilli.h> #include <linux/isdn/capilli.h>
......
...@@ -14,10 +14,8 @@ ...@@ -14,10 +14,8 @@
*/ */
#include "gigaset.h" #include "gigaset.h"
#include <linux/ctype.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
#include <linux/slab.h>
/* Version Information */ /* Version Information */
#define DRIVER_AUTHOR "Hansjoerg Lipp <hjlipp@web.de>, Tilman Schmidt <tilman@imap.cc>, Stefan Eilers" #define DRIVER_AUTHOR "Hansjoerg Lipp <hjlipp@web.de>, Tilman Schmidt <tilman@imap.cc>, Stefan Eilers"
......
...@@ -22,9 +22,9 @@ ...@@ -22,9 +22,9 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/compiler.h> #include <linux/compiler.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/ctype.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/usb.h>
#include <linux/skbuff.h> #include <linux/skbuff.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/ppp_defs.h> #include <linux/ppp_defs.h>
......
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
#include "gigaset.h" #include "gigaset.h"
#include <linux/isdnif.h> #include <linux/isdnif.h>
#include <linux/slab.h>
#define HW_HDR_LEN 2 /* Header size used to store ack info */ #define HW_HDR_LEN 2 /* Header size used to store ack info */
......
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
#include "gigaset.h" #include "gigaset.h"
#include <linux/gigaset_dev.h> #include <linux/gigaset_dev.h>
#include <linux/tty.h>
#include <linux/tty_flip.h> #include <linux/tty_flip.h>
/*** our ioctls ***/ /*** our ioctls ***/
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
*/ */
#include "gigaset.h" #include "gigaset.h"
#include <linux/ctype.h>
static ssize_t show_cidmode(struct device *dev, static ssize_t show_cidmode(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
......
...@@ -11,13 +11,10 @@ ...@@ -11,13 +11,10 @@
*/ */
#include "gigaset.h" #include "gigaset.h"
#include <linux/module.h> #include <linux/module.h>
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/tty.h>
#include <linux/completion.h> #include <linux/completion.h>
#include <linux/slab.h>
/* Version Information */ /* Version Information */
#define DRIVER_AUTHOR "Tilman Schmidt" #define DRIVER_AUTHOR "Tilman Schmidt"
......
...@@ -16,10 +16,6 @@ ...@@ -16,10 +16,6 @@
*/ */
#include "gigaset.h" #include "gigaset.h"
#include <linux/errno.h>
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/usb.h> #include <linux/usb.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment