Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit afe5da3e authored by Takashi Iwai's avatar Takashi Iwai
Browse files

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: default avatarTakashi Iwai <tiwai@suse.de>
parent b6622f57

sound/pci/echoaudio/echoaudio.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

sound/pci/echoaudio/echoaudio.h

+0 −6
Original line number Diff line number Diff line
@@ -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_ */