mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
staging: vt6656: Remove PIPEnsControlOutAsyn/CONTROLnsRequestOutAsyn
This now the same as PIPEnsControlOut. Replace with PIPEnsControlOut/CONTROLnsRequestOut. Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
0fb2af353f
commit
3136b5fee2
5 changed files with 2 additions and 45 deletions
|
@ -36,9 +36,6 @@
|
|||
#define CONTROLnsRequestOut(Device, Request, Value, Index, Length, Buffer) \
|
||||
PIPEnsControlOut(Device, Request, Value, Index, Length, Buffer)
|
||||
|
||||
#define CONTROLnsRequestOutAsyn(Device, Request, Value, Index, Length, Buffer) \
|
||||
PIPEnsControlOutAsyn(Device, Request, Value, Index, Length, Buffer)
|
||||
|
||||
#define CONTROLnsRequestIn(Device, Request, Value, Index, Length, Buffer) \
|
||||
PIPEnsControlIn(Device, Request, Value, Index, Length, Buffer)
|
||||
|
||||
|
|
|
@ -71,7 +71,7 @@ int FIRMWAREbDownload(struct vnt_private *pDevice)
|
|||
wLength = min_t(int, fw->size - ii, FIRMWARE_CHUNK_SIZE);
|
||||
memcpy(pBuffer, fw->data + ii, wLength);
|
||||
|
||||
NdisStatus = CONTROLnsRequestOutAsyn(pDevice,
|
||||
NdisStatus = CONTROLnsRequestOut(pDevice,
|
||||
0,
|
||||
0x1200+ii,
|
||||
0x0000,
|
||||
|
|
|
@ -75,7 +75,7 @@ void MACvWriteMultiAddr(struct vnt_private *pDevice, u64 mc_filter)
|
|||
*/
|
||||
void MACbShutdown(struct vnt_private *pDevice)
|
||||
{
|
||||
CONTROLnsRequestOutAsyn(pDevice,
|
||||
CONTROLnsRequestOut(pDevice,
|
||||
MESSAGE_TYPE_MACSHUTDOWN,
|
||||
0,
|
||||
0,
|
||||
|
|
|
@ -64,44 +64,6 @@ static void s_nsInterruptUsbIoCompleteRead(struct urb *urb);
|
|||
static void s_nsBulkInUsbIoCompleteRead(struct urb *urb);
|
||||
static void s_nsBulkOutIoCompleteWrite(struct urb *urb);
|
||||
|
||||
int PIPEnsControlOutAsyn(struct vnt_private *pDevice, u8 byRequest,
|
||||
u16 wValue, u16 wIndex, u16 wLength, u8 *pbyBuffer)
|
||||
{
|
||||
int ntStatus;
|
||||
|
||||
if (pDevice->Flags & fMP_DISCONNECTED)
|
||||
return STATUS_FAILURE;
|
||||
|
||||
if (in_interrupt()) {
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"in_interrupt return ..byRequest %x\n", byRequest);
|
||||
return STATUS_FAILURE;
|
||||
}
|
||||
|
||||
mutex_lock(&pDevice->usb_lock);
|
||||
|
||||
ntStatus = usb_control_msg(
|
||||
pDevice->usb,
|
||||
usb_sndctrlpipe(pDevice->usb , 0),
|
||||
byRequest,
|
||||
0x40, // RequestType
|
||||
wValue,
|
||||
wIndex,
|
||||
(void *) pbyBuffer,
|
||||
wLength,
|
||||
HZ
|
||||
);
|
||||
if (ntStatus >= 0) {
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"usb_sndctrlpipe ntStatus= %d\n", ntStatus);
|
||||
ntStatus = 0;
|
||||
} else {
|
||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"usb_sndctrlpipe fail, ntStatus= %d\n", ntStatus);
|
||||
}
|
||||
|
||||
mutex_unlock(&pDevice->usb_lock);
|
||||
|
||||
return ntStatus;
|
||||
}
|
||||
|
||||
int PIPEnsControlOut(struct vnt_private *pDevice, u8 byRequest, u16 wValue,
|
||||
u16 wIndex, u16 wLength, u8 *pbyBuffer)
|
||||
{
|
||||
|
|
|
@ -34,8 +34,6 @@
|
|||
|
||||
int PIPEnsControlOut(struct vnt_private *, u8 byRequest, u16 wValue,
|
||||
u16 wIndex, u16 wLength, u8 *pbyBuffer);
|
||||
int PIPEnsControlOutAsyn(struct vnt_private *, u8 byRequest,
|
||||
u16 wValue, u16 wIndex, u16 wLength, u8 *pbyBuffer);
|
||||
int PIPEnsControlIn(struct vnt_private *, u8 byRequest, u16 wValue,
|
||||
u16 wIndex, u16 wLength, u8 *pbyBuffer);
|
||||
|
||||
|
|
Loading…
Reference in a new issue