2004-09-30 00:07:19

by Hanna Linder

Subject: [PATCH 2.6.9-rc2-mm4 cmipci.c] [8/8] Replace pci_find_device with pci_dev_present

The pci_find_device function is going away so I have replace it with pci_dev_present.
I also just used the macros it should have been using in the first place. I have compile tested it.

Hanna Linder
IBM Linux Technology Center

Signed-off-by: Hanna Linder <[email protected]>

---
diff -Nrup linux-2.6.9-rc2-mm4cln/sound/pci/cmipci.c linux-2.6.9-rc2-mm4patch2/sound/pci/cmipci.c
--- linux-2.6.9-rc2-mm4cln/sound/pci/cmipci.c 2004-09-12 22:32:55.000000000 -0700
+++ linux-2.6.9-rc2-mm4patch2/sound/pci/cmipci.c 2004-09-29 16:32:30.000000000 -0700
@@ -2573,6 +2573,10 @@ static int __devinit snd_cmipci_create(s
long iomidi = mpu_port[dev];
long iosynth = fm_port[dev];
int pcm_index, pcm_spdif_index;
+ static struct pci_device_id intel_82437vx[] = {
+ { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82437VX) },
+ { },
+ };

*rcmipci = NULL;

@@ -2648,8 +2652,7 @@ static int __devinit snd_cmipci_create(s
switch (pci->device) {
case PCI_DEVICE_ID_CMEDIA_CM8738:
case PCI_DEVICE_ID_CMEDIA_CM8738B:
- /* PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82437VX */
- if (! pci_find_device(0x8086, 0x7030, NULL))
+ if (!pci_dev_present(intel_82437vx))
snd_cmipci_set_bit(cm, CM_REG_MISC_CTRL, CM_TXVX);
break;
default:

2004-10-20 23:16:02

by Hanna Linder

Subject: Re: [KJ] Re: [Kernel-janitors] [PATCH 2.6.9-rc2-mm4 cmipci.c] [8/8] Replace pci_find_device with pci_dev_present

--On Thursday, October 21, 2004 01:01:28 AM +0200 maximilian attems <[email protected]> wrote:

>> + if (!pci_dev_present(intel_82437vx))
> ^
>> snd_cmipci_set_bit(cm, CM_REG_MISC_CTRL, CM_TXVX);
>> break;
>> default:
>>
>>
>
> a second one with small whitespace damage.
> fixed for next kjt.

Hi Max,

According to the CodingStyle I should not put a white space
after the function name and before the parenthesis.

I do not believe that should be added.

Thanks.

Hanna

2004-10-21 00:03:00

by maximilian attems

Subject: Re: [KJ] [PATCH 2.6.9-rc2-mm4 cmipci.c] [8/8] Replace pci_find_device with pci_dev_present

hello hanna,

On Wed, 20 Oct 2004, Hanna Linder wrote:

> --On Thursday, October 21, 2004 01:01:28 AM +0200 maximilian attems <[email protected]> wrote:
>
> >> + if (!pci_dev_present(intel_82437vx))
> > ^
> >> snd_cmipci_set_bit(cm, CM_REG_MISC_CTRL, CM_TXVX);
> >> break;
> >> default:
> >>
> >>
> >
> > a second one with small whitespace damage.
> > fixed for next kjt.
>
> Hi Max,
>
> According to the CodingStyle I should not put a white space
> after the function name and before the parenthesis.
>
> I do not believe that should be added.
>
> Thanks.
>
> Hanna

agreed.

sorry for being unclear,
i meant newly introduced trailing whitespace in both cases.

--
maks
kernel janitor http://janitor.kernelnewbies.org/

2004-10-20 23:10:05

by maximilian attems

Subject: Re: [Kernel-janitors] [PATCH 2.6.9-rc2-mm4 cmipci.c] [8/8] Replace pci_find_device with pci_dev_present

On Wed, 29 Sep 2004, Hanna Linder wrote:

>
> The pci_find_device function is going away so I have replace it with pci_dev_present.
> I also just used the macros it should have been using in the first place. I have compile tested it.
>
> Hanna Linder
> IBM Linux Technology Center
>
> Signed-off-by: Hanna Linder <[email protected]>
>
> ---
> diff -Nrup linux-2.6.9-rc2-mm4cln/sound/pci/cmipci.c linux-2.6.9-rc2-mm4patch2/sound/pci/cmipci.c
> --- linux-2.6.9-rc2-mm4cln/sound/pci/cmipci.c 2004-09-12 22:32:55.000000000 -0700
> +++ linux-2.6.9-rc2-mm4patch2/sound/pci/cmipci.c 2004-09-29 16:32:30.000000000 -0700
> @@ -2573,6 +2573,10 @@ static int __devinit snd_cmipci_create(s
> long iomidi = mpu_port[dev];
> long iosynth = fm_port[dev];
> int pcm_index, pcm_spdif_index;
> + static struct pci_device_id intel_82437vx[] = {
> + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82437VX) },
> + { },
> + };
>
> *rcmipci = NULL;
>
> @@ -2648,8 +2652,7 @@ static int __devinit snd_cmipci_create(s
> switch (pci->device) {
> case PCI_DEVICE_ID_CMEDIA_CM8738:
> case PCI_DEVICE_ID_CMEDIA_CM8738B:
> - /* PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82437VX */
> - if (! pci_find_device(0x8086, 0x7030, NULL))
> + if (!pci_dev_present(intel_82437vx))
^
> snd_cmipci_set_bit(cm, CM_REG_MISC_CTRL, CM_TXVX);
> break;
> default:
>
>

a second one with small whitespace damage.
fixed for next kjt.

--
maks
kernel janitor http://janitor.kernelnewbies.org/