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>
108 lines
2.6 KiB
C
108 lines
2.6 KiB
C
/*
|
|
* Sky Nexus Register Driver
|
|
*
|
|
* Copyright (C) 2002 Brian Waite
|
|
*
|
|
* This driver allows reading the Nexus register
|
|
* It exports the /proc/sky_chassis_id and also
|
|
* /proc/sky_slot_id pseudo-file for status information.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version
|
|
* 2 of the License, or (at your option) any later version.
|
|
*
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/proc_fs.h>
|
|
#include <linux/hdpu_features.h>
|
|
|
|
#include <linux/platform_device.h>
|
|
|
|
static int hdpu_nexus_probe(struct platform_device *pdev);
|
|
static int hdpu_nexus_remove(struct platform_device *pdev);
|
|
|
|
static struct proc_dir_entry *hdpu_slot_id;
|
|
static struct proc_dir_entry *hdpu_chassis_id;
|
|
static int slot_id = -1;
|
|
static int chassis_id = -1;
|
|
|
|
static struct platform_driver hdpu_nexus_driver = {
|
|
.probe = hdpu_nexus_probe,
|
|
.remove = hdpu_nexus_remove,
|
|
.driver = {
|
|
.name = HDPU_NEXUS_NAME,
|
|
},
|
|
};
|
|
|
|
int hdpu_slot_id_read(char *buffer, char **buffer_location, off_t offset,
|
|
int buffer_length, int *zero, void *ptr)
|
|
{
|
|
|
|
if (offset > 0)
|
|
return 0;
|
|
return sprintf(buffer, "%d\n", slot_id);
|
|
}
|
|
|
|
int hdpu_chassis_id_read(char *buffer, char **buffer_location, off_t offset,
|
|
int buffer_length, int *zero, void *ptr)
|
|
{
|
|
|
|
if (offset > 0)
|
|
return 0;
|
|
return sprintf(buffer, "%d\n", chassis_id);
|
|
}
|
|
|
|
static int hdpu_nexus_probe(struct platform_device *pdev)
|
|
{
|
|
struct resource *res;
|
|
|
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
int *nexus_id_addr;
|
|
nexus_id_addr =
|
|
ioremap(res->start, (unsigned long)(res->end - res->start));
|
|
if (nexus_id_addr) {
|
|
slot_id = (*nexus_id_addr >> 8) & 0x1f;
|
|
chassis_id = *nexus_id_addr & 0xff;
|
|
iounmap(nexus_id_addr);
|
|
} else
|
|
printk("Could not map slot id\n");
|
|
hdpu_slot_id = create_proc_entry("sky_slot_id", 0666, &proc_root);
|
|
hdpu_slot_id->read_proc = hdpu_slot_id_read;
|
|
|
|
hdpu_chassis_id = create_proc_entry("sky_chassis_id", 0666, &proc_root);
|
|
hdpu_chassis_id->read_proc = hdpu_chassis_id_read;
|
|
return 0;
|
|
}
|
|
|
|
static int hdpu_nexus_remove(struct platform_device *pdev)
|
|
{
|
|
slot_id = -1;
|
|
chassis_id = -1;
|
|
remove_proc_entry("sky_slot_id", &proc_root);
|
|
remove_proc_entry("sky_chassis_id", &proc_root);
|
|
hdpu_slot_id = 0;
|
|
hdpu_chassis_id = 0;
|
|
return 0;
|
|
}
|
|
|
|
static int __init nexus_init(void)
|
|
{
|
|
int rc;
|
|
rc = platform_driver_register(&hdpu_nexus_driver);
|
|
return rc;
|
|
}
|
|
|
|
static void __exit nexus_exit(void)
|
|
{
|
|
platform_driver_unregister(&hdpu_nexus_driver);
|
|
}
|
|
|
|
module_init(nexus_init);
|
|
module_exit(nexus_exit);
|
|
|
|
MODULE_AUTHOR("Brian Waite");
|
|
MODULE_LICENSE("GPL");
|