diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-07-21 08:55:14 +0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-07-21 08:55:14 +0400 |
| commit | 908cf4b925e419bc74f3297b2f0e51d6f8a81da2 (patch) | |
| tree | 6c2da79366d4695a9c2560ab18259eca8a2a25b4 /drivers/usb/atm | |
| parent | 92c49890922d54cba4b1eadeb0b185773c2c9570 (diff) | |
| parent | 14b395e35d1afdd8019d11b92e28041fad591b71 (diff) | |
| download | linux-908cf4b925e419bc74f3297b2f0e51d6f8a81da2.tar.xz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next
Diffstat (limited to 'drivers/usb/atm')
| -rw-r--r-- | drivers/usb/atm/cxacru.c | 2 | ||||
| -rw-r--r-- | drivers/usb/atm/ueagle-atm.c | 20 |
2 files changed, 12 insertions, 10 deletions
diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c index 5ea3093bc40f..90583d6a5949 100644 --- a/drivers/usb/atm/cxacru.c +++ b/drivers/usb/atm/cxacru.c @@ -820,7 +820,7 @@ reschedule: } static int cxacru_fw(struct usb_device *usb_dev, enum cxacru_fw_request fw, - u8 code1, u8 code2, u32 addr, u8 *data, int size) + u8 code1, u8 code2, u32 addr, const u8 *data, int size) { int ret; u8 *buf; diff --git a/drivers/usb/atm/ueagle-atm.c b/drivers/usb/atm/ueagle-atm.c index 5f71ff3aee35..cb01b5106efd 100644 --- a/drivers/usb/atm/ueagle-atm.c +++ b/drivers/usb/atm/ueagle-atm.c @@ -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)); |