[PATCH] mixart cleanups

* check result of pci_set_dma_mask() instead of looking at pci_dma_supported()
* size_t => %zd

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c
index 1ebce6404b9b7e56ad9b6c4908b2eeec12e856fc..9dff42a1986739673416b805ec12f9d8d80b0da6 100644 (file)
--- a/sound/pci/mixart/mixart.c
+++ b/sound/pci/mixart/mixart.c
@@ -620,7 +620,10 @@ static int snd_mixart_hw_params(snd_pcm_substream_t *subs,
                bufferinfo[i].available_length = subs->runtime->dma_bytes;
                /* bufferinfo[i].buffer_id  is already defined */
 
-               snd_printdd("snd_mixart_hw_params(pcm %d) : dma_addr(%x) dma_bytes(%x) subs-number(%d)\n", i, subs->runtime->dma_addr, subs->runtime->dma_bytes, subs->number);
+               snd_printdd("snd_mixart_hw_params(pcm %d) : dma_addr(%x) dma_bytes(%x) subs-number(%d)\n", i,
+                               bufferinfo[i].buffer_address,
+                               bufferinfo[i].available_length,
+                               subs->number);
        }
        up(&mgr->setup_mutex);
 
@@ -1288,11 +1291,10 @@ static int __devinit snd_mixart_probe(struct pci_dev *pci,
        pci_set_master(pci);
 
        /* check if we can restrict PCI DMA transfers to 32 bits */
-       if (!pci_dma_supported(pci, 0xffffffff)) {
+       if (pci_set_dma_mask(pci, 0xffffffff) < 0) {
                snd_printk(KERN_ERR "architecture does not support 32bit PCI busmaster DMA\n");
                return -ENXIO;
        }
-       pci_set_dma_mask(pci, 0xffffffff);
 
        /*
         */

diff --git a/sound/pci/mixart/mixart_core.c b/sound/pci/mixart/mixart_core.c
index ce92a143b124cb228892c76c411b63c51b4bcb93..1f588eeb824a3571cf6ea10e08427e53997b516f 100644 (file)
--- a/sound/pci/mixart/mixart_core.c
+++ b/sound/pci/mixart/mixart_core.c
@@ -379,7 +379,7 @@ void snd_mixart_msg_tasklet( unsigned long arg)
                                        snd_printk(KERN_ERR "tasklet : error MSG_STREAM_ST***_***PUT_STAGE_PACKET status=%x\n", mixart_msg_data[0]);
                                break;
                        default:
-                               snd_printdd("tasklet received mf(%x) : msg_id(%x) uid(%x, %x) size(%d)\n",
+                               snd_printdd("tasklet received mf(%x) : msg_id(%x) uid(%x, %x) size(%zd)\n",
                                           msg, resp.message_id, resp.uid.object_id, resp.uid.desc, resp.size);
                                break;
                        }