aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2005-10-14 11:17:02 -0400
committerJaroslav Kysela <perex@suse.cz>2005-11-04 07:18:51 -0500
commit063859c854fcb42a04eec4e20c71885dc121edce (patch)
treee7d37f6c60986cbd8b7e86dd4d7d450d5b72b26b
parent6b172a853814fe52fb4d5942e660943cb9e6df37 (diff)
[ALSA] Remove obsolete chip_t
Modules: Documentation,MIPS AU1x00 driver,PPC Beep,SPARC DBRI driver Removed the use of chip_t, which was obsoleted. Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl3
-rw-r--r--sound/mips/au1x00.c2
-rw-r--r--sound/ppc/beep.c2
-rw-r--r--sound/sparc/dbri.c5
4 files changed, 2 insertions, 10 deletions
diff --git a/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl b/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
index 05ae29ac898c..260334c98d95 100644
--- a/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
+++ b/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
@@ -3693,8 +3693,7 @@ struct _snd_pcm_runtime {
3693 <para> 3693 <para>
3694 Here, the chip instance is retrieved via 3694 Here, the chip instance is retrieved via
3695 <function>snd_kcontrol_chip()</function> macro. This macro 3695 <function>snd_kcontrol_chip()</function> macro. This macro
3696 converts from kcontrol-&gt;private_data to the type defined by 3696 just accesses to kcontrol-&gt;private_data. The
3697 <type>chip_t</type>. The
3698 kcontrol-&gt;private_data field is 3697 kcontrol-&gt;private_data field is
3699 given as the argument of <function>snd_ctl_new()</function> 3698 given as the argument of <function>snd_ctl_new()</function>
3700 (see the later subsection 3699 (see the later subsection
diff --git a/sound/mips/au1x00.c b/sound/mips/au1x00.c
index b7af85f5bfb4..2df78a64c7f2 100644
--- a/sound/mips/au1x00.c
+++ b/sound/mips/au1x00.c
@@ -57,8 +57,6 @@ MODULE_CLASSES("{sound}");
57MODULE_DEVICES("{{AMD,Au1000 AC'97}}"); 57MODULE_DEVICES("{{AMD,Au1000 AC'97}}");
58#endif 58#endif
59 59
60#define chip_t au1000_t
61
62#define PLAYBACK 0 60#define PLAYBACK 0
63#define CAPTURE 1 61#define CAPTURE 1
64#define AC97_SLOT_3 0x01 62#define AC97_SLOT_3 0x01
diff --git a/sound/ppc/beep.c b/sound/ppc/beep.c
index 1681ee13efbb..d4ec6cc3f1c5 100644
--- a/sound/ppc/beep.c
+++ b/sound/ppc/beep.c
@@ -171,8 +171,6 @@ static int snd_pmac_beep_event(struct input_dev *dev, unsigned int type, unsigne
171 * beep volume mixer 171 * beep volume mixer
172 */ 172 */
173 173
174#define chip_t pmac_t
175
176static int snd_pmac_info_beep(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo) 174static int snd_pmac_info_beep(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
177{ 175{
178 uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; 176 uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c
index b5c4c15ae7f0..59a771294709 100644
--- a/sound/sparc/dbri.c
+++ b/sound/sparc/dbri.c
@@ -343,9 +343,6 @@ typedef struct snd_dbri {
343 struct snd_dbri *next; 343 struct snd_dbri *next;
344} snd_dbri_t; 344} snd_dbri_t;
345 345
346/* Needed for the ALSA macros to work */
347#define chip_t snd_dbri_t
348
349#define DBRI_MAX_VOLUME 63 /* Output volume */ 346#define DBRI_MAX_VOLUME 63 /* Output volume */
350#define DBRI_MAX_GAIN 15 /* Input gain */ 347#define DBRI_MAX_GAIN 15 /* Input gain */
351#define DBRI_RIGHT_BALANCE 255 348#define DBRI_RIGHT_BALANCE 255
@@ -1767,7 +1764,7 @@ play:
1767 spin_unlock_irqrestore(&dbri->lock, flags); 1764 spin_unlock_irqrestore(&dbri->lock, flags);
1768} 1765}
1769 1766
1770DECLARE_TASKLET(xmit_descs_task, xmit_descs, 0); 1767static DECLARE_TASKLET(xmit_descs_task, xmit_descs, 0);
1771 1768
1772/* transmission_complete_intr() 1769/* transmission_complete_intr()
1773 * 1770 *