[PATCH] Prodif Plus device-ID cleanup and MODULE_DEVICE_TABLE() - macro

[PATCH] Prodif Plus device-ID cleanup and MODULE_DEVICE_TABLE() - macro

[Henrik Kretzschmar]

Hi there!

This week I got a Prodif Plus and tried it out with ALSA.
There seems to be some work to do to get it run again,
 so here is the first patch.
Is there somebody else using this driver?
---
From: Henrik Kretzschmar <henrik.kretzschmar@gmx.net>

Some pci_device_id cleanups and adding MODULE_DEVICE_ID() macro.
Signed-off-by: Henrik Kretzschmar <henrik.kretzschmar@gmx.net>
---

--- alsa-driver-1.0.12rc1.orig/pci/pdplus/pdplus.c	2006-06-22 18:24:22.000000000 +0200
+++ alsa-driver-1.0.12rc1/pci/pdplus/pdplus.c	2006-06-27 19:31:45.000000000 +0200
@@ -6174,16 +6174,13 @@
         LEAVE_VOID;
 }

-static struct pci_device_id pdplus_ids[] = {
-        {
-                PCI_VENDOR_ID_MARIAN,
-                PCI_DEVICE_ID_MARIAN_PRODIF_PLUS,
-                PCI_ANY_ID, PCI_ANY_ID,
-                0, 0, 0,
-        },
+static struct pci_device_id pdplus_ids[] __devinitdata = {
+        { 0x1382, 0x2048, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },
         { 0, }
 };

+MODULE_DEVICE_TABLE(pci, pdplus_ids);
+
 /* ********************************************************************** */

 static struct pci_driver driver = {

Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642

Re: [PATCH] Prodif Plus device-ID cleanup and MODULE_DEVICE_TABLE() - macro

[Takashi Iwai]

At Tue, 27 Jun 2006 19:43:22 +0200,
Henrik Kretzschmar wrote:
> 
> Hi there!
> 
> This week I got a Prodif Plus and tried it out with ALSA.

Great, finally someone can test the driver again...

> There seems to be some work to do to get it run again,
>  so here is the first patch.

The trend is to use PCI_DEVICE() macro with PCI_VENDOR_ID_* and
PCI_DEVICE_ID* definitions.


Takashi

> Is there somebody else using this driver?
> ---
> From: Henrik Kretzschmar <henrik.kretzschmar@gmx.net>
> 
> Some pci_device_id cleanups and adding MODULE_DEVICE_ID() macro.
> Signed-off-by: Henrik Kretzschmar <henrik.kretzschmar@gmx.net>
> ---
> 
> --- alsa-driver-1.0.12rc1.orig/pci/pdplus/pdplus.c	2006-06-22 18:24:22.000000000 +0200
> +++ alsa-driver-1.0.12rc1/pci/pdplus/pdplus.c	2006-06-27 19:31:45.000000000 +0200
> @@ -6174,16 +6174,13 @@
>          LEAVE_VOID;
>  }
> 
> -static struct pci_device_id pdplus_ids[] = {
> -        {
> -                PCI_VENDOR_ID_MARIAN,
> -                PCI_DEVICE_ID_MARIAN_PRODIF_PLUS,
> -                PCI_ANY_ID, PCI_ANY_ID,
> -                0, 0, 0,
> -        },
> +static struct pci_device_id pdplus_ids[] __devinitdata = {
> +        { 0x1382, 0x2048, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },
>          { 0, }
>  };
> 
> +MODULE_DEVICE_TABLE(pci, pdplus_ids);
> +
>  /* ********************************************************************** */
> 
>  static struct pci_driver driver = {
> 
> Using Tomcat but need to do more? Need to support web services, security?
> Get stuff done quickly with pre-integrated technology to make your job easier
> Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
> http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/alsa-devel
> 

Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642

Re: [PATCH] Prodif Plus device-ID cleanup and MODULE_DEVICE_TABLE() - macro

[Takashi Iwai]

At Wed, 28 Jun 2006 14:12:16 +0200,
I wrote:
> 
> At Tue, 27 Jun 2006 19:43:22 +0200,
> Henrik Kretzschmar wrote:
> > 
> > Hi there!
> > 
> > This week I got a Prodif Plus and tried it out with ALSA.
> 
> Great, finally someone can test the driver again...
> 
> > There seems to be some work to do to get it run again,
> >  so here is the first patch.
> 
> The trend is to use PCI_DEVICE() macro with PCI_VENDOR_ID_* and
> PCI_DEVICE_ID* definitions.

... and I commited the patch below to HG repo now.


Takashi

diff -r 56f16985aeae pci/pdplus/pdplus.c
--- a/pci/pdplus/pdplus.c	Wed Jun 28 14:06:04 2006 +0200
+++ b/pci/pdplus/pdplus.c	Wed Jun 28 14:15:48 2006 +0200
@@ -6175,14 +6175,11 @@ static void __devexit pdplus_remove(pci_
 }
 
 static struct pci_device_id pdplus_ids[] = {
-        {
-                PCI_VENDOR_ID_MARIAN,
-                PCI_DEVICE_ID_MARIAN_PRODIF_PLUS,
-                PCI_ANY_ID, PCI_ANY_ID,
-                0, 0, 0,
-        },
+        { PCI_DEVICE(PCI_VENDOR_ID_MARIAN, PCI_DEVICE_ID_MARIAN_PRODIF_PLUS) },
         { 0, }
 };
+
+MODULE_DEVICE_TABLE(pci, pdplus_ids);
 
 /* ********************************************************************** */
 

Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642