X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Documentation%2Fsound%2Falsa%2FDocBook%2Fwriting-an-alsa-driver.tmpl;h=4251085d38d3a173981867092bf23cc77cb9a8f7;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=1faf76383babd26875c9e5d303685a29c6096531;hpb=f7ed79d23a47594e7834d66a8f14449796d4f3e6;p=linux-2.6.git
diff --git a/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl b/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
index 1faf76383..4251085d3 100644
--- a/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
+++ b/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
@@ -1123,8 +1123,8 @@
if ((err = pci_enable_device(pci)) < 0)
return err;
/* check PCI availability (28bit DMA) */
- if (pci_set_dma_mask(pci, DMA_28BIT_MASK) < 0 ||
- pci_set_consistent_dma_mask(pci, DMA_28BIT_MASK) < 0) {
+ if (pci_set_dma_mask(pci, 0x0fffffff) < 0 ||
+ pci_set_consistent_dma_mask(pci, 0x0fffffff) < 0) {
printk(KERN_ERR "error to set 28bit mask DMA\n");
pci_disable_device(pci);
return -ENXIO;
@@ -1172,7 +1172,7 @@
}
/* PCI IDs */
- static struct pci_device_id snd_mychip_ids[] __devinitdata = {
+ static struct pci_device_id snd_mychip_ids[] = {
{ PCI_VENDOR_ID_FOO, PCI_DEVICE_ID_BAR,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },
....
@@ -1216,7 +1216,7 @@
The allocation of PCI resources is done in the
probe() function, and usually an extra
xxx_create() function is written for this
- purpose.
+ purpose.
@@ -1225,7 +1225,7 @@
allocating resources. Also, you need to set the proper PCI DMA
mask to limit the accessed i/o range. In some cases, you might
need to call pci_set_master() function,
- too.
+ too.
@@ -1236,8 +1236,8 @@
Now assume that this PCI device has an I/O port with 8 bytes
and an interrupt. Then struct mychip will have the
- following fields:
+ following fields:
@@ -1565,7 +1565,7 @@
format);
mychip_set_sample_rate(chip, runtime->rate);
mychip_set_channels(chip, runtime->channels);
- mychip_set_dma_setup(chip, runtime->dma_addr,
+ mychip_set_dma_setup(chip, runtime->dma_area,
chip->buffer_size,
chip->period_size);
return 0;
@@ -2836,7 +2836,7 @@ struct _snd_pcm_runtime {
Note that this callback became non-atomic since the recent version.
- You can use schedule-related functions safely in this callback now.
+ You can use schedule-related fucntions safely in this callback now.
@@ -3388,7 +3388,7 @@ struct _snd_pcm_runtime {
.name = "PCM Playback Switch",
.index = 0,
.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
- .private_value = 0xffff,
+ .private_values = 0xffff,
.info = my_control_info,
.get = my_control_get,
.put = my_control_put
@@ -3449,7 +3449,7 @@ struct _snd_pcm_runtime {
- The private_value field contains
+ The private_values field contains
an arbitrary long integer value for this record. When using
generic info,
get and