All of lore.kernel.org
 help / color / mirror / Atom feed
* [Kernel-janitors] [PATCH 2.6.9-rc2-mm4 cmipci.c] [8/8] Replace
@ 2004-09-30  0:08 ` Hanna Linder
  0 siblings, 0 replies; 8+ messages in thread
From: Hanna Linder @ 2004-09-30  0:08 UTC (permalink / raw)
  To: linux-kernel; +Cc: kernel-janitors, greg, sailer, perex

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


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:



[-- 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

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH 2.6.9-rc2-mm4 cmipci.c] [8/8] Replace pci_find_device with pci_dev_present
@ 2004-09-30  0:08 ` Hanna Linder
  0 siblings, 0 replies; 8+ messages in thread
From: Hanna Linder @ 2004-09-30  0:08 UTC (permalink / raw)
  To: linux-kernel; +Cc: kernel-janitors, greg, sailer, perex


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:



^ permalink raw reply	[flat|nested] 8+ messages in thread

* [KJ] Re: [Kernel-janitors] [PATCH 2.6.9-rc2-mm4 cmipci.c] [8/8]
  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
  -1 siblings, 0 replies; 8+ messages in thread
From: maximilian attems @ 2004-10-20 23:01 UTC (permalink / raw)
  To: Hanna Linder; +Cc: linux-kernel, kernel-janitors, sailer, perex, greg

[-- 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

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [Kernel-janitors] [PATCH 2.6.9-rc2-mm4 cmipci.c] [8/8] Replace pci_find_device with pci_dev_present
@ 2004-10-20 23:01   ` maximilian attems
  0 siblings, 0 replies; 8+ messages in thread
From: maximilian attems @ 2004-10-20 23:01 UTC (permalink / raw)
  To: Hanna Linder; +Cc: linux-kernel, kernel-janitors, sailer, perex, greg

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/


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [KJ] Re: [Kernel-janitors] [PATCH 2.6.9-rc2-mm4 cmipci.c]
  2004-10-20 23:01   ` [Kernel-janitors] [PATCH 2.6.9-rc2-mm4 cmipci.c] [8/8] Replace pci_find_device with pci_dev_present maximilian attems
@ 2004-10-20 23:12     ` Hanna Linder
  -1 siblings, 0 replies; 8+ messages in thread
From: Hanna Linder @ 2004-10-20 23:12 UTC (permalink / raw)
  To: maximilian attems
  Cc: Hanna Linder, kernel-janitors, greg, linux-kernel, perex, sailer

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

--On Thursday, October 21, 2004 01:01:28 AM +0200 maximilian attems <janitor@sternwelten.at> 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


[-- 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

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [KJ] Re: [Kernel-janitors] [PATCH 2.6.9-rc2-mm4 cmipci.c] [8/8] Replace pci_find_device with pci_dev_present
@ 2004-10-20 23:12     ` Hanna Linder
  0 siblings, 0 replies; 8+ messages in thread
From: Hanna Linder @ 2004-10-20 23:12 UTC (permalink / raw)
  To: maximilian attems
  Cc: Hanna Linder, kernel-janitors, greg, linux-kernel, perex, sailer

--On Thursday, October 21, 2004 01:01:28 AM +0200 maximilian attems <janitor@sternwelten.at> 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


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [KJ] [PATCH 2.6.9-rc2-mm4 cmipci.c] [8/8] Replace pci_find_device
  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       ` maximilian attems
  -1 siblings, 0 replies; 8+ messages in thread
From: maximilian attems @ 2004-10-21  0:01 UTC (permalink / raw)
  To: Hanna Linder; +Cc: kernel-janitors, greg, linux-kernel, perex, sailer

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

hello hanna,

On Wed, 20 Oct 2004, Hanna Linder wrote:

> --On Thursday, October 21, 2004 01:01:28 AM +0200 maximilian attems <janitor@sternwelten.at> 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/


[-- 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

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [KJ]  [PATCH 2.6.9-rc2-mm4 cmipci.c] [8/8] Replace pci_find_device with pci_dev_present
@ 2004-10-21  0:01       ` maximilian attems
  0 siblings, 0 replies; 8+ messages in thread
From: maximilian attems @ 2004-10-21  0:01 UTC (permalink / raw)
  To: Hanna Linder; +Cc: kernel-janitors, greg, linux-kernel, perex, sailer

hello hanna,

On Wed, 20 Oct 2004, Hanna Linder wrote:

> --On Thursday, October 21, 2004 01:01:28 AM +0200 maximilian attems <janitor@sternwelten.at> 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/


^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2004-10-21  0:03 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 ` [KJ] Re: [Kernel-janitors] [PATCH 2.6.9-rc2-mm4 cmipci.c] [8/8] maximilian attems
2004-10-20 23:01   ` [Kernel-janitors] [PATCH 2.6.9-rc2-mm4 cmipci.c] [8/8] Replace pci_find_device with pci_dev_present 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

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.