From: Takashi Iwai Date: Sat, 15 Feb 2014 09:01:40 +0000 (+0100) Subject: ALSA: hda - Remove dependency on bus->pci in hda_beep.c X-Git-Tag: next-20140306~54^2~52 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ed9d0b626e65ab653e5421083d8dcd59cacd1132;p=karo-tx-linux.git ALSA: hda - Remove dependency on bus->pci in hda_beep.c 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 --- 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 -#include #include #include #include @@ -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);