All of lore.kernel.org
 help / color / mirror / Atom feed
From: maximilian attems <janitor@sternwelten.at>
To: Hanna Linder <hannal@us.ibm.com>
Cc: linux-kernel@vger.kernel.org, kernel-janitors@lists.osdl.org,
	sailer@ife.ee.ethz.ch, perex@suse.cz, greg@kroah.com
Subject: [KJ] Re: [Kernel-janitors] [PATCH 2.6.9-rc2-mm4 cmipci.c] [8/8]
Date: Wed, 20 Oct 2004 23:01:28 +0000	[thread overview]
Message-ID: <20041020230128.GB1953@stro.at> (raw)
In-Reply-To: <28440000.1096502897@w-hlinder.beaverton.ibm.com>

[-- Attachment #1: Type: text/plain, Size: 1542 bytes --]

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 <hannal@us.ibm.com>
> 
> ---
> 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/


[-- Attachment #2: Type: text/plain, Size: 167 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors

WARNING: multiple messages have this Message-ID (diff)
From: maximilian attems <janitor@sternwelten.at>
To: Hanna Linder <hannal@us.ibm.com>
Cc: linux-kernel@vger.kernel.org, kernel-janitors@lists.osdl.org,
	sailer@ife.ee.ethz.ch, perex@suse.cz, greg@kroah.com
Subject: Re: [Kernel-janitors] [PATCH 2.6.9-rc2-mm4 cmipci.c] [8/8] Replace pci_find_device with pci_dev_present
Date: Thu, 21 Oct 2004 01:01:28 +0200	[thread overview]
Message-ID: <20041020230128.GB1953@stro.at> (raw)
In-Reply-To: <28440000.1096502897@w-hlinder.beaverton.ibm.com>

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 <hannal@us.ibm.com>
> 
> ---
> 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/


  reply	other threads:[~2004-10-20 23:01 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2004-09-30  0:08 [Kernel-janitors] [PATCH 2.6.9-rc2-mm4 cmipci.c] [8/8] Replace Hanna Linder
2004-09-30  0:08 ` [PATCH 2.6.9-rc2-mm4 cmipci.c] [8/8] Replace pci_find_device with pci_dev_present Hanna Linder
2004-10-20 23:01 ` maximilian attems [this message]
2004-10-20 23:01   ` [Kernel-janitors] " maximilian attems
2004-10-20 23:12   ` [KJ] Re: [Kernel-janitors] [PATCH 2.6.9-rc2-mm4 cmipci.c] Hanna Linder
2004-10-20 23:12     ` [KJ] Re: [Kernel-janitors] [PATCH 2.6.9-rc2-mm4 cmipci.c] [8/8] Replace pci_find_device with pci_dev_present Hanna Linder
2004-10-21  0:01     ` [KJ] [PATCH 2.6.9-rc2-mm4 cmipci.c] [8/8] Replace pci_find_device maximilian attems
2004-10-21  0:01       ` [KJ] [PATCH 2.6.9-rc2-mm4 cmipci.c] [8/8] Replace pci_find_device with pci_dev_present maximilian attems

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20041020230128.GB1953@stro.at \
    --to=janitor@sternwelten.at \
    --cc=greg@kroah.com \
    --cc=hannal@us.ibm.com \
    --cc=kernel-janitors@lists.osdl.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=perex@suse.cz \
    --cc=sailer@ife.ee.ethz.ch \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.