The dev was not used from pci_find_device so it was acceptable to replace
with pci_dev_present. There was no need for it to be in a while loop originally.
Compile tested.
Hanna Linder
IBM Linux Technology Center
Signed-off-by: Hanna Linder <[email protected]>
diff -Nrup linux-2.6.9-rc2-mm4cln/drivers/media/video/zr36120.c linux-2.6.9-rc2-mm4patch/drivers/media/video/zr36120.c
--- linux-2.6.9-rc2-mm4cln/drivers/media/video/zr36120.c 2004-09-28 14:58:36.000000000 -0700
+++ linux-2.6.9-rc2-mm4patch/drivers/media/video/zr36120.c 2004-09-29 15:12:53.625518848 -0700
@@ -145,14 +145,16 @@ static struct { const char name[8]; uint
static
void __init handle_chipset(void)
{
- struct pci_dev *dev = NULL;
+ static struct pci_device_id intel_82437[] = {
+ { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82437) },
+ { },
+ };
/* Just in case some nut set this to something dangerous */
if (triton1)
triton1 = ZORAN_VDC_TRICOM;
- while ((dev = pci_find_device(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82437, dev)))
- {
+ if (pci_dev_present(intel_82437)) {
printk(KERN_INFO "zoran: Host bridge 82437FX Triton PIIX\n");
triton1 = ZORAN_VDC_TRICOM;
}
On Mer, 2004-09-29 at 23:28, Hanna Linder wrote:
> The dev was not used from pci_find_device so it was acceptable to replace
> with pci_dev_present. There was no need for it to be in a while loop originally.
> Compile tested.
That code should die I think. All the tests it does are done in
pci/quirks.c and set up pci_pci_flags
--On Wednesday, September 29, 2004 11:15:30 PM +0100 Alan Cox <[email protected]> wrote:
> On Mer, 2004-09-29 at 23:28, Hanna Linder wrote:
>> The dev was not used from pci_find_device so it was acceptable to replace
>> with pci_dev_present. There was no need for it to be in a while loop originally.
>> Compile tested.
>
> That code should die I think. All the tests it does are done in
> pci/quirks.c and set up pci_pci_flags
>
>
The whole driver is CONFIG_BROKEN anyway... I only verified my changes
didn't add new compiler errors. What part should I remove? Just this check?
Thanks.
Hanna
> The whole driver is CONFIG_BROKEN anyway... I only verified my changes
> didn't add new compiler errors. What part should I remove? Just this check?
pci/quirks.c does these checks and sets the flags.
Replacing with a check for "pci_pci_problems & PCIPCI_TRITON" should do.
bttv does simliar things in bttv_check_chipset() (bttv-cards.c),
you might want to have a look there ...
Gerd
--
return -ENOSIG;
--On Thursday, September 30, 2004 10:27:48 AM +0200 Gerd Knorr <[email protected]> wrote:
>> The whole driver is CONFIG_BROKEN anyway... I only verified my changes
>> didn't add new compiler errors. What part should I remove? Just this check?
>
> pci/quirks.c does these checks and sets the flags.
> Replacing with a check for "pci_pci_problems & PCIPCI_TRITON" should do.
>
> bttv does simliar things in bttv_check_chipset() (bttv-cards.c),
> you might want to have a look there ...
>
> Gerd
Hi,
Thanks a lot for your help. Is this what you were thinking?
Ive compile tested it.
Hanna Linder
IBM Linux Technology Center
Signed-off-by: Hanna Linder <[email protected]>
---
diff -Nrup linux-2.6.9-rc2-mm4cln/drivers/media/video/zr36120.c linux-2.6.9-rc2-mm4patch/drivers/media/video/zr36120.c
--- linux-2.6.9-rc2-mm4cln/drivers/media/video/zr36120.c 2004-09-28 14:58:36.000000000 -0700
+++ linux-2.6.9-rc2-mm4patch/drivers/media/video/zr36120.c 2004-09-30 15:17:56.201723784 -0700
@@ -145,14 +145,11 @@ static struct { const char name[8]; uint
static
void __init handle_chipset(void)
{
- struct pci_dev *dev = NULL;
-
/* Just in case some nut set this to something dangerous */
if (triton1)
triton1 = ZORAN_VDC_TRICOM;
- while ((dev = pci_find_device(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82437, dev)))
- {
+ if (pci_pci_problems & PCIPCI_TRITON) {
printk(KERN_INFO "zoran: Host bridge 82437FX Triton PIIX\n");
triton1 = ZORAN_VDC_TRICOM;
}
> Thanks a lot for your help. Is this what you were thinking?
> +++ linux-2.6.9-rc2-mm4patch/drivers/media/video/zr36120.c 2004-09-30 15:17:56.201723784 -0700
> - while ((dev = pci_find_device(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82437, dev)))
> - {
> + if (pci_pci_problems & PCIPCI_TRITON) {
> printk(KERN_INFO "zoran: Host bridge 82437FX Triton PIIX\n");
> triton1 = ZORAN_VDC_TRICOM;
Looks fine to me.
Gerd
--
return -ENOSIG;