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>

1 files changed, 5 insertions, 4 deletions

diff --git a/drivers/usb/atm/ueagle-atm.c b/drivers/usb/atm/ueagle-atm.c
index 9cf9ff69e3e3..d171b563e94c 100644
--- a/drivers/usb/atm/ueagle-atm.c
+++ b/drivers/usb/atm/ueagle-atm.c
@@ -306,6 +306,7 @@ enum {
 #define FW_GET_BYTE(p)  *((__u8 *) (p))
 
 #define FW_DIR "ueagle-atm/"
+#define UEA_FW_NAME_MAX 30
 #define NB_MODEM 4
 
 #define BULK_TIMEOUT 300
@@ -1564,9 +1565,9 @@ static void cmvs_file_name(struct uea_softc *sc, char *const cmv_name, int ver)
                 file = cmv_file[sc->modem_index];
 
         strcpy(cmv_name, FW_DIR);
-        strlcat(cmv_name, file, FIRMWARE_NAME_MAX);
+        strlcat(cmv_name, file, UEA_FW_NAME_MAX);
         if (ver == 2)
-                strlcat(cmv_name, ".v2", FIRMWARE_NAME_MAX);
+                strlcat(cmv_name, ".v2", UEA_FW_NAME_MAX);
 }
 
 static int request_cmvs_old(struct uea_softc *sc,
@@ -1574,7 +1575,7 @@ static int request_cmvs_old(struct uea_softc *sc,
 {
         int ret, size;
         u8 *data;
-        char cmv_name[FIRMWARE_NAME_MAX]; /* 30 bytes stack variable */
+        char cmv_name[UEA_FW_NAME_MAX]; /* 30 bytes stack variable */
 
         cmvs_file_name(sc, cmv_name, 1);
         ret = request_firmware(fw, cmv_name, &sc->usb_dev->dev);
@@ -1608,7 +1609,7 @@ static int request_cmvs(struct uea_softc *sc,
         int ret, size;
         u32 crc;
         u8 *data;
-        char cmv_name[FIRMWARE_NAME_MAX]; /* 30 bytes stack variable */
+        char cmv_name[UEA_FW_NAME_MAX]; /* 30 bytes stack variable */
 
         cmvs_file_name(sc, cmv_name, 2);
         ret = request_firmware(fw, cmv_name, &sc->usb_dev->dev);