Skip to contentSkip to conversation

ALSA: Add #ifdef CONFIG_PCI guard for snd_pci_quirk_* functions

PATCH Applied Axel Lin 2 participants 2 messages Jan 30, 2012 Sound

lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH v2 1/1 ALSA: Add #ifdef CONFIG_PCI guard for snd_pci_quirk_* functions

This fixes below build warning when CONFIG_PCI is not set.

CC sound/sound_core.o
In file included from sound/sound_core.c:15:
include/sound/core.h:454: warning: 'struct pci_dev' declared inside parameter list include/sound/core.h:454: warning: its scope is only this definition or declaration, which is probably not what you want

---
v2:
begin the ifdef including the definition of struct snd_pci_quirk.

 include/sound/core.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
include/sound/core.h +2 -0
index 5ab255f..cea1b54 100644
@@ -417,6 +417,7 @@ static inline int __snd_bug_on(int cond)
 #define gameport_get_port_data(gp) (gp)->port_data
 #endif
 
+#ifdef CONFIG_PCI
 /* PCI quirk list helper */
 struct snd_pci_quirk {
 	unsigned short subvendor;	/* PCI subvendor ID */
@@ -456,5 +457,6 @@ snd_pci_quirk_lookup(struct pci_dev *pci, const struct snd_pci_quirk *list);
 const struct snd_pci_quirk *
 snd_pci_quirk_lookup_id(u16 vendor, u16 device,
 			const struct snd_pci_quirk *list);
+#endif
 
 #endif /* __SOUND_CORE_H */
Signature · 1 line
1.7.5.4
Applied
#1 lore raw

At Mon, 30 Jan 2012 17:10:58 +0800,

Quoted 9 lines · Axel Lin

This fixes below build warning when CONFIG_PCI is not set.

CC sound/sound_core.o
In file included from sound/sound_core.c:15:
include/sound/core.h:454: warning: 'struct pci_dev' declared inside parameter list include/sound/core.h:454: warning: its scope is only this definition or declaration, which is probably not what you want

Thanks, applied now.

Takashi

Quoted 31 lines

---
v2:
begin the ifdef including the definition of struct snd_pci_quirk.

 include/sound/core.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
include/sound/core.h +2 -0
index 5ab255f..cea1b54 100644
@@ -417,6 +417,7 @@ static inline int __snd_bug_on(int cond)
 #define gameport_get_port_data(gp) (gp)->port_data
 #endif
 
+#ifdef CONFIG_PCI
 /* PCI quirk list helper */
 struct snd_pci_quirk {
 	unsigned short subvendor;	/* PCI subvendor ID */
@@ -456,5 +457,6 @@ snd_pci_quirk_lookup(struct pci_dev *pci, const struct snd_pci_quirk *list);
 const struct snd_pci_quirk *
 snd_pci_quirk_lookup_id(u16 vendor, u16 device,
 			const struct snd_pci_quirk *list);
+#endif
 
 #endif /* __SOUND_CORE_H */
Signature · 1 line
1.7.5.4