mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-30 08:02:30 +00:00
Code Issues Releases Wiki Activity

Staging: sst: Construct fw string name runtime

Browse source 
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>
This commit is contained in:
Vinod Koul 2010-11-22 10:33:40 +00:00 committed by Greg Kroah-Hartman
parent 964c6975e8
commit 79a35ad573
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/staging/intel_sst/intel_sst_common.h
View file

@ -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 {

11
drivers/staging/intel_sst/intel_sst_drv_interface.c
View file

@ -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) {