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>
164 lines
3.0 KiB
C
164 lines
3.0 KiB
C
/*
|
|
* adummy.c: a dummy ATM driver
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/version.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/skbuff.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/types.h>
|
|
#include <linux/string.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/init.h>
|
|
#include <linux/mm.h>
|
|
#include <linux/timer.h>
|
|
#include <linux/interrupt.h>
|
|
#include <asm/io.h>
|
|
#include <asm/byteorder.h>
|
|
#include <asm/uaccess.h>
|
|
|
|
#include <linux/atmdev.h>
|
|
#include <linux/atm.h>
|
|
#include <linux/sonet.h>
|
|
|
|
/* version definition */
|
|
|
|
#define DRV_VERSION "1.0"
|
|
|
|
#define DEV_LABEL "adummy"
|
|
|
|
#define ADUMMY_DEV(dev) ((struct adummy_dev *) (dev)->dev_data)
|
|
|
|
struct adummy_dev {
|
|
struct atm_dev *atm_dev;
|
|
|
|
struct list_head entry;
|
|
};
|
|
|
|
/* globals */
|
|
|
|
static LIST_HEAD(adummy_devs);
|
|
|
|
static int __init
|
|
adummy_start(struct atm_dev *dev)
|
|
{
|
|
dev->ci_range.vpi_bits = 4;
|
|
dev->ci_range.vci_bits = 12;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
adummy_open(struct atm_vcc *vcc)
|
|
{
|
|
short vpi = vcc->vpi;
|
|
int vci = vcc->vci;
|
|
|
|
if (vci == ATM_VCI_UNSPEC || vpi == ATM_VPI_UNSPEC)
|
|
return 0;
|
|
|
|
set_bit(ATM_VF_ADDR, &vcc->flags);
|
|
set_bit(ATM_VF_READY, &vcc->flags);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void
|
|
adummy_close(struct atm_vcc *vcc)
|
|
{
|
|
clear_bit(ATM_VF_READY, &vcc->flags);
|
|
clear_bit(ATM_VF_ADDR, &vcc->flags);
|
|
}
|
|
|
|
static int
|
|
adummy_send(struct atm_vcc *vcc, struct sk_buff *skb)
|
|
{
|
|
if (vcc->pop)
|
|
vcc->pop(vcc, skb);
|
|
else
|
|
dev_kfree_skb_any(skb);
|
|
atomic_inc(&vcc->stats->tx);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
adummy_proc_read(struct atm_dev *dev, loff_t *pos, char *page)
|
|
{
|
|
int left = *pos;
|
|
|
|
if (!left--)
|
|
return sprintf(page, "version %s\n", DRV_VERSION);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static struct atmdev_ops adummy_ops =
|
|
{
|
|
.open = adummy_open,
|
|
.close = adummy_close,
|
|
.send = adummy_send,
|
|
.proc_read = adummy_proc_read,
|
|
.owner = THIS_MODULE
|
|
};
|
|
|
|
static int __init adummy_init(void)
|
|
{
|
|
struct atm_dev *atm_dev;
|
|
struct adummy_dev *adummy_dev;
|
|
int err = 0;
|
|
|
|
printk(KERN_ERR "adummy: version %s\n", DRV_VERSION);
|
|
|
|
adummy_dev = kzalloc(sizeof(struct adummy_dev),
|
|
GFP_KERNEL);
|
|
if (!adummy_dev) {
|
|
printk(KERN_ERR DEV_LABEL ": kzalloc() failed\n");
|
|
err = -ENOMEM;
|
|
goto out;
|
|
}
|
|
atm_dev = atm_dev_register(DEV_LABEL, &adummy_ops, -1, NULL);
|
|
if (!atm_dev) {
|
|
printk(KERN_ERR DEV_LABEL ": atm_dev_register() failed\n");
|
|
err = -ENODEV;
|
|
goto out_kfree;
|
|
}
|
|
|
|
adummy_dev->atm_dev = atm_dev;
|
|
atm_dev->dev_data = adummy_dev;
|
|
|
|
if (adummy_start(atm_dev)) {
|
|
printk(KERN_ERR DEV_LABEL ": adummy_start() failed\n");
|
|
err = -ENODEV;
|
|
goto out_unregister;
|
|
}
|
|
|
|
list_add(&adummy_dev->entry, &adummy_devs);
|
|
out:
|
|
return err;
|
|
|
|
out_unregister:
|
|
atm_dev_deregister(atm_dev);
|
|
out_kfree:
|
|
kfree(adummy_dev);
|
|
goto out;
|
|
}
|
|
|
|
static void __exit adummy_cleanup(void)
|
|
{
|
|
struct adummy_dev *adummy_dev, *next;
|
|
|
|
list_for_each_entry_safe(adummy_dev, next, &adummy_devs, entry) {
|
|
atm_dev_deregister(adummy_dev->atm_dev);
|
|
kfree(adummy_dev);
|
|
}
|
|
}
|
|
|
|
module_init(adummy_init);
|
|
module_exit(adummy_cleanup);
|
|
|
|
MODULE_AUTHOR("chas williams <chas@cmf.nrl.navy.mil>");
|
|
MODULE_DESCRIPTION("dummy ATM driver");
|
|
MODULE_LICENSE("GPL");
|