All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/3] ALSA: hda - Remove dependency on bus->pci in hda_beep.c
@ 2014-02-15  9:17 Takashi Iwai
  2014-02-15  9:17 ` [PATCH 2/3] ALSA: hda/realtek - Allow NULL bus->pci Takashi Iwai
                   ` (2 more replies)
  0 siblings, 3 replies; 14+ messages in thread
From: Takashi Iwai @ 2014-02-15  9:17 UTC (permalink / raw)
  To: alsa-devel

The default parent device can be obtained directly via card object, so
we don't need to rely on pci->dev.parent.  Since there is no access to
pci_dev, we can reduce the inclusion of linux/pci.h, too.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 sound/pci/hda/hda_beep.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sound/pci/hda/hda_beep.c b/sound/pci/hda/hda_beep.c
index 0589b39cda6e..d8c437a94559 100644
--- a/sound/pci/hda/hda_beep.c
+++ b/sound/pci/hda/hda_beep.c
@@ -20,7 +20,6 @@
  */
 
 #include <linux/input.h>
-#include <linux/pci.h>
 #include <linux/slab.h>
 #include <linux/workqueue.h>
 #include <linux/export.h>
@@ -167,7 +166,7 @@ static int snd_hda_do_attach(struct hda_beep *beep)
 	input_dev->evbit[0] = BIT_MASK(EV_SND);
 	input_dev->sndbit[0] = BIT_MASK(SND_BELL) | BIT_MASK(SND_TONE);
 	input_dev->event = snd_hda_beep_event;
-	input_dev->dev.parent = &codec->bus->pci->dev;
+	input_dev->dev.parent = codec->bus->card->dev;
 	input_set_drvdata(input_dev, beep);
 
 	err = input_register_device(input_dev);
-- 
1.8.5.2

^ permalink raw reply	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2014-02-27 20:41 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-02-15  9:17 [PATCH 1/3] ALSA: hda - Remove dependency on bus->pci in hda_beep.c Takashi Iwai
2014-02-15  9:17 ` [PATCH 2/3] ALSA: hda/realtek - Allow NULL bus->pci Takashi Iwai
2014-02-15  9:17 ` [PATCH 3/3] ALSA: hda - Remove superfluous inclusion of linux/pci.h Takashi Iwai
2014-02-15  9:22 ` [PATCH 1/3] ALSA: hda - Remove dependency on bus->pci in hda_beep.c Takashi Iwai
2014-02-18 18:04   ` Stephen Warren
2014-02-18 18:20     ` Dylan Reid
2014-02-19  8:33     ` Takashi Iwai
2014-02-19 15:16       ` Dylan Reid
2014-02-27 12:03         ` Takashi Iwai
2014-02-27 16:44           ` Dylan Reid
2014-02-27 16:57             ` Takashi Iwai
2014-02-27 17:32               ` Dylan Reid
2014-02-27 20:10                 ` Takashi Iwai
2014-02-27 20:41                   ` Dylan Reid

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.