Staging: sst: Construct fw string name runtime

The firmware name for each platform is appended by PCI id of device.
This patch makes use of pci id to construct the string rather than
hardcode the string.

Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/intel_sst/intel_sst_common.h b/drivers/staging/intel_sst/intel_sst_common.h
index a828824..e0c6339 100644 (file)
--- a/drivers/staging/intel_sst/intel_sst_common.h
+++ b/drivers/staging/intel_sst/intel_sst_common.h
@@ -33,10 +33,9 @@
 
 /* driver names */
 #define SST_DRV_NAME "intel_sst_driver"
-#define SST_FW_FILENAME_MRST "fw_sst_080a.bin"
-#define SST_FW_FILENAME_MFLD "fw_sst_082f.bin"
 #define SST_MRST_PCI_ID 0x080A
 #define SST_MFLD_PCI_ID 0x082F
+#define PCI_ID_LENGTH 4
 #define SST_SUSPEND_DELAY 2000
 
 enum sst_states {

diff --git a/drivers/staging/intel_sst/intel_sst_drv_interface.c b/drivers/staging/intel_sst/intel_sst_drv_interface.c
index f91c914..ea8e251 100644 (file)
--- a/drivers/staging/intel_sst/intel_sst_drv_interface.c
+++ b/drivers/staging/intel_sst/intel_sst_drv_interface.c
@@ -48,13 +48,14 @@ int sst_download_fw(void)
 {
        int retval;
        const struct firmware *fw_sst;
-       const char *name;
+       char name[20];
+
        if (sst_drv_ctx->sst_state != SST_UN_INIT)
                return -EPERM;
-       if (sst_drv_ctx->pci_id == SST_MRST_PCI_ID)
-               name = SST_FW_FILENAME_MRST;
-       else
-               name = SST_FW_FILENAME_MFLD;
+
+       snprintf(name, sizeof(name), "%s%04x%s", "fw_sst_",
+                                       sst_drv_ctx->pci_id, ".bin");
+
        pr_debug("Downloading %s FW now...\n", name);
        retval = request_firmware(&fw_sst, name, &sst_drv_ctx->pci->dev);
        if (retval) {