Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

staging rtl8192e: Declare MODULE_FIRMWARE usage

Cc: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Mike McCormack <mikem@ring3k.org>
Cc: wlanfae <wlanfae@realtek.com>
Cc: Sean MacLennan <seanm@seanm.ca>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Sean MacLennan <seanm@seanm.ca>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Tim Gardner and committed by
Greg Kroah-Hartman
7f34f412 1deef918

+12 -4
+5 -4
drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
··· 265 265 case FW_SOURCE_IMG_FILE: 266 266 { 267 267 if (pfirmware->firmware_buf_size[init_step] == 0) { 268 - const char *fw_name[3] = { "RTL8192E/boot.img", 269 - "RTL8192E/main.img", 270 - "RTL8192E/data.img" 271 - }; 268 + const char *fw_name[3] = { 269 + RTL8192E_BOOT_IMG_FW, 270 + RTL8192E_MAIN_IMG_FW, 271 + RTL8192E_DATA_IMG_FW 272 + }; 272 273 const struct firmware *fw_entry; 273 274 int rc; 274 275 rc = request_firmware(&fw_entry,
+4
drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.h
··· 23 23 24 24 #define GET_COMMAND_PACKET_FRAG_THRESHOLD(v) (4*(v/4) - 8) 25 25 26 + #define RTL8192E_BOOT_IMG_FW "RTL8192E/boot.img" 27 + #define RTL8192E_MAIN_IMG_FW "RTL8192E/main.img" 28 + #define RTL8192E_DATA_IMG_FW "RTL8192E/data.img" 29 + 26 30 enum firmware_init_step { 27 31 FW_INIT_STEP0_BOOT = 0, 28 32 FW_INIT_STEP1_MAIN = 1,
+3
drivers/staging/rtl8192e/rtl8192e/rtl_core.c
··· 3125 3125 MODULE_AUTHOR(DRV_COPYRIGHT " " DRV_AUTHOR); 3126 3126 MODULE_VERSION(DRV_VERSION); 3127 3127 MODULE_LICENSE("GPL"); 3128 + MODULE_FIRMWARE(RTL8192E_BOOT_IMG_FW); 3129 + MODULE_FIRMWARE(RTL8192E_MAIN_IMG_FW); 3130 + MODULE_FIRMWARE(RTL8192E_DATA_IMG_FW); 3128 3131 3129 3132 module_param(ifname, charp, S_IRUGO|S_IWUSR); 3130 3133 module_param(hwwep, int, S_IRUGO|S_IWUSR);