diff options
author | Andres More <more.andres@gmail.com> | 2010-07-12 12:47:47 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-07-22 14:42:27 -0400 |
commit | 68746744b123045228a860bfb9fa21ae4688be01 (patch) | |
tree | ad10ef268c087b38d81a86d9e839b62f8b1bac54 | |
parent | e1669ed0d4424f406120e9d8fad8a9935bce340c (diff) |
staging: vt6656: removed Safe_Close definition
Removed an always defined macro, perhaps used to patch the driver
Signed-off-by: Andres More <more.andres@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/staging/vt6656/iwctl.c | 30 | ||||
-rw-r--r-- | drivers/staging/vt6656/ttype.h | 5 | ||||
-rw-r--r-- | drivers/staging/vt6656/usbpipe.c | 18 |
3 files changed, 3 insertions, 50 deletions
diff --git a/drivers/staging/vt6656/iwctl.c b/drivers/staging/vt6656/iwctl.c index 67db85a19d1..384ce511e25 100644 --- a/drivers/staging/vt6656/iwctl.c +++ b/drivers/staging/vt6656/iwctl.c | |||
@@ -115,18 +115,9 @@ static int iwctl_commit(struct net_device *dev, | |||
115 | void *wrq, | 115 | void *wrq, |
116 | char *extra) | 116 | char *extra) |
117 | { | 117 | { |
118 | //2008-0409-02, <Mark> by Einsn Liu | 118 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWCOMMIT\n"); |
119 | /* | ||
120 | #ifdef Safe_Close | ||
121 | PSDevice pDevice = (PSDevice)netdev_priv(dev); | ||
122 | if (!(pDevice->flags & DEVICE_FLAGS_OPENED)) | ||
123 | return -EINVAL; | ||
124 | #endif | ||
125 | */ | ||
126 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWCOMMIT \n"); | ||
127 | 119 | ||
128 | return 0; | 120 | return 0; |
129 | |||
130 | } | 121 | } |
131 | 122 | ||
132 | /* | 123 | /* |
@@ -255,14 +246,7 @@ int iwctl_giwscan(struct net_device *dev, | |||
255 | long ldBm; | 246 | long ldBm; |
256 | char buf[MAX_WPA_IE_LEN * 2 + 30]; | 247 | char buf[MAX_WPA_IE_LEN * 2 + 30]; |
257 | 248 | ||
258 | //2008-0409-02, <Mark> by Einsn Liu | 249 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWSCAN\n"); |
259 | /* | ||
260 | #ifdef Safe_Close | ||
261 | if (!(pDevice->flags & DEVICE_FLAGS_OPENED)) | ||
262 | return -EINVAL; | ||
263 | #endif | ||
264 | */ | ||
265 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWSCAN \n"); | ||
266 | 250 | ||
267 | if (pMgmt->eScanState == WMAC_IS_SCANNING) { | 251 | if (pMgmt->eScanState == WMAC_IS_SCANNING) { |
268 | // In scanning.. | 252 | // In scanning.. |
@@ -583,16 +567,8 @@ int iwctl_giwrange(struct net_device *dev, | |||
583 | struct iw_range *range = (struct iw_range *) extra; | 567 | struct iw_range *range = (struct iw_range *) extra; |
584 | int i,k; | 568 | int i,k; |
585 | BYTE abySupportedRates[13]= {0x02, 0x04, 0x0B, 0x16, 0x0c, 0x12, 0x18, 0x24, 0x30, 0x48, 0x60, 0x6C, 0x90}; | 569 | BYTE abySupportedRates[13]= {0x02, 0x04, 0x0B, 0x16, 0x0c, 0x12, 0x18, 0x24, 0x30, 0x48, 0x60, 0x6C, 0x90}; |
586 | //2008-0409-02, <Mark> by Einsn Liu | ||
587 | /* | ||
588 | #ifdef Safe_Close | ||
589 | PSDevice pDevice = (PSDevice)netdev_priv(dev); | ||
590 | if (!(pDevice->flags & DEVICE_FLAGS_OPENED)) | ||
591 | return -EINVAL; | ||
592 | #endif | ||
593 | */ | ||
594 | 570 | ||
595 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWRANGE \n"); | 571 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWRANGE\n"); |
596 | if (wrq->pointer) { | 572 | if (wrq->pointer) { |
597 | wrq->length = sizeof(struct iw_range); | 573 | wrq->length = sizeof(struct iw_range); |
598 | memset(range, 0, sizeof(struct iw_range)); | 574 | memset(range, 0, sizeof(struct iw_range)); |
diff --git a/drivers/staging/vt6656/ttype.h b/drivers/staging/vt6656/ttype.h index 342577314c3..a9f4a16d823 100644 --- a/drivers/staging/vt6656/ttype.h +++ b/drivers/staging/vt6656/ttype.h | |||
@@ -31,11 +31,6 @@ | |||
31 | 31 | ||
32 | /******* Common definitions and typedefs ***********************************/ | 32 | /******* Common definitions and typedefs ***********************************/ |
33 | 33 | ||
34 | //2007-0814-01<Add>by MikeLiu | ||
35 | #ifndef Safe_Close | ||
36 | #define Safe_Close | ||
37 | #endif | ||
38 | |||
39 | //2008-0131-02<Add>by MikeLiu | 34 | //2008-0131-02<Add>by MikeLiu |
40 | #ifndef Adhoc_STA | 35 | #ifndef Adhoc_STA |
41 | #define Adhoc_STA | 36 | #define Adhoc_STA |
diff --git a/drivers/staging/vt6656/usbpipe.c b/drivers/staging/vt6656/usbpipe.c index 8c7b3afe44a..bb79ccf3953 100644 --- a/drivers/staging/vt6656/usbpipe.c +++ b/drivers/staging/vt6656/usbpipe.c | |||
@@ -381,18 +381,6 @@ PIPEnsInterruptRead( | |||
381 | // Now that we have created the urb, we will send a | 381 | // Now that we have created the urb, we will send a |
382 | // request to the USB device object. | 382 | // request to the USB device object. |
383 | // | 383 | // |
384 | #ifndef Safe_Close | ||
385 | usb_fill_int_urb(pDevice->pInterruptURB, | ||
386 | pDevice->usb, | ||
387 | usb_rcvintpipe(pDevice->usb, 1), | ||
388 | (void *) pDevice->intBuf.pDataBuf, | ||
389 | MAX_INTERRUPT_SIZE, | ||
390 | s_nsInterruptUsbIoCompleteRead, | ||
391 | pDevice, | ||
392 | pDevice->int_interval | ||
393 | ); | ||
394 | #else | ||
395 | |||
396 | pDevice->pInterruptURB->interval = pDevice->int_interval; | 384 | pDevice->pInterruptURB->interval = pDevice->int_interval; |
397 | 385 | ||
398 | usb_fill_bulk_urb(pDevice->pInterruptURB, | 386 | usb_fill_bulk_urb(pDevice->pInterruptURB, |
@@ -402,7 +390,6 @@ usb_fill_bulk_urb(pDevice->pInterruptURB, | |||
402 | MAX_INTERRUPT_SIZE, | 390 | MAX_INTERRUPT_SIZE, |
403 | s_nsInterruptUsbIoCompleteRead, | 391 | s_nsInterruptUsbIoCompleteRead, |
404 | pDevice); | 392 | pDevice); |
405 | #endif | ||
406 | 393 | ||
407 | ntStatus = usb_submit_urb(pDevice->pInterruptURB, GFP_ATOMIC); | 394 | ntStatus = usb_submit_urb(pDevice->pInterruptURB, GFP_ATOMIC); |
408 | if (ntStatus != 0) { | 395 | if (ntStatus != 0) { |
@@ -483,7 +470,6 @@ s_nsInterruptUsbIoCompleteRead( | |||
483 | 470 | ||
484 | 471 | ||
485 | if (pDevice->fKillEventPollingThread != TRUE) { | 472 | if (pDevice->fKillEventPollingThread != TRUE) { |
486 | #ifdef Safe_Close | ||
487 | usb_fill_bulk_urb(pDevice->pInterruptURB, | 473 | usb_fill_bulk_urb(pDevice->pInterruptURB, |
488 | pDevice->usb, | 474 | pDevice->usb, |
489 | usb_rcvbulkpipe(pDevice->usb, 1), | 475 | usb_rcvbulkpipe(pDevice->usb, 1), |
@@ -496,10 +482,6 @@ s_nsInterruptUsbIoCompleteRead( | |||
496 | if (ntStatus != 0) { | 482 | if (ntStatus != 0) { |
497 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Submit int URB failed %d\n", ntStatus); | 483 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Submit int URB failed %d\n", ntStatus); |
498 | } | 484 | } |
499 | |||
500 | #else | ||
501 | tasklet_schedule(&pDevice->EventWorkItem); | ||
502 | #endif | ||
503 | } | 485 | } |
504 | // | 486 | // |
505 | // We return STATUS_MORE_PROCESSING_REQUIRED so that the completion | 487 | // We return STATUS_MORE_PROCESSING_REQUIRED so that the completion |