Commit cf62fffa authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds

[PATCH] mixart cleanups

* check result of pci_set_dma_mask() instead of looking at pci_dma_supported()
* size_t => %zd
Signed-off-by: default avatarAl Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 479bab4f
...@@ -620,7 +620,10 @@ static int snd_mixart_hw_params(snd_pcm_substream_t *subs, ...@@ -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].available_length = subs->runtime->dma_bytes;
/* bufferinfo[i].buffer_id is already defined */ /* 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); up(&mgr->setup_mutex);
...@@ -1288,11 +1291,10 @@ static int __devinit snd_mixart_probe(struct pci_dev *pci, ...@@ -1288,11 +1291,10 @@ static int __devinit snd_mixart_probe(struct pci_dev *pci,
pci_set_master(pci); pci_set_master(pci);
/* check if we can restrict PCI DMA transfers to 32 bits */ /* 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"); snd_printk(KERN_ERR "architecture does not support 32bit PCI busmaster DMA\n");
return -ENXIO; return -ENXIO;
} }
pci_set_dma_mask(pci, 0xffffffff);
/* /*
*/ */
......
...@@ -379,7 +379,7 @@ void snd_mixart_msg_tasklet( unsigned long arg) ...@@ -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]); snd_printk(KERN_ERR "tasklet : error MSG_STREAM_ST***_***PUT_STAGE_PACKET status=%x\n", mixart_msg_data[0]);
break; break;
default: 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); msg, resp.message_id, resp.uid.object_id, resp.uid.desc, resp.size);
break; break;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment