From: Joe Perches <joe@perches.com>
Date: Sun, 12 Jun 2011 20:02:43 +0000 (-0700)
Subject: ALSA: hda - Fix beep_device compilation warnings
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=2308f4add3de9f6c9c9f02e49461e94d84bb200a;p=deliverable%2Flinux.git

ALSA: hda - Fix beep_device compilation warnings

Using static inline functions can reduce compilation messages
and macro misuse.

 sound/pci/hda/patch_conexant.c: In function ‘patch_cxt5045’:
 sound/pci/hda/patch_conexant.c:1232:3: warning: statement with no effect

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/sound/pci/hda/hda_beep.h b/sound/pci/hda/hda_beep.h
index f1de1bac042c..4967eabe774e 100644
--- a/sound/pci/hda/hda_beep.h
+++ b/sound/pci/hda/hda_beep.h
@@ -50,7 +50,12 @@ int snd_hda_enable_beep_device(struct hda_codec *codec, int enable);
 int snd_hda_attach_beep_device(struct hda_codec *codec, int nid);
 void snd_hda_detach_beep_device(struct hda_codec *codec);
 #else
-#define snd_hda_attach_beep_device(...)		0
-#define snd_hda_detach_beep_device(...)
+static inline int snd_hda_attach_beep_device(struct hda_codec *codec, int nid)
+{
+	return 0;
+}
+void snd_hda_detach_beep_device(struct hda_codec *codec)
+{
+}
 #endif
 #endif