Krzysztof Helt | 19 Aug 21:50
Favicon

[PATCH] opl3sa2: replace nd_opl3sa2_info_xxx() with snd_wss_info_xxx()

From: Krzysztof Helt <krzysztof.h1 <at> wp.pl>

Replace snd_opl3sa2_info_xxx() with snd_wss_info_xxx().
Drop check of card->private_data which cannot be NULL
if card is not NULL (spotted by Rene Herman).

Signed-off-by: Krzysztof Helt <krzysztof.h1 <at> wp.pl>
---

diff -urp linux-ref/sound/isa/opl3sa2.c linux-2.6/sound/isa/opl3sa2.c
--- linux-ref/sound/isa/opl3sa2.c	2008-08-20 21:19:04.000000000 +0200
+++ linux-2.6/sound/isa/opl3sa2.c	2008-08-20 21:19:29.000000000 +0200
@@ -300,7 +300,7 @@ static irqreturn_t snd_opl3sa2_interrupt
 	struct snd_opl3sa2 *chip;
 	int handled = 0;

-	if (card == NULL || card->private_data == NULL)
+	if (card == NULL)
 		return IRQ_NONE;

 	chip = card->private_data;
@@ -338,29 +338,18 @@ static irqreturn_t snd_opl3sa2_interrupt

 #define OPL3SA2_SINGLE(xname, xindex, reg, shift, mask, invert) \
 { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
-  .info = snd_opl3sa2_info_single, \
+  .info = snd_wss_info_single, \
   .get = snd_opl3sa2_get_single, .put = snd_opl3sa2_put_single, \
   .private_value = reg | (shift << 8) | (mask << 16) | (invert << 24) }
 #define OPL3SA2_SINGLE_TLV(xname, xindex, reg, shift, mask, invert, xtlv) \
(Continue reading)

Rene Herman | 19 Aug 22:44

Re: [PATCH] opl3sa2: replace nd_opl3sa2_info_xxx() with snd_wss_info_xxx()

On 19-08-08 21:51, Krzysztof Helt wrote:

> From: Krzysztof Helt <krzysztof.h1 <at> wp.pl>
> 
> Replace snd_opl3sa2_info_xxx() with snd_wss_info_xxx().
> Drop check of card->private_data which cannot be NULL
> if card is not NULL (spotted by Rene Herman).
> 
> Signed-off-by: Krzysztof Helt <krzysztof.h1 <at> wp.pl>

Reviewed-by: Rene Herman <rene.herman <at> gmail.com>

Rene.
Takashi Iwai | 20 Aug 10:40
Favicon

Re: [PATCH] opl3sa2: replace nd_opl3sa2_info_xxx() with snd_wss_info_xxx()

At Tue, 19 Aug 2008 21:51:49 +0200,
Krzysztof Helt wrote:
> 
> From: Krzysztof Helt <krzysztof.h1 <at> wp.pl>
> 
> Replace snd_opl3sa2_info_xxx() with snd_wss_info_xxx().
> Drop check of card->private_data which cannot be NULL
> if card is not NULL (spotted by Rene Herman).
> 
> Signed-off-by: Krzysztof Helt <krzysztof.h1 <at> wp.pl>

Applied now (with Rene's reviewed-by).  Thanks.

Takashi

Gmane