[PATCH] The scheduled removal of some OSS drivers
This patch contains the scheduled removal of OSS drivers that: - have ALSA drivers for the same hardware without known regressions and - whose Kconfig options have been removed in 2.6.17. [michal.k.k.piotrowski@gmail.com: build fix] Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Michal Piotrowski <michal.k.k.piotrowski@gmail.com> Cc: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:

committed by
Linus Torvalds

parent
595182bcdf
commit
d56b9b9c46
@@ -1399,95 +1399,6 @@ unsigned int ac97_set_adc_rate(struct ac97_codec *codec, unsigned int rate)
|
||||
|
||||
EXPORT_SYMBOL(ac97_set_adc_rate);
|
||||
|
||||
int ac97_save_state(struct ac97_codec *codec)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL(ac97_save_state);
|
||||
|
||||
int ac97_restore_state(struct ac97_codec *codec)
|
||||
{
|
||||
int i;
|
||||
unsigned int left, right, val;
|
||||
|
||||
for (i = 0; i < SOUND_MIXER_NRDEVICES; i++) {
|
||||
if (!supported_mixer(codec, i))
|
||||
continue;
|
||||
|
||||
val = codec->mixer_state[i];
|
||||
right = val >> 8;
|
||||
left = val & 0xff;
|
||||
codec->write_mixer(codec, i, left, right);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL(ac97_restore_state);
|
||||
|
||||
/**
|
||||
* ac97_register_driver - register a codec helper
|
||||
* @driver: Driver handler
|
||||
*
|
||||
* Register a handler for codecs matching the codec id. The handler
|
||||
* attach function is called for all present codecs and will be
|
||||
* called when new codecs are discovered.
|
||||
*/
|
||||
|
||||
int ac97_register_driver(struct ac97_driver *driver)
|
||||
{
|
||||
struct list_head *l;
|
||||
struct ac97_codec *c;
|
||||
|
||||
mutex_lock(&codec_mutex);
|
||||
INIT_LIST_HEAD(&driver->list);
|
||||
list_add(&driver->list, &codec_drivers);
|
||||
|
||||
list_for_each(l, &codecs)
|
||||
{
|
||||
c = list_entry(l, struct ac97_codec, list);
|
||||
if(c->driver != NULL || ((c->model ^ driver->codec_id) & driver->codec_mask))
|
||||
continue;
|
||||
if(driver->probe(c, driver))
|
||||
continue;
|
||||
c->driver = driver;
|
||||
}
|
||||
mutex_unlock(&codec_mutex);
|
||||
return 0;
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL_GPL(ac97_register_driver);
|
||||
|
||||
/**
|
||||
* ac97_unregister_driver - unregister a codec helper
|
||||
* @driver: Driver handler
|
||||
*
|
||||
* Unregister a handler for codecs matching the codec id. The handler
|
||||
* remove function is called for all matching codecs.
|
||||
*/
|
||||
|
||||
void ac97_unregister_driver(struct ac97_driver *driver)
|
||||
{
|
||||
struct list_head *l;
|
||||
struct ac97_codec *c;
|
||||
|
||||
mutex_lock(&codec_mutex);
|
||||
list_del_init(&driver->list);
|
||||
|
||||
list_for_each(l, &codecs)
|
||||
{
|
||||
c = list_entry(l, struct ac97_codec, list);
|
||||
if (c->driver == driver) {
|
||||
driver->remove(c, driver);
|
||||
c->driver = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
mutex_unlock(&codec_mutex);
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL_GPL(ac97_unregister_driver);
|
||||
|
||||
static int swap_headphone(int remove_master)
|
||||
{
|
||||
struct list_head *l;
|
||||
|
Reference in New Issue
Block a user