diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-02-15 04:01:40 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-02-15 04:05:35 -0500 |
commit | ed9d0b626e65ab653e5421083d8dcd59cacd1132 (patch) | |
tree | 68c06150563e68f9609283dc9439e89552281907 /sound/pci/hda/hda_beep.c | |
parent | 115b94d51a3ee1b7dfffa74f77e20cd11da70b91 (diff) |
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.c | 3 |
1 files changed, 1 insertions, 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 @@ | |||
20 | */ | 20 | */ |
21 | 21 | ||
22 | #include <linux/input.h> | 22 | #include <linux/input.h> |
23 | #include <linux/pci.h> | ||
24 | #include <linux/slab.h> | 23 | #include <linux/slab.h> |
25 | #include <linux/workqueue.h> | 24 | #include <linux/workqueue.h> |
26 | #include <linux/export.h> | 25 | #include <linux/export.h> |
@@ -167,7 +166,7 @@ static int snd_hda_do_attach(struct hda_beep *beep) | |||
167 | input_dev->evbit[0] = BIT_MASK(EV_SND); | 166 | input_dev->evbit[0] = BIT_MASK(EV_SND); |
168 | input_dev->sndbit[0] = BIT_MASK(SND_BELL) | BIT_MASK(SND_TONE); | 167 | input_dev->sndbit[0] = BIT_MASK(SND_BELL) | BIT_MASK(SND_TONE); |
169 | input_dev->event = snd_hda_beep_event; | 168 | input_dev->event = snd_hda_beep_event; |
170 | input_dev->dev.parent = &codec->bus->pci->dev; | 169 | input_dev->dev.parent = codec->bus->card->dev; |
171 | input_set_drvdata(input_dev, beep); | 170 | input_set_drvdata(input_dev, beep); |
172 | 171 | ||
173 | err = input_register_device(input_dev); | 172 | err = input_register_device(input_dev); |