summaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/hda_beep.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-02-15 10:01:40 +0100
committerTakashi Iwai <tiwai@suse.de>2014-02-15 10:05:35 +0100
commited9d0b626e65ab653e5421083d8dcd59cacd1132 (patch)
tree68c06150563e68f9609283dc9439e89552281907 /sound/pci/hda/hda_beep.c
parent115b94d51a3ee1b7dfffa74f77e20cd11da70b91 (diff)
downloadop-kernel-dev-ed9d0b626e65ab653e5421083d8dcd59cacd1132.zip
op-kernel-dev-ed9d0b626e65ab653e5421083d8dcd59cacd1132.tar.gz
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 <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_beep.c')
-rw-r--r--sound/pci/hda/hda_beep.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/pci/hda/hda_beep.c b/sound/pci/hda/hda_beep.c
index 0589b39..d8c437a 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);
OpenPOWER on IntegriCloud