From 74da6acaec2a3b10a9491ba7fc267aa9c5b5911c Mon Sep 17 00:00:00 2001 From: Michael Hunold Date: Sat, 4 Jan 2003 19:48:28 +0000 Subject: - Removed preinit() from saa7146 probe()/attach() logic, it's not used at all - fixed most obvious flaws in budget.c, it's partially tested (ie. module loads/unloads ok) - added the "video part" to budget-av.c, it's partially tested (ie. module loads/unloads ok, xawtv can access the video inputs) --- linux/drivers/media/common/saa7146.h | 1 - linux/drivers/media/common/saa7146_core.c | 5 ----- 2 files changed, 6 deletions(-) (limited to 'linux/drivers/media/common') diff --git a/linux/drivers/media/common/saa7146.h b/linux/drivers/media/common/saa7146.h index 907989cfe..b5ee99d64 100644 --- a/linux/drivers/media/common/saa7146.h +++ b/linux/drivers/media/common/saa7146.h @@ -89,7 +89,6 @@ struct saa7146_extension #endif /* extension functions */ - int (*preinit)(struct saa7146_dev*); int (*probe)(struct saa7146_dev*, unsigned int subvendor, unsigned int subdevice); int (*attach)(struct saa7146_dev *, struct saa7146_sub_info *); int (*detach)(struct saa7146_dev*); diff --git a/linux/drivers/media/common/saa7146_core.c b/linux/drivers/media/common/saa7146_core.c index 432fa4f4e..bd079b0e5 100644 --- a/linux/drivers/media/common/saa7146_core.c +++ b/linux/drivers/media/common/saa7146_core.c @@ -229,11 +229,6 @@ void try_attach_extension_and_device(struct saa7146_dev *dev, struct saa7146_ext return; } - if( 0 != ext->preinit(dev) ) { - DEB_S(("ext->preinit() failed for %p. skipping.\n",dev)); - return; - } - if( 0 != ext->probe) { if( 0 != ext->probe(dev, dev->pci->subsystem_vendor, dev->pci->subsystem_device) ) { DEB_D(("ext->probe() failed for %p. skipping device.\n",dev)); -- cgit v1.2.3