All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] acore: deprecated function in wrappers.c
@ 2011-02-25 15:35 Grzegorz Daniluk
  2011-02-25 15:41 ` Takashi Iwai
  0 siblings, 1 reply; 6+ messages in thread
From: Grzegorz Daniluk @ 2011-02-25 15:35 UTC (permalink / raw)
  To: alsa-devel

This patch replace the call of pci_find_device() to pci_get_device(). 
The function pci_find_device() was deprecated for quite a long time, and 
now it is no longer in the kernel.

Signed-off-by: Grzegorz Daniluk <g.daniluk@elproma.com.pl>
---

diff -uprN a/acore/wrappers.c b/acore/wrappers.c
--- a/acore/wrappers.c    2011-01-27 12:09:20.000000000 +0000
+++ b/acore/wrappers.c    2011-02-25 13:41:46.000000000 +0000
@@ -197,7 +197,7 @@ EXPORT_SYMBOL(snd_compat_devfs_mk_cdev);
 int snd_pci_dev_present(const struct pci_device_id *ids)
 {
     while (ids->vendor || ids->subvendor) {
-        if (pci_find_device(ids->vendor, ids->subvendor, NULL))
+        if (pci_get_device(ids->vendor, ids->subvendor, NULL))
             return 1;
         ids++;
     }

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

* Re: [PATCH 1/2] acore: deprecated function in wrappers.c
  2011-02-25 15:35 [PATCH 1/2] acore: deprecated function in wrappers.c Grzegorz Daniluk
@ 2011-02-25 15:41 ` Takashi Iwai
  2011-02-25 15:51   ` Grzegorz Daniluk
  0 siblings, 1 reply; 6+ messages in thread
From: Takashi Iwai @ 2011-02-25 15:41 UTC (permalink / raw)
  To: Grzegorz Daniluk; +Cc: alsa-devel

At Fri, 25 Feb 2011 16:35:18 +0100,
Grzegorz Daniluk wrote:
> 
> This patch replace the call of pci_find_device() to pci_get_device(). 
> The function pci_find_device() was deprecated for quite a long time, and 
> now it is no longer in the kernel.

Erm... this code is defined _only_ for very old kernels just for
compatible wrapper, so following the rule for new kernels doesn't make
sense.


Takashi

> 
> Signed-off-by: Grzegorz Daniluk <g.daniluk@elproma.com.pl>
> ---
> 
> diff -uprN a/acore/wrappers.c b/acore/wrappers.c
> --- a/acore/wrappers.c    2011-01-27 12:09:20.000000000 +0000
> +++ b/acore/wrappers.c    2011-02-25 13:41:46.000000000 +0000
> @@ -197,7 +197,7 @@ EXPORT_SYMBOL(snd_compat_devfs_mk_cdev);
>  int snd_pci_dev_present(const struct pci_device_id *ids)
>  {
>      while (ids->vendor || ids->subvendor) {
> -        if (pci_find_device(ids->vendor, ids->subvendor, NULL))
> +        if (pci_get_device(ids->vendor, ids->subvendor, NULL))
>              return 1;
>          ids++;
>      }
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel@alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
> 

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

* Re: [PATCH 1/2] acore: deprecated function in wrappers.c
  2011-02-25 15:41 ` Takashi Iwai
@ 2011-02-25 15:51   ` Grzegorz Daniluk
  2011-02-25 15:55     ` Takashi Iwai
  0 siblings, 1 reply; 6+ messages in thread
From: Grzegorz Daniluk @ 2011-02-25 15:51 UTC (permalink / raw)
  To: Takashi Iwai; +Cc: alsa-devel

Takashi Iwai wrote:
>
> Erm... this code is defined _only_ for very old kernels just for
> compatible wrapper, so following the rule for new kernels doesn't make
> sense.
>
>
>   
Then something else is wrong, since this code caused the compilation 
error(attached below) when I was doing the cross-compilation for the 
system without PCI for the 2.6.35 kernel (the kernel version was 
correctly recognized during ./configure):

/root/alsa-driver-1.0.24/acore/wrappers.c: In function 
'snd_pci_dev_present':
/root/alsa-driver-1.0.24/acore/wrappers.c:200: error: implicit 
declaration of function 'pci_find_device'
make[3]: *** [/root/alsa-driver-1.0.24/acore/wrappers.o] Error 1

Greg

>> Signed-off-by: Grzegorz Daniluk <g.daniluk@elproma.com.pl>
>> ---
>>
>> diff -uprN a/acore/wrappers.c b/acore/wrappers.c
>> --- a/acore/wrappers.c    2011-01-27 12:09:20.000000000 +0000
>> +++ b/acore/wrappers.c    2011-02-25 13:41:46.000000000 +0000
>> @@ -197,7 +197,7 @@ EXPORT_SYMBOL(snd_compat_devfs_mk_cdev);
>>  int snd_pci_dev_present(const struct pci_device_id *ids)
>>  {
>>      while (ids->vendor || ids->subvendor) {
>> -        if (pci_find_device(ids->vendor, ids->subvendor, NULL))
>> +        if (pci_get_device(ids->vendor, ids->subvendor, NULL))
>>              return 1;
>>          ids++;
>>      }
>> _______________________________________________
>> Alsa-devel mailing list
>> Alsa-devel@alsa-project.org
>> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
>>
>>     
>
>   

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

* Re: [PATCH 1/2] acore: deprecated function in wrappers.c
  2011-02-25 15:51   ` Grzegorz Daniluk
@ 2011-02-25 15:55     ` Takashi Iwai
  2011-02-28 11:43       ` Grzegorz Daniluk
  0 siblings, 1 reply; 6+ messages in thread
From: Takashi Iwai @ 2011-02-25 15:55 UTC (permalink / raw)
  To: Grzegorz Daniluk; +Cc: alsa-devel

At Fri, 25 Feb 2011 16:51:53 +0100,
Grzegorz Daniluk wrote:
> 
> Takashi Iwai wrote:
> >
> > Erm... this code is defined _only_ for very old kernels just for
> > compatible wrapper, so following the rule for new kernels doesn't make
> > sense.
> >
> >
> >   
> Then something else is wrong, since this code caused the compilation 
> error(attached below) when I was doing the cross-compilation for the 
> system without PCI for the 2.6.35 kernel (the kernel version was 
> correctly recognized during ./configure):
> 
> /root/alsa-driver-1.0.24/acore/wrappers.c: In function 
> 'snd_pci_dev_present':
> /root/alsa-driver-1.0.24/acore/wrappers.c:200: error: implicit 
> declaration of function 'pci_find_device'
> make[3]: *** [/root/alsa-driver-1.0.24/acore/wrappers.o] Error 1

Then configure script didn't detect the condition properly.
Check CONFIG_HAVE_PCI_DEV_PRESENT in you config.log.  Most likely
a wrong gcc option or path is given, and the check is screwed up.


Takashi



> 
> Greg
> 
> >> Signed-off-by: Grzegorz Daniluk <g.daniluk@elproma.com.pl>
> >> ---
> >>
> >> diff -uprN a/acore/wrappers.c b/acore/wrappers.c
> >> --- a/acore/wrappers.c    2011-01-27 12:09:20.000000000 +0000
> >> +++ b/acore/wrappers.c    2011-02-25 13:41:46.000000000 +0000
> >> @@ -197,7 +197,7 @@ EXPORT_SYMBOL(snd_compat_devfs_mk_cdev);
> >>  int snd_pci_dev_present(const struct pci_device_id *ids)
> >>  {
> >>      while (ids->vendor || ids->subvendor) {
> >> -        if (pci_find_device(ids->vendor, ids->subvendor, NULL))
> >> +        if (pci_get_device(ids->vendor, ids->subvendor, NULL))
> >>              return 1;
> >>          ids++;
> >>      }
> >> _______________________________________________
> >> Alsa-devel mailing list
> >> Alsa-devel@alsa-project.org
> >> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
> >>
> >>     
> >
> >   
> 

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

* Re: [PATCH 1/2] acore: deprecated function in wrappers.c
  2011-02-25 15:55     ` Takashi Iwai
@ 2011-02-28 11:43       ` Grzegorz Daniluk
  2011-02-28 11:49         ` Takashi Iwai
  0 siblings, 1 reply; 6+ messages in thread
From: Grzegorz Daniluk @ 2011-02-28 11:43 UTC (permalink / raw)
  To: Takashi Iwai; +Cc: alsa-devel

Takashi Iwai wrote:
> Then configure script didn't detect the condition properly.
> Check CONFIG_HAVE_PCI_DEV_PRESENT in you config.log.  Most likely
> a wrong gcc option or path is given, and the check is screwed up.
>
>
> Takashi
ok, but still, something is wrong if it tries to compile the wrapper 
code even if new kernel was detected (2.6.35)...

Greg

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

* Re: [PATCH 1/2] acore: deprecated function in wrappers.c
  2011-02-28 11:43       ` Grzegorz Daniluk
@ 2011-02-28 11:49         ` Takashi Iwai
  0 siblings, 0 replies; 6+ messages in thread
From: Takashi Iwai @ 2011-02-28 11:49 UTC (permalink / raw)
  To: Grzegorz Daniluk; +Cc: alsa-devel

At Mon, 28 Feb 2011 12:43:00 +0100,
Grzegorz Daniluk wrote:
> 
> Takashi Iwai wrote:
> > Then configure script didn't detect the condition properly.
> > Check CONFIG_HAVE_PCI_DEV_PRESENT in you config.log.  Most likely
> > a wrong gcc option or path is given, and the check is screwed up.
> >
> >
> > Takashi
> ok, but still, something is wrong if it tries to compile the wrapper 
> code even if new kernel was detected (2.6.35)...

As I wrote, it's a problem in configure script.
It didn't detect the presence of pci_dev_present() properly with your
system.  You tried to fix a wrong place.


Takashi

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

end of thread, other threads:[~2011-02-28 11:49 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-25 15:35 [PATCH 1/2] acore: deprecated function in wrappers.c Grzegorz Daniluk
2011-02-25 15:41 ` Takashi Iwai
2011-02-25 15:51   ` Grzegorz Daniluk
2011-02-25 15:55     ` Takashi Iwai
2011-02-28 11:43       ` Grzegorz Daniluk
2011-02-28 11:49         ` Takashi Iwai

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.