diff options
| author | Takashi Iwai <tiwai@suse.de> | 2018-05-24 11:20:06 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2018-05-24 11:23:02 +0200 |
| commit | afe5da3eba8796c259e5134872e844436e716f7e (patch) | |
| tree | 34b48e1df3026ae5bd84a0df0cdb17e8d5e9e672 /sound/pci/echoaudio | |
| parent | b6622f573ece9ddbf1d4c6808a6ad564f32b7b47 (diff) | |
| download | linux-next-afe5da3eba8796c259e5134872e844436e716f7e.tar.gz | |
ALSA: echoaudio: Drop superfluous macro
Drop pci_device() macro that just leads to chip->pci->dev, and pass it
directly to request_firmware(). It was introduced for allowing the
external alsa-driver kernel module builds. Since it was discontinued
years ago, we should clean it up now.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/echoaudio')
| -rw-r--r-- | sound/pci/echoaudio/echoaudio.c | 2 | ||||
| -rw-r--r-- | sound/pci/echoaudio/echoaudio.h | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c index 0935a5c8741f..358ef7dcf410 100644 --- a/sound/pci/echoaudio/echoaudio.c +++ b/sound/pci/echoaudio/echoaudio.c @@ -59,7 +59,7 @@ static int get_firmware(const struct firmware **fw_entry, dev_dbg(chip->card->dev, "firmware requested: %s\n", card_fw[fw_index].data); snprintf(name, sizeof(name), "ea/%s", card_fw[fw_index].data); - err = request_firmware(fw_entry, name, pci_device(chip)); + err = request_firmware(fw_entry, name, &chip->pci->dev); if (err < 0) dev_err(chip->card->dev, "get_firmware(): Firmware not available (%d)\n", err); diff --git a/sound/pci/echoaudio/echoaudio.h b/sound/pci/echoaudio/echoaudio.h index 152ce158583c..44b390a667d5 100644 --- a/sound/pci/echoaudio/echoaudio.h +++ b/sound/pci/echoaudio/echoaudio.h @@ -559,10 +559,4 @@ static inline int monitor_index(const struct echoaudio *chip, int out, int in) return out * num_busses_in(chip) + in; } - -#ifndef pci_device -#define pci_device(chip) (&chip->pci->dev) -#endif - - #endif /* _ECHOAUDIO_H_ */ |