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>

diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c
index 0935a5c8741fdd292b390ec53622a1abafef873e..358ef7dcf4105f2a20666d4da87362ba0af2e0db 100644 (file)
--- 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 152ce158583cfd88a23f476ba8711ffcb88629db..44b390a667d5428a74b50faafc598dc929de2bad 100644 (file)
--- 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_ */