hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Takashi Iwai 2018-05-24 11:20:06 +02:00
parent b6622f573e
commit afe5da3eba
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/pci/echoaudio/echoaudio.c
View File

@ -59,7 +59,7 @@ static int get_firmware(const struct firmware **fw_entry,
dev_dbg(chip->card->dev, dev_dbg(chip->card->dev,
"firmware requested: %s\n", card_fw[fw_index].data); "firmware requested: %s\n", card_fw[fw_index].data);
snprintf(name, sizeof(name), "ea/%s", 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) if (err < 0)
dev_err(chip->card->dev, dev_err(chip->card->dev,
"get_firmware(): Firmware not available (%d)\n", err); "get_firmware(): Firmware not available (%d)\n", err);

6
sound/pci/echoaudio/echoaudio.h
View File

@ -559,10 +559,4 @@ static inline int monitor_index(const struct echoaudio *chip, int out, int in)
return out * num_busses_in(chip) + in; return out * num_busses_in(chip) + in;
} }
#ifndef pci_device
#define pci_device(chip) (&chip->pci->dev)
#endif
#endif /* _ECHOAUDIO_H_ */ #endif /* _ECHOAUDIO_H_ */