From: Peter Huewe <peterhuewe@gmx.de>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Arnaud Patard <arnaud.patard@rtp-net.org>,
Aaro Koskinen <aaro.koskinen@iki.fi>,
Dan Carpenter <dan.carpenter@oracle.com>,
Peter Huewe <peterhuewe@gmx.de>,
devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
Subject: [PATCH 04/14] staging/xgifb: Remove superfluous header includes
Date: Thu, 14 Jun 2012 00:21:42 +0200 [thread overview]
Message-ID: <1339626112-20671-4-git-send-email-peterhuewe@gmx.de> (raw)
In-Reply-To: <1339626112-20671-1-git-send-email-peterhuewe@gmx.de>
This patch removes all unnecessary, redundant and superfluous header
includes from xgifb.
Tested on hp t5325 (XGI Z11)
Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
---
drivers/staging/xgifb/XGI_main.h | 6 ------
drivers/staging/xgifb/XGI_main_26.c | 24 ------------------------
drivers/staging/xgifb/XGIfb.h | 3 ---
drivers/staging/xgifb/vb_init.c | 9 ---------
drivers/staging/xgifb/vb_setmode.c | 8 --------
drivers/staging/xgifb/vb_util.c | 9 ---------
drivers/staging/xgifb/vgatypes.h | 1 -
7 files changed, 0 insertions(+), 60 deletions(-)
diff --git a/drivers/staging/xgifb/XGI_main.h b/drivers/staging/xgifb/XGI_main.h
index 9c62aeb..ce18f8c 100644
--- a/drivers/staging/xgifb/XGI_main.h
+++ b/drivers/staging/xgifb/XGI_main.h
@@ -1,13 +1,7 @@
#ifndef _XGIFB_MAIN
#define _XGIFB_MAIN
-
-
/* ------------------- Constant Definitions ------------------------- */
-
-
#include "XGIfb.h"
-#include "vb_struct.h"
-#include "../../video/sis/sis.h"
#include "vb_def.h"
#define XGIFAIL(x) do { printk(x "\n"); return -EINVAL; } while (0)
diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c
index f427b85..fe36ff430 100644
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@ -6,36 +6,12 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-/* #include <linux/config.h> */
#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/kernel.h>
-#include <linux/spinlock.h>
-#include <linux/errno.h>
-#include <linux/string.h>
-#include <linux/mm.h>
-#include <linux/tty.h>
-#include <linux/slab.h>
-#include <linux/delay.h>
-#include <linux/fb.h>
-#include <linux/console.h>
-#include <linux/selection.h>
-#include <linux/ioport.h>
-#include <linux/init.h>
-#include <linux/pci.h>
-#include <linux/vt_kern.h>
-#include <linux/capability.h>
-#include <linux/fs.h>
-#include <linux/types.h>
-#include <linux/proc_fs.h>
-
-#include <linux/io.h>
+
#ifdef CONFIG_MTRR
#include <asm/mtrr.h>
#endif
-#include "XGIfb.h"
-#include "vgatypes.h"
#include "XGI_main.h"
#include "vb_init.h"
#include "vb_util.h"
diff --git a/drivers/staging/xgifb/XGIfb.h b/drivers/staging/xgifb/XGIfb.h
index 9068c5a..741bba3 100644
--- a/drivers/staging/xgifb/XGIfb.h
+++ b/drivers/staging/xgifb/XGIfb.h
@@ -1,8 +1,5 @@
#ifndef _LINUX_XGIFB
#define _LINUX_XGIFB
-#include <linux/ioctl.h>
-#include <linux/types.h>
-
#include "vgatypes.h"
#include "vb_struct.h"
diff --git a/drivers/staging/xgifb/vb_init.c b/drivers/staging/xgifb/vb_init.c
index c222d61..dd6a519 100644
--- a/drivers/staging/xgifb/vb_init.c
+++ b/drivers/staging/xgifb/vb_init.c
@@ -1,19 +1,10 @@
-#include <linux/types.h>
#include <linux/delay.h> /* udelay */
-#include <linux/pci.h>
#include <linux/vmalloc.h>
#include "XGIfb.h"
-#include "vgatypes.h"
-
#include "vb_def.h"
-#include "vb_struct.h"
#include "vb_util.h"
#include "vb_setmode.h"
-#include "vb_init.h"
-
-
-#include <linux/io.h>
static const unsigned short XGINew_DDRDRAM_TYPE340[4][5] = {
{ 2, 13, 9, 64, 0x45},
diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c
index b2f4338..ad1e23d 100644
--- a/drivers/staging/xgifb/vb_setmode.c
+++ b/drivers/staging/xgifb/vb_setmode.c
@@ -1,17 +1,9 @@
-
-#include <linux/io.h>
#include <linux/delay.h>
-#include <linux/types.h>
#include "XGIfb.h"
-
#include "vb_def.h"
-#include "vgatypes.h"
-#include "vb_struct.h"
-#include "vb_init.h"
#include "vb_util.h"
#include "vb_table.h"
-#include "vb_setmode.h"
#define IndexMask 0xff
diff --git a/drivers/staging/xgifb/vb_util.c b/drivers/staging/xgifb/vb_util.c
index b5c9989..5c93a22 100644
--- a/drivers/staging/xgifb/vb_util.c
+++ b/drivers/staging/xgifb/vb_util.c
@@ -1,13 +1,4 @@
-#include <linux/io.h>
-#include <linux/types.h>
-
-#include "vb_def.h"
#include "vgatypes.h"
-#include "vb_struct.h"
-
-#include "XGIfb.h"
-
-#include "vb_util.h"
void xgifb_reg_set(unsigned long port, u8 index, u8 data)
{
diff --git a/drivers/staging/xgifb/vgatypes.h b/drivers/staging/xgifb/vgatypes.h
index 30cdd1a..7fc0719 100644
--- a/drivers/staging/xgifb/vgatypes.h
+++ b/drivers/staging/xgifb/vgatypes.h
@@ -1,7 +1,6 @@
#ifndef _VGATYPES_
#define _VGATYPES_
-#include <linux/ioctl.h>
#include <linux/fb.h> /* for struct fb_var_screeninfo for sis.h */
#include "../../video/sis/vgatypes.h"
#include "../../video/sis/sis.h" /* for LCD_TYPE */
--
1.7.3.4
next prev parent reply other threads:[~2012-06-13 22:24 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-13 22:21 [PATCH 01/14] staging/xgifb: Remove assignments without effect Peter Huewe
2012-06-13 22:21 ` [PATCH 02/14] staging/xgifb: Add mutext for fb_mmap locking Peter Huewe
2012-06-13 22:21 ` [PATCH 03/14] staging/xgifb: Add header #include guards to vb_table.h Peter Huewe
2012-06-13 22:21 ` Peter Huewe [this message]
2012-06-13 22:21 ` [PATCH 05/14] staging/xgifb: Consolidate XGINew_SetDRAMSize{,20}Reg Peter Huewe
2012-06-13 22:21 ` [PATCH 06/14] staging/xgifb: Remove duplicated code from XGINew_DDRSizing340 Peter Huewe
2012-06-13 22:21 ` [PATCH 07/14] staging/xgifb: Inline XGINew_SetDRAMSizingType Peter Huewe
2012-06-13 22:21 ` [PATCH 08/14] staging/xgifb: Remove unnecessary fields of XGINew_DDRDRAM_TYPE{340,20} Peter Huewe
2012-06-13 22:21 ` [PATCH 09/14] staging/xgifb: Replace constant arrays with constant values Peter Huewe
2012-06-13 22:21 ` [PATCH 10/14] staging/xgifb: Simplyfy XGI_GetVCLK2Ptr a bit Peter Huewe
2012-06-13 22:21 ` [PATCH 11/14] staging/xgifb: Remove useless function XGI_CloseCRTC Peter Huewe
2012-06-13 22:21 ` [PATCH 12/14] staging/xgifb: Replace delay lookup tables with constant values Peter Huewe
2012-06-13 22:21 ` [PATCH 13/14] staging/xgifb: Use SiS structs Peter Huewe
2012-06-13 22:21 ` [PATCH 14/14] staging/xgifb: Cleanup vb_device_info struct Peter Huewe
2012-06-14 9:36 ` Dan Carpenter
[not found] ` <bf2c5063-2ce7-40f8-9980-04d1666eb76f@email.android.com>
2012-06-14 11:50 ` Dan Carpenter
2012-06-14 11:04 ` Dan Carpenter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1339626112-20671-4-git-send-email-peterhuewe@gmx.de \
--to=peterhuewe@gmx.de \
--cc=aaro.koskinen@iki.fi \
--cc=arnaud.patard@rtp-net.org \
--cc=dan.carpenter@oracle.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®