Commit aafcd2f7 authored by David Woodhouse's avatar David Woodhouse Committed by David Woodhouse
Browse files

ueagle-atm: treat firmware data as const 



Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
parent 2f0600b6

drivers/usb/atm/ueagle-atm.c

+11 −9
Original line number Diff line number Diff line
@@ -579,7 +579,7 @@ MODULE_PARM_DESC(annex, 
 * uea_send_modem_cmd - Send a command for pre-firmware devices.

 */

static int uea_send_modem_cmd(struct usb_device *usb,

		u16 addr, u16 size, u8 * buff)

			      u16 addr, u16 size, const u8 *buff)

{

	int ret = -ENOMEM;

	u8 *xfer_buff;
@@ -604,7 +604,8 @@ static int uea_send_modem_cmd(struct usb_device *usb, 
static void uea_upload_pre_firmware(const struct firmware *fw_entry, void *context)

{

	struct usb_device *usb = context;

	u8 *pfw, value;

	const u8 *pfw;

	u8 value;

	u32 crc = 0;

	int ret, size;
@@ -720,7 +721,7 @@ static int uea_load_firmware(struct usb_device *usb, unsigned int ver) 
/*

 * Make sure that the DSP code provided is safe to use.

 */

static int check_dsp_e1(u8 *dsp, unsigned int len)

static int check_dsp_e1(const u8 *dsp, unsigned int len)

{

	u8 pagecount, blockcount;

	u16 blocksize;
@@ -771,7 +772,7 @@ static int check_dsp_e1(u8 *dsp, unsigned int len) 
	return 0;

}



static int check_dsp_e4(u8 *dsp, int len)

static int check_dsp_e4(const u8 *dsp, int len)

{

	int i;

	struct l1_code *p = (struct l1_code *) dsp;
@@ -819,7 +820,7 @@ static int check_dsp_e4(u8 *dsp, int len) 
/*

 * send data to the idma pipe

 * */

static int uea_idma_write(struct uea_softc *sc, void *data, u32 size)

static int uea_idma_write(struct uea_softc *sc, const void *data, u32 size)

{

	int ret = -ENOMEM;

	u8 *xfer_buff;
@@ -903,7 +904,7 @@ static void uea_load_page_e1(struct work_struct *work) 
	u16 ovl = sc->ovl;

	struct block_info_e1 bi;



	u8 *p;

	const u8 *p;

	u8 pagecount, blockcount;

	u16 blockaddr, blocksize;

	u32 pageoffset;
@@ -986,7 +987,7 @@ static void __uea_load_page_e4(struct uea_softc *sc, u8 pageno, int boot) 
	bi.wReserved = cpu_to_be16(UEA_RESERVED);



	do {

		u8 *blockoffset;

		const u8 *blockoffset;

		unsigned int blocksize;



		blockidx = &p->page_header[blockno];
@@ -1095,7 +1096,7 @@ static inline int wait_cmv_ack(struct uea_softc *sc) 
#define UCDC_SEND_ENCAPSULATED_COMMAND 0x00



static int uea_request(struct uea_softc *sc,

		u16 value, u16 index, u16 size, void *data)

		u16 value, u16 index, u16 size, const void *data)

{

	u8 *xfer_buff;

	int ret = -ENOMEM;
@@ -1891,7 +1892,8 @@ static int load_XILINX_firmware(struct uea_softc *sc) 
{

	const struct firmware *fw_entry;

	int ret, size, u, ln;

	u8 *pfw, value;

	const u8 *pfw;

	u8 value;

	char *fw_name = FW_DIR "930-fpga.bin";



	uea_enters(INS_TO_USBDEV(sc));