* [PATCH 2.6.9-rc2-mm4 zr36120.c][5/8] Convert pci_find_device to pci_dev_present
@ 2004-09-29 22:28 Hanna Linder
2004-09-29 22:15 ` Alan Cox
0 siblings, 1 reply; 6+ messages in thread
From: Hanna Linder @ 2004-09-29 22:28 UTC (permalink / raw)
To: linux-kernel; +Cc: kernel-janitors, greg, hannal, kraxel
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 <hannal@us.ibm.com>
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;
}
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 2.6.9-rc2-mm4 zr36120.c][5/8] Convert pci_find_device to pci_dev_present
2004-09-29 22:28 [PATCH 2.6.9-rc2-mm4 zr36120.c][5/8] Convert pci_find_device to pci_dev_present Hanna Linder
@ 2004-09-29 22:15 ` Alan Cox
2004-09-29 23:25 ` Hanna Linder
0 siblings, 1 reply; 6+ messages in thread
From: Alan Cox @ 2004-09-29 22:15 UTC (permalink / raw)
To: Hanna Linder; +Cc: Linux Kernel Mailing List, kernel-janitors, greg, kraxel
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2.6.9-rc2-mm4 zr36120.c][5/8] Convert pci_find_device to pci_dev_present
2004-09-29 22:15 ` Alan Cox
@ 2004-09-29 23:25 ` Hanna Linder
2004-09-30 8:27 ` Gerd Knorr
0 siblings, 1 reply; 6+ messages in thread
From: Hanna Linder @ 2004-09-29 23:25 UTC (permalink / raw)
To: Alan Cox
Cc: Hanna Linder, Linux Kernel Mailing List, kernel-janitors, greg,
kraxel
--On Wednesday, September 29, 2004 11:15:30 PM +0100 Alan Cox <alan@lxorguk.ukuu.org.uk> 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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2.6.9-rc2-mm4 zr36120.c][5/8] Convert pci_find_device to pci_dev_present
2004-09-29 23:25 ` Hanna Linder
@ 2004-09-30 8:27 ` Gerd Knorr
2004-09-30 22:28 ` Hanna Linder
0 siblings, 1 reply; 6+ messages in thread
From: Gerd Knorr @ 2004-09-30 8:27 UTC (permalink / raw)
To: Hanna Linder; +Cc: Alan Cox, Linux Kernel Mailing List, kernel-janitors, greg
> 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;
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2.6.9-rc2-mm4 zr36120.c][5/8] Convert pci_find_device to pci_dev_present
2004-09-30 8:27 ` Gerd Knorr
@ 2004-09-30 22:28 ` Hanna Linder
2004-10-01 7:41 ` Gerd Knorr
0 siblings, 1 reply; 6+ messages in thread
From: Hanna Linder @ 2004-09-30 22:28 UTC (permalink / raw)
To: Gerd Knorr
Cc: Hanna Linder, Alan Cox, Linux Kernel Mailing List,
kernel-janitors, greg
--On Thursday, September 30, 2004 10:27:48 AM +0200 Gerd Knorr <kraxel@bytesex.org> 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 <hannal@us.ibm.com>
---
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;
}
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 2.6.9-rc2-mm4 zr36120.c][5/8] Convert pci_find_device to pci_dev_present
2004-09-30 22:28 ` Hanna Linder
@ 2004-10-01 7:41 ` Gerd Knorr
0 siblings, 0 replies; 6+ messages in thread
From: Gerd Knorr @ 2004-10-01 7:41 UTC (permalink / raw)
To: Hanna Linder; +Cc: Alan Cox, Linux Kernel Mailing List, kernel-janitors, greg
> 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;
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2004-10-01 8:02 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-09-29 22:28 [PATCH 2.6.9-rc2-mm4 zr36120.c][5/8] Convert pci_find_device to pci_dev_present Hanna Linder
2004-09-29 22:15 ` Alan Cox
2004-09-29 23:25 ` Hanna Linder
2004-09-30 8:27 ` Gerd Knorr
2004-09-30 22:28 ` Hanna Linder
2004-10-01 7:41 ` Gerd Knorr
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox