The patch titled
Generic AC97 mixer/modem (OSS): use list_for_each_entry
has been removed from the -mm tree. Its filename was
generic-ac97-mixer-modem-oss-use-list_for_each_entry.patch
This patch was dropped because it conflicts with scheduled-oss-driver-removal.patc
------------------------------------------------------
Subject: Generic AC97 mixer/modem (OSS): use list_for_each_entry
From: Matthias Kaehlcke <matthias.kaehlcke@xxxxxxxxx>
Generic AC97 mixer/modem (OSS): Use list_for_each_entry instead of
list_for_each
Signed-off-by: Matthias Kaehlcke <matthias.kaehlcke@xxxxxxxxx>
Cc: Jaroslav Kysela <perex@xxxxxxx>
Cc: Takashi Iwai <tiwai@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
sound/oss/ac97_codec.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff -puN sound/oss/ac97_codec.c~generic-ac97-mixer-modem-oss-use-list_for_each_entry sound/oss/ac97_codec.c
--- a/sound/oss/ac97_codec.c~generic-ac97-mixer-modem-oss-use-list_for_each_entry
+++ a/sound/oss/ac97_codec.c
@@ -815,7 +815,6 @@ int ac97_probe_codec(struct ac97_codec *
int i;
char cidbuf[CODEC_ID_BUFSZ];
u16 f;
- struct list_head *l;
struct ac97_driver *d;
/* wait for codec-ready state */
@@ -891,8 +890,7 @@ int ac97_probe_codec(struct ac97_codec *
mutex_lock(&codec_mutex);
list_add(&codec->list, &codecs);
- list_for_each(l, &codec_drivers) {
- d = list_entry(l, struct ac97_driver, list);
+ list_for_each_entry(d, &codec_drivers, list) {
if ((codec->model ^ d->codec_id) & d->codec_mask)
continue;
if(d->probe(codec, d) == 0)
@@ -1400,14 +1398,12 @@ EXPORT_SYMBOL(ac97_set_adc_rate);
static int swap_headphone(int remove_master)
{
- struct list_head *l;
struct ac97_codec *c;
if (remove_master) {
mutex_lock(&codec_mutex);
- list_for_each(l, &codecs)
+ list_for_each_entry(c, &codecs, list)
{
- c = list_entry(l, struct ac97_codec, list);
if (supported_mixer(c, SOUND_MIXER_PHONEOUT))
c->supported_mixers &= ~SOUND_MASK_PHONEOUT;
}
_
Patches currently in -mm which might be from matthias.kaehlcke@xxxxxxxxx are
origin.patch
generic-ac97-mixer-modem-oss-use-list_for_each_entry.patch
git-hwmon.patch
megaraid-sas-convert-aen_mutex-to-the-mutex-api.patch
prism54-convert-mgmt_sem-to-the-mutex-api.patch
parallel-port-convert-port_mutex-to-the-mutex-api.patch
parallel-port-convert-port_mutex-to-the-mutex-api-checkpatch-fixes.patch
mbcs-convert-algolock-to-mutex.patch
mbcs-convert-dmawritelock-to-mutex.patch
mbcs-convert-dmareadlock-to-mutex.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
