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

firmware: atm/ueagle-atm: prepare for FIRMWARE_NAME_MAX removal

We're going to remove the FIRMWARE_NAME_MAX definition in order to avoid any
firmware name length restriction.
This patch replaces the shared FIRMWARE_NAME_MAX definition with a ueagle
local one.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Cc: Damien Bergamini <damien.bergamini@free.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

authored by

Samuel Ortiz and committed by
Greg Kroah-Hartman
ade901d7 976821d7

+5 -4
+5 -4
drivers/usb/atm/ueagle-atm.c
··· 306 306 #define FW_GET_BYTE(p) *((__u8 *) (p)) 307 307 308 308 #define FW_DIR "ueagle-atm/" 309 + #define UEA_FW_NAME_MAX 30 309 310 #define NB_MODEM 4 310 311 311 312 #define BULK_TIMEOUT 300 ··· 1565 1564 file = cmv_file[sc->modem_index]; 1566 1565 1567 1566 strcpy(cmv_name, FW_DIR); 1568 - strlcat(cmv_name, file, FIRMWARE_NAME_MAX); 1567 + strlcat(cmv_name, file, UEA_FW_NAME_MAX); 1569 1568 if (ver == 2) 1570 - strlcat(cmv_name, ".v2", FIRMWARE_NAME_MAX); 1569 + strlcat(cmv_name, ".v2", UEA_FW_NAME_MAX); 1571 1570 } 1572 1571 1573 1572 static int request_cmvs_old(struct uea_softc *sc, ··· 1575 1574 { 1576 1575 int ret, size; 1577 1576 u8 *data; 1578 - char cmv_name[FIRMWARE_NAME_MAX]; /* 30 bytes stack variable */ 1577 + char cmv_name[UEA_FW_NAME_MAX]; /* 30 bytes stack variable */ 1579 1578 1580 1579 cmvs_file_name(sc, cmv_name, 1); 1581 1580 ret = request_firmware(fw, cmv_name, &sc->usb_dev->dev); ··· 1609 1608 int ret, size; 1610 1609 u32 crc; 1611 1610 u8 *data; 1612 - char cmv_name[FIRMWARE_NAME_MAX]; /* 30 bytes stack variable */ 1611 + char cmv_name[UEA_FW_NAME_MAX]; /* 30 bytes stack variable */ 1613 1612 1614 1613 cmvs_file_name(sc, cmv_name, 2); 1615 1614 ret = request_firmware(fw, cmv_name, &sc->usb_dev->dev);