redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

Staging: w35und: Kill struct wb_usb 

This patch kills struct wb_usb which now only contains a pointer to  struct
usb_device.

Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
wifi-calibration
Pekka Enberg 2010-11-28 23:00:08 +02:00 committed by Greg Kroah-Hartman
parent 9be98819d3
commit 2894c6cd0e
6 changed files with 13 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/staging/winbond/wb35reg.c
View File

@ -139,8 +139,8 @@ unsigned char Wb35Reg_WriteSync(struct hw_data *pHwData, u16 RegisterNo, u32 Reg
/* Sync IoCallDriver */
reg->EP0vm_state = VM_RUNNING;
ret = usb_control_msg(pHwData->WbUsb.udev,
usb_sndctrlpipe(pHwData->WbUsb.udev, 0),
ret = usb_control_msg(pHwData->udev,
usb_sndctrlpipe(pHwData->udev, 0),
0x03, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT,
0x0, RegisterNo, &RegisterValue, 4, HZ * 100);
reg->EP0vm_state = VM_STOP;
@ -302,8 +302,8 @@ unsigned char Wb35Reg_ReadSync(struct hw_data *pHwData, u16 RegisterNo, u32 *pRe
msleep(10);
reg->EP0vm_state = VM_RUNNING;
ret = usb_control_msg(pHwData->WbUsb.udev,
usb_rcvctrlpipe(pHwData->WbUsb.udev, 0),
ret = usb_control_msg(pHwData->udev,
usb_rcvctrlpipe(pHwData->udev, 0),
0x01, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_IN,
0x0, RegisterNo, pltmp, 4, HZ * 100);
@ -427,8 +427,8 @@ void Wb35Reg_EP0VM(struct hw_data *pHwData)
if (reg_queue->DIRECT == 1) /* output */
pBuffer = &reg_queue->VALUE;
usb_fill_control_urb(urb, pHwData->WbUsb.udev,
REG_DIRECTION(pHwData->WbUsb.udev, reg_queue),
usb_fill_control_urb(urb, pHwData->udev,
REG_DIRECTION(pHwData->udev, reg_queue),
(u8 *)dr, pBuffer, cpu_to_le16(dr->wLength),
Wb35Reg_EP0VM_complete, (void *)pHwData);

4
drivers/staging/winbond/wb35rx.c
View File

@ -260,8 +260,8 @@ static void Wb35Rx(struct ieee80211_hw *hw)
}
pRxBufferAddress = pWb35Rx->pDRx;
usb_fill_bulk_urb(urb, pHwData->WbUsb.udev,
usb_rcvbulkpipe(pHwData->WbUsb.udev, 3),
usb_fill_bulk_urb(urb, pHwData->udev,
usb_rcvbulkpipe(pHwData->udev, 3),
pRxBufferAddress, MAX_USB_RX_BUFFER,
Wb35Rx_Complete, hw);

6
drivers/staging/winbond/wb35tx.c
View File

@ -88,8 +88,8 @@ static void Wb35Tx(struct wbsoft_priv *adapter)
//
// Issuing URB
//
usb_fill_bulk_urb(pUrb, pHwData->WbUsb.udev,
usb_sndbulkpipe(pHwData->WbUsb.udev, 4),
usb_fill_bulk_urb(pUrb, pHwData->udev,
usb_sndbulkpipe(pHwData->udev, 4),
pTxBufferAddress, pMds->TxBufferSize[ SendIndex ],
Wb35Tx_complete, adapter);
@ -265,7 +265,7 @@ static void Wb35Tx_EP2VM(struct wbsoft_priv *adapter)
//
// Issuing URB
//
usb_fill_int_urb( pUrb, pHwData->WbUsb.udev, usb_rcvintpipe(pHwData->WbUsb.udev,2),
usb_fill_int_urb( pUrb, pHwData->udev, usb_rcvintpipe(pHwData->udev,2),
pltmp, MAX_INTERRUPT_LENGTH, Wb35Tx_EP2VM_complete, adapter, 32);
pWb35Tx->EP2vm_state = VM_RUNNING;

3
drivers/staging/winbond/wbhal.h
View File

@ -356,7 +356,6 @@ struct txvga_for_50 {
* ==============================================
*/
#include "wbusb_s.h"
#include "wb35reg_s.h"
#include "wb35tx_s.h"
#include "wb35rx_s.h"
@ -437,7 +436,7 @@ struct hw_data {
* Variable for each module
* ==================================================
*/
struct wb_usb WbUsb; /* Need WbUsb.h */
struct usb_device *udev;
struct wb35_reg reg; /* Need Wb35Reg.h */
struct wb35_tx Wb35Tx; /* Need Wb35Tx.h */
struct wb35_rx Wb35Rx; /* Need Wb35Rx.h */

4
drivers/staging/winbond/wbusb.c
View File

@ -747,7 +747,6 @@ static int wb35_probe(struct usb_interface *intf,
struct usb_host_interface *interface;
struct ieee80211_hw *dev;
struct wbsoft_priv *priv;
struct wb_usb *pWbUsb;
int nr, err;
u32 ltmp;
@ -778,8 +777,7 @@ static int wb35_probe(struct usb_interface *intf,
priv = dev->priv;
pWbUsb = &priv->sHwData.WbUsb;
pWbUsb->udev = udev;
priv->sHwData.udev = udev;
interface = intf->cur_altsetting;
endpoint = &interface->endpoint[0].desc;

16
drivers/staging/winbond/wbusb_s.h
View File

@ -1,16 +0,0 @@
/* =========================================================
* Copyright (c) 1996-2004 Winbond Electronic Corporation
*
* Module Name:
* wbusb_s.h
* =========================================================
*/
#ifndef __WINBOND_WBUSB_S_H
#define __WINBOND_WBUSB_S_H
#include <linux/types.h>
struct wb_usb {
struct usb_device *udev;
};
#endif