3 files changed, 16 insertions, 17 deletions

diff --git a/sound/oss/au1550_ac97.c b/sound/oss/au1550_ac97.c
index b963c550dae6..bdee0502f3e2 100644
--- a/sound/oss/au1550_ac97.c
+++ b/sound/oss/au1550_ac97.c
@@ -462,7 +462,7 @@ stop_dac(struct au1550_state *s)
         /* Wait for Transmit Busy to show disabled.
         */
         do {
-                stat = readl((void *)PSC_AC97STAT);
+                stat = au_readl(PSC_AC97STAT);
                 au_sync();
         } while ((stat & PSC_AC97STAT_TB) != 0);
 
@@ -491,7 +491,7 @@ stop_adc(struct au1550_state *s)
         /* Wait for Receive Busy to show disabled.
         */
         do {
-                stat = readl((void *)PSC_AC97STAT);
+                stat = au_readl(PSC_AC97STAT);
                 au_sync();
         } while ((stat & PSC_AC97STAT_RB) != 0);
 
@@ -541,7 +541,7 @@ set_xmit_slots(int num_channels)
         /* Wait for Device ready.
         */
         do {
-                stat = readl((void *)PSC_AC97STAT);
+                stat = au_readl(PSC_AC97STAT);
                 au_sync();
         } while ((stat & PSC_AC97STAT_DR) == 0);
 }
@@ -573,7 +573,7 @@ set_recv_slots(int num_channels)
         /* Wait for Device ready.
         */
         do {
-                stat = readl((void *)PSC_AC97STAT);
+                stat = au_readl(PSC_AC97STAT);
                 au_sync();
         } while ((stat & PSC_AC97STAT_DR) == 0);
 }
@@ -1995,7 +1995,7 @@ au1550_probe(void)
         /* Wait for PSC ready.
         */
         do {
-                val = readl((void *)PSC_AC97STAT);
+                val = au_readl(PSC_AC97STAT);
                 au_sync();
         } while ((val & PSC_AC97STAT_SR) == 0);
 
@@ -2018,7 +2018,7 @@ au1550_probe(void)
         /* Wait for Device ready.
         */
         do {
-                val = readl((void *)PSC_AC97STAT);
+                val = au_readl(PSC_AC97STAT);
                 au_sync();
         } while ((val & PSC_AC97STAT_DR) == 0);
 
diff --git a/sound/oss/trident.c b/sound/oss/trident.c
index 5f0ad6bb43b9..a21c663e7e12 100644
--- a/sound/oss/trident.c
+++ b/sound/oss/trident.c
@@ -278,16 +278,14 @@ static char *card_names[] = {
 };
 
 static struct pci_device_id trident_pci_tbl[] = {
-        {PCI_VENDOR_ID_TRIDENT, PCI_DEVICE_ID_TRIDENT_4DWAVE_DX,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, TRIDENT_4D_DX},
-        {PCI_VENDOR_ID_TRIDENT, PCI_DEVICE_ID_TRIDENT_4DWAVE_NX,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, TRIDENT_4D_NX},
-        {PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_7018,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, SIS_7018},
-        {PCI_VENDOR_ID_ALI, PCI_DEVICE_ID_ALI_5451,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, ALI_5451},
-        {PCI_VENDOR_ID_INTERG, PCI_DEVICE_ID_INTERG_5050,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, CYBER5050},
+        {PCI_DEVICE(PCI_VENDOR_ID_TRIDENT, PCI_DEVICE_ID_TRIDENT_4DWAVE_DX),
+                PCI_CLASS_MULTIMEDIA_AUDIO << 8, 0xffff00, TRIDENT_4D_DX},
+        {PCI_DEVICE(PCI_VENDOR_ID_TRIDENT, PCI_DEVICE_ID_TRIDENT_4DWAVE_NX),
+                0, 0, TRIDENT_4D_NX},
+        {PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_7018), 0, 0, SIS_7018},
+        {PCI_DEVICE(PCI_VENDOR_ID_ALI, PCI_DEVICE_ID_ALI_5451), 0, 0, ALI_5451},
+        {PCI_DEVICE(PCI_VENDOR_ID_INTERG, PCI_DEVICE_ID_INTERG_5050),
+                0, 0, CYBER5050},
         {0,}
 };
 
diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c
index e9086e95a31f..fd6543998788 100644
--- a/sound/sparc/cs4231.c
+++ b/sound/sparc/cs4231.c
@@ -69,13 +69,14 @@ struct sbus_dma_info {
 };
 #endif
 
+struct snd_cs4231;
 struct cs4231_dma_control {
         void            (*prepare)(struct cs4231_dma_control *dma_cont, int dir);
         void            (*enable)(struct cs4231_dma_control *dma_cont, int on);
         int             (*request)(struct cs4231_dma_control *dma_cont, dma_addr_t bus_addr, size_t len);
         unsigned int    (*address)(struct cs4231_dma_control *dma_cont);
         void            (*reset)(struct snd_cs4231 *chip); 
-        void            (*preallocate)(struct snd_cs4231 *chip, struct snd_snd_pcm *pcm); 
+        void            (*preallocate)(struct snd_cs4231 *chip, struct snd_pcm *pcm); 
 #ifdef EBUS_SUPPORT
         struct          ebus_dma_info   ebus_info;
 #endif