diff options
| -rw-r--r-- | linux/drivers/media/common/saa7146_core.c | 8 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/ttpci-budget/budget.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/ttpci-budget/budget.h | 10 |
3 files changed, 5 insertions, 15 deletions
diff --git a/linux/drivers/media/common/saa7146_core.c b/linux/drivers/media/common/saa7146_core.c index 247e1c859..7e8f9c87c 100644 --- a/linux/drivers/media/common/saa7146_core.c +++ b/linux/drivers/media/common/saa7146_core.c @@ -195,7 +195,7 @@ static void interrupt_hw(int irq, void *dev_id, struct pt_regs *regs) /* configuration-functions */ static -int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent) +int __devinit saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent) { unsigned long adr = 0, len = 0; struct saa7146_dev* dev = kmalloc (sizeof(struct saa7146_dev),GFP_KERNEL); @@ -354,7 +354,7 @@ out: } static -void saa7146_remove_one(struct pci_dev *pdev) +void __devexit saa7146_remove_one(struct pci_dev *pdev) { struct saa7146_dev* dev = (struct saa7146_dev*) pci_get_drvdata(pdev); DEB_EE(("dev:%p\n",dev)); @@ -399,7 +399,7 @@ int saa7146_register_extension(struct saa7146_extension* ext) ext->driver.name = ext->name; ext->driver.id_table = ext->pci_tbl; ext->driver.probe = saa7146_init_one; - ext->driver.remove = saa7146_remove_one; + ext->driver.remove = __devexit_p(saa7146_remove_one); printk("saa7146: register extension '%s'.\n",ext->name); return pci_module_init(&ext->driver); @@ -414,7 +414,7 @@ int saa7146_unregister_extension(struct saa7146_extension* ext) } static -int saa7146_init_module(void) +int __init saa7146_init_module(void) { if( 0 == initialized ) { INIT_LIST_HEAD(&saa7146_devices); diff --git a/linux/drivers/media/dvb/ttpci-budget/budget.c b/linux/drivers/media/dvb/ttpci-budget/budget.c index 505999dd0..b632e1901 100644 --- a/linux/drivers/media/dvb/ttpci-budget/budget.c +++ b/linux/drivers/media/dvb/ttpci-budget/budget.c @@ -47,8 +47,8 @@ struct pci_device_id pci_tbl[] = { MAKE_EXTENSION_PCI(ttbs, 0x13c2, 0x1003), MAKE_EXTENSION_PCI(ttbc, 0x13c2, 0x1004), MAKE_EXTENSION_PCI(ttbt, 0x13c2, 0x1005), - MAKE_EXTENSION_PCI(ttbci, 0x13c2, 0x100f), /* TT_BUDGET_CI without CI (connector not soldered in) */ MAKE_EXTENSION_PCI(ttbci, 0x13c2, 0x100c), + MAKE_EXTENSION_PCI(ttbci, 0x13c2, 0x100f), MAKE_EXTENSION_PCI(satel, 0x13c2, 0x1013), { .vendor = 0, diff --git a/linux/drivers/media/dvb/ttpci-budget/budget.h b/linux/drivers/media/dvb/ttpci-budget/budget.h index ab175b8e7..4a8dd3dd1 100644 --- a/linux/drivers/media/dvb/ttpci-budget/budget.h +++ b/linux/drivers/media/dvb/ttpci-budget/budget.h @@ -11,16 +11,6 @@ #include "dvb_net.h" #include "saa7146.h" -#if 1 -#define DEBUG_PROLOG printk("%s: %s(): ",__stringify(KBUILD_MODNAME),__FUNCTION__) -#define DEB_S(x) if (0!=(budget_debug&0x01)) { DEBUG_PROLOG; printk x; } /* simple debug messages */ -#define DEB_D(x) if (0!=(budget_debug&0x02)) { DEBUG_PROLOG; printk x; } /* more detailed debug messages */ -#define DEB_EE(x) if (0!=(budget_debug&0x04)) { DEBUG_PROLOG; printk x; } /* print enter and exit of functions */ -#else -#define DEB_S(x) -#define DEB_D(x) -#define DEB_EE(x) -#endif extern int budget_debug; |