6473d160b4
I noticed that many source files include <linux/pci.h> while they do not appear to need it. Here is an attempt to clean it all up. In order to find all possibly affected files, I searched for all files including <linux/pci.h> but without any other occurence of "pci" or "PCI". I removed the include statement from all of these, then I compiled an allmodconfig kernel on both i386 and x86_64 and fixed the false positives manually. My tests covered 66% of the affected files, so there could be false positives remaining. Untested files are: arch/alpha/kernel/err_common.c arch/alpha/kernel/err_ev6.c arch/alpha/kernel/err_ev7.c arch/ia64/sn/kernel/huberror.c arch/ia64/sn/kernel/xpnet.c arch/m68knommu/kernel/dma.c arch/mips/lib/iomap.c arch/powerpc/platforms/pseries/ras.c arch/ppc/8260_io/enet.c arch/ppc/8260_io/fcc_enet.c arch/ppc/8xx_io/enet.c arch/ppc/syslib/ppc4xx_sgdma.c arch/sh64/mach-cayman/iomap.c arch/xtensa/kernel/xtensa_ksyms.c arch/xtensa/platform-iss/setup.c drivers/i2c/busses/i2c-at91.c drivers/i2c/busses/i2c-mpc.c drivers/media/video/saa711x.c drivers/misc/hdpuftrs/hdpu_cpustate.c drivers/misc/hdpuftrs/hdpu_nexus.c drivers/net/au1000_eth.c drivers/net/fec_8xx/fec_main.c drivers/net/fec_8xx/fec_mii.c drivers/net/fs_enet/fs_enet-main.c drivers/net/fs_enet/mac-fcc.c drivers/net/fs_enet/mac-fec.c drivers/net/fs_enet/mac-scc.c drivers/net/fs_enet/mii-bitbang.c drivers/net/fs_enet/mii-fec.c drivers/net/ibm_emac/ibm_emac_core.c drivers/net/lasi_82596.c drivers/parisc/hppb.c drivers/sbus/sbus.c drivers/video/g364fb.c drivers/video/platinumfb.c drivers/video/stifb.c drivers/video/valkyriefb.c include/asm-arm/arch-ixp4xx/dma.h sound/oss/au1550_ac97.c I would welcome test reports for these files. I am fine with removing the untested files from the patch if the general opinion is that these changes aren't safe. The tested part would still be nice to have. Note that this patch depends on another header fixup patch I submitted to LKML yesterday: [PATCH] scatterlist.h needs types.h http://lkml.org/lkml/2007/3/01/141 Signed-off-by: Jean Delvare <khali@linux-fr.org> Cc: Badari Pulavarty <pbadari@us.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
82 lines
2.4 KiB
C
82 lines
2.4 KiB
C
/*******************************************************************************
|
|
|
|
Intel PRO/10GbE Linux driver
|
|
Copyright(c) 1999 - 2006 Intel Corporation.
|
|
|
|
This program is free software; you can redistribute it and/or modify it
|
|
under the terms and conditions of the GNU General Public License,
|
|
version 2, as published by the Free Software Foundation.
|
|
|
|
This program is distributed in the hope it will be useful, but WITHOUT
|
|
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
more details.
|
|
|
|
You should have received a copy of the GNU General Public License along with
|
|
this program; if not, write to the Free Software Foundation, Inc.,
|
|
51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
|
|
|
|
The full GNU General Public License is included in this distribution in
|
|
the file called "COPYING".
|
|
|
|
Contact Information:
|
|
Linux NICS <linux.nics@intel.com>
|
|
e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
|
|
Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
|
|
|
|
*******************************************************************************/
|
|
|
|
/* glue for the OS independent part of ixgb
|
|
* includes register access macros
|
|
*/
|
|
|
|
#ifndef _IXGB_OSDEP_H_
|
|
#define _IXGB_OSDEP_H_
|
|
|
|
#include <linux/types.h>
|
|
#include <linux/delay.h>
|
|
#include <asm/io.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/sched.h>
|
|
|
|
typedef enum {
|
|
#undef FALSE
|
|
FALSE = 0,
|
|
#undef TRUE
|
|
TRUE = 1
|
|
} boolean_t;
|
|
|
|
#undef ASSERT
|
|
#define ASSERT(x) if(!(x)) BUG()
|
|
#define MSGOUT(S, A, B) printk(KERN_DEBUG S "\n", A, B)
|
|
|
|
#ifdef DBG
|
|
#define DEBUGOUT(S) printk(KERN_DEBUG S "\n")
|
|
#define DEBUGOUT1(S, A...) printk(KERN_DEBUG S "\n", A)
|
|
#else
|
|
#define DEBUGOUT(S)
|
|
#define DEBUGOUT1(S, A...)
|
|
#endif
|
|
|
|
#define DEBUGFUNC(F) DEBUGOUT(F)
|
|
#define DEBUGOUT2 DEBUGOUT1
|
|
#define DEBUGOUT3 DEBUGOUT2
|
|
#define DEBUGOUT7 DEBUGOUT3
|
|
|
|
#define IXGB_WRITE_REG(a, reg, value) ( \
|
|
writel((value), ((a)->hw_addr + IXGB_##reg)))
|
|
|
|
#define IXGB_READ_REG(a, reg) ( \
|
|
readl((a)->hw_addr + IXGB_##reg))
|
|
|
|
#define IXGB_WRITE_REG_ARRAY(a, reg, offset, value) ( \
|
|
writel((value), ((a)->hw_addr + IXGB_##reg + ((offset) << 2))))
|
|
|
|
#define IXGB_READ_REG_ARRAY(a, reg, offset) ( \
|
|
readl((a)->hw_addr + IXGB_##reg + ((offset) << 2)))
|
|
|
|
#define IXGB_WRITE_FLUSH(a) IXGB_READ_REG(a, STATUS)
|
|
|
|
#define IXGB_MEMCPY memcpy
|
|
|
|
#endif /* _IXGB_OSDEP_H_ */
|