git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[ALSA] Remove IRQF_DISABLED for shared PCI irqs
[pandora-kernel.git]
/
Documentation
/
sound
/
alsa
/
DocBook
/
writing-an-alsa-driver.tmpl
diff --git
a/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
b/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
index
635cbb9
..
ccd0a95
100644
(file)
--- a/
Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
+++ b/
Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
@@
-927,7
+927,7
@@
<informalexample>
<programlisting>
<![CDATA[
<informalexample>
<programlisting>
<![CDATA[
- struct mychip *chip =
(struct mychip *)
card->private_data;
+ struct mychip *chip = card->private_data;
]]>
</programlisting>
</informalexample>
]]>
</programlisting>
</informalexample>
@@
-1054,9
+1054,8
@@
<para>
For a device which allows hotplugging, you can use
<para>
For a device which allows hotplugging, you can use
- <function>snd_card_free_in_thread</function>. This one will
- postpone the destruction and wait in a kernel-thread until all
- devices are closed.
+ <function>snd_card_free_when_closed</function>. This one will
+ postpone the destruction until all devices are closed.
</para>
</section>
</para>
</section>
@@
-1096,7
+1095,7
@@
/* release the irq */
if (chip->irq >= 0)
/* release the irq */
if (chip->irq >= 0)
- free_irq(chip->irq,
(void *)
chip);
+ free_irq(chip->irq, chip);
/* release the i/o ports & memory */
pci_release_regions(chip->pci);
/* disable the PCI entry */
/* release the i/o ports & memory */
pci_release_regions(chip->pci);
/* disable the PCI entry */
@@
-1149,7
+1148,7
@@
}
chip->port = pci_resource_start(pci, 0);
if (request_irq(pci->irq, snd_mychip_interrupt,
}
chip->port = pci_resource_start(pci, 0);
if (request_irq(pci->irq, snd_mychip_interrupt,
-
SA_INTERRUPT|SA_SHIRQ
, "My Chip", chip)) {
+
IRQF_SHARED
, "My Chip", chip)) {
printk(KERN_ERR "cannot grab irq %d\n", pci->irq);
snd_mychip_free(chip);
return -EBUSY;
printk(KERN_ERR "cannot grab irq %d\n", pci->irq);
snd_mychip_free(chip);
return -EBUSY;
@@
-1172,7
+1171,7
@@
}
/* PCI IDs */
}
/* 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, },
....
{ PCI_VENDOR_ID_FOO, PCI_DEVICE_ID_BAR,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },
....
@@
-1323,7
+1322,7
@@
<programlisting>
<![CDATA[
if (request_irq(pci->irq, snd_mychip_interrupt,
<programlisting>
<![CDATA[
if (request_irq(pci->irq, snd_mychip_interrupt,
-
SA_INTERRUPT|SA_SHIRQ
, "My Chip", chip)) {
+
IRQF_DISABLED|IRQF_SHARED
, "My Chip", chip)) {
printk(KERN_ERR "cannot grab irq %d\n", pci->irq);
snd_mychip_free(chip);
return -EBUSY;
printk(KERN_ERR "cannot grab irq %d\n", pci->irq);
snd_mychip_free(chip);
return -EBUSY;
@@
-1342,7
+1341,7
@@
<para>
On the PCI bus, the interrupts can be shared. Thus,
<para>
On the PCI bus, the interrupts can be shared. Thus,
- <constant>
SA_SHIRQ
</constant> is given as the interrupt flag of
+ <constant>
IRQF_SHARED
</constant> is given as the interrupt flag of
<function>request_irq()</function>.
</para>
<function>request_irq()</function>.
</para>
@@
-1388,7
+1387,7
@@
<programlisting>
<![CDATA[
if (chip->irq >= 0)
<programlisting>
<![CDATA[
if (chip->irq >= 0)
- free_irq(chip->irq,
(void *)
chip);
+ free_irq(chip->irq, chip);
]]>
</programlisting>
</informalexample>
]]>
</programlisting>
</informalexample>
@@
-1565,7
+1564,7
@@
<informalexample>
<programlisting>
<![CDATA[
<informalexample>
<programlisting>
<![CDATA[
- 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, },
....
{ PCI_VENDOR_ID_FOO, PCI_DEVICE_ID_BAR,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },
....
@@
-3048,7
+3047,7
@@
struct _snd_pcm_runtime {
</para>
<para>
</para>
<para>
- If you aquire a spinlock in the interrupt handler, and the
+ If you a
c
quire a spinlock in the interrupt handler, and the
lock is used in other pcm callbacks, too, then you have to
release the lock before calling
<function>snd_pcm_period_elapsed()</function>, because
lock is used in other pcm callbacks, too, then you have to
release the lock before calling
<function>snd_pcm_period_elapsed()</function>, because
@@
-5487,7
+5486,7
@@
struct _snd_pcm_runtime {
<chapter id="power-management">
<title>Power Management</title>
<para>
<chapter id="power-management">
<title>Power Management</title>
<para>
- If the chip is supposed to work with
with
suspend/resume
+ If the chip is supposed to work with suspend/resume
functions, you need to add the power-management codes to the
driver. The additional codes for the power-management should be
<function>ifdef</function>'ed with
functions, you need to add the power-management codes to the
driver. The additional codes for the power-management should be
<function>ifdef</function>'ed with