Re: [PATCH 13/49] Staging: w35und: remove usb_submit_urb wrapperfunction

From: Pavel Machek
Date: Wed Oct 29 2008 - 19:08:27 EST


On Wed 2008-10-29 15:39:40, Greg KH wrote:
> From: Greg Kroah-Hartman <gregkh@xxxxxxx>
>
> No need for a simple wrapper here.
>
> Cc: Pekka Enberg <penberg@xxxxxxxxxxxxxx>
> Cc: Pavel Machek <pavel@xxxxxxx>

ACK.

> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
> ---
> drivers/staging/winbond/linux/wb35reg.c | 2 +-
> drivers/staging/winbond/linux/wb35rx.c | 2 +-
> drivers/staging/winbond/linux/wb35tx.c | 4 ++--
> drivers/staging/winbond/linux/wbusb_f.h | 1 -
> 4 files changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/staging/winbond/linux/wb35reg.c b/drivers/staging/winbond/linux/wb35reg.c
> index 041be81..c2864b1 100644
> --- a/drivers/staging/winbond/linux/wb35reg.c
> +++ b/drivers/staging/winbond/linux/wb35reg.c
> @@ -434,7 +434,7 @@ Wb35Reg_EP0VM(phw_data_t pHwData )
>
> reg->EP0vm_state = VM_RUNNING;
>
> - ret = wb_usb_submit_urb( urb );
> + ret = usb_submit_urb(urb, GFP_ATOMIC);
>
> if (ret < 0) {
> #ifdef _PE_REG_DUMP_
> diff --git a/drivers/staging/winbond/linux/wb35rx.c b/drivers/staging/winbond/linux/wb35rx.c
> index ae91b62..e565746 100644
> --- a/drivers/staging/winbond/linux/wb35rx.c
> +++ b/drivers/staging/winbond/linux/wb35rx.c
> @@ -70,7 +70,7 @@ void Wb35Rx( phw_data_t pHwData )
>
> pWb35Rx->EP3vm_state = VM_RUNNING;
>
> - retv = wb_usb_submit_urb(urb);
> + retv = usb_submit_urb(urb, GFP_ATOMIC);
>
> if (retv != 0) {
> printk("Rx URB sending error\n");
> diff --git a/drivers/staging/winbond/linux/wb35tx.c b/drivers/staging/winbond/linux/wb35tx.c
> index 3c40e31..c54ef30 100644
> --- a/drivers/staging/winbond/linux/wb35tx.c
> +++ b/drivers/staging/winbond/linux/wb35tx.c
> @@ -65,7 +65,7 @@ void Wb35Tx(phw_data_t pHwData)
> Wb35Tx_complete, pHwData);
>
> pWb35Tx->EP4vm_state = VM_RUNNING;
> - retv = wb_usb_submit_urb( pUrb );
> + retv = usb_submit_urb(pUrb, GFP_ATOMIC);
> if (retv<0) {
> printk("EP4 Tx Irp sending error\n");
> goto cleanup;
> @@ -240,7 +240,7 @@ void Wb35Tx_EP2VM(phw_data_t pHwData)
> pltmp, MAX_INTERRUPT_LENGTH, Wb35Tx_EP2VM_complete, pHwData, 32);
>
> pWb35Tx->EP2vm_state = VM_RUNNING;
> - retv = wb_usb_submit_urb( pUrb );
> + retv = usb_submit_urb(pUrb, GFP_ATOMIC);
>
> if (retv < 0) {
> #ifdef _PE_TX_DUMP_
> diff --git a/drivers/staging/winbond/linux/wbusb_f.h b/drivers/staging/winbond/linux/wbusb_f.h
> index 5a811f6..db47e1d 100644
> --- a/drivers/staging/winbond/linux/wbusb_f.h
> +++ b/drivers/staging/winbond/linux/wbusb_f.h
> @@ -16,7 +16,6 @@ void WbUsb_destroy(phw_data_t pHwData);
> unsigned char WbWLanInitialize(struct wb35_adapter *adapter);
> #define WbUsb_Stop( _A )
>
> -#define wb_usb_submit_urb(_A) usb_submit_urb(_A, GFP_ATOMIC)
> #define wb_usb_alloc_urb(_A) usb_alloc_urb(_A, GFP_ATOMIC)
>
> #define WbUsb_CheckForHang( _P )

--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/