diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2014-02-15 10:01:40 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-02-15 10:05:35 +0100 |
| commit | ed9d0b626e65ab653e5421083d8dcd59cacd1132 (patch) | |
| tree | 68c06150563e68f9609283dc9439e89552281907 /sound/pci/hda/hda_beep.c | |
| parent | ALSA: ak4117: Do not free priv until timer handler hasn't actually stopped using it (diff) | |
| download | linux-dev-ed9d0b626e65ab653e5421083d8dcd59cacd1132.tar.xz linux-dev-ed9d0b626e65ab653e5421083d8dcd59cacd1132.zip | |
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 @@ */ #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); |