staging: rts5139: remove disabled SCSI_SCAN_DELAY code
Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
174b8d9fa3
commit
c377c5006f
|
@ -56,12 +56,6 @@ MODULE_DESCRIPTION(RTS51X_DESC);
|
||||||
MODULE_LICENSE("GPL");
|
MODULE_LICENSE("GPL");
|
||||||
MODULE_VERSION(DRIVER_VERSION);
|
MODULE_VERSION(DRIVER_VERSION);
|
||||||
|
|
||||||
#ifdef SCSI_SCAN_DELAY
|
|
||||||
static unsigned int delay_use = 5;
|
|
||||||
module_param(delay_use, uint, S_IRUGO | S_IWUSR);
|
|
||||||
MODULE_PARM_DESC(delay_use, "seconds to delay before using a new device");
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static int auto_delink_en;
|
static int auto_delink_en;
|
||||||
module_param(auto_delink_en, int, S_IRUGO | S_IWUSR);
|
module_param(auto_delink_en, int, S_IRUGO | S_IWUSR);
|
||||||
MODULE_PARM_DESC(auto_delink_en, "enable auto delink");
|
MODULE_PARM_DESC(auto_delink_en, "enable auto delink");
|
||||||
|
@ -364,11 +358,6 @@ static int rts51x_polling_thread(void *__chip)
|
||||||
{
|
{
|
||||||
struct rts51x_chip *chip = (struct rts51x_chip *)__chip;
|
struct rts51x_chip *chip = (struct rts51x_chip *)__chip;
|
||||||
|
|
||||||
#ifdef SCSI_SCAN_DELAY
|
|
||||||
/* Wait until SCSI scan finished */
|
|
||||||
wait_timeout((delay_use + 5) * HZ);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
for (;;) {
|
for (;;) {
|
||||||
wait_timeout(POLLING_INTERVAL);
|
wait_timeout(POLLING_INTERVAL);
|
||||||
|
|
||||||
|
@ -432,38 +421,6 @@ static int rts51x_polling_thread(void *__chip)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef SCSI_SCAN_DELAY
|
|
||||||
/* Thread to carry out delayed SCSI-device scanning */
|
|
||||||
static int rts51x_scan_thread(void *__chip)
|
|
||||||
{
|
|
||||||
struct rts51x_chip *chip = (struct rts51x_chip *)__chip;
|
|
||||||
|
|
||||||
printk(KERN_DEBUG
|
|
||||||
"rts51x: device found at %d\n", chip->usb->pusb_dev->devnum);
|
|
||||||
|
|
||||||
set_freezable();
|
|
||||||
/* Wait for the timeout to expire or for a disconnect */
|
|
||||||
if (delay_use > 0) {
|
|
||||||
printk(KERN_DEBUG "rts51x: waiting for device "
|
|
||||||
"to settle before scanning\n");
|
|
||||||
wait_event_freezable_timeout(chip->usb->delay_wait,
|
|
||||||
test_bit(FLIDX_DONT_SCAN,
|
|
||||||
&chip->usb->dflags),
|
|
||||||
delay_use * HZ);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* If the device is still connected, perform the scanning */
|
|
||||||
if (!test_bit(FLIDX_DONT_SCAN, &chip->usb->dflags)) {
|
|
||||||
scsi_scan_host(rts51x_to_host(chip));
|
|
||||||
printk(KERN_DEBUG "rts51x: device scan complete\n");
|
|
||||||
|
|
||||||
/* Should we unbind if no devices were detected? */
|
|
||||||
}
|
|
||||||
|
|
||||||
complete_and_exit(&chip->usb->scanning_done, 0);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Associate our private data with the USB device */
|
/* Associate our private data with the USB device */
|
||||||
static int associate_dev(struct rts51x_chip *chip, struct usb_interface *intf)
|
static int associate_dev(struct rts51x_chip *chip, struct usb_interface *intf)
|
||||||
{
|
{
|
||||||
|
@ -737,15 +694,6 @@ static void quiesce_and_remove_host(struct rts51x_chip *chip)
|
||||||
if (rts51x->pusb_dev->state == USB_STATE_NOTATTACHED)
|
if (rts51x->pusb_dev->state == USB_STATE_NOTATTACHED)
|
||||||
set_bit(FLIDX_DISCONNECTING, &rts51x->dflags);
|
set_bit(FLIDX_DISCONNECTING, &rts51x->dflags);
|
||||||
|
|
||||||
#ifdef SCSI_SCAN_DELAY
|
|
||||||
/* Prevent SCSI-scanning (if it hasn't started yet)
|
|
||||||
* and wait for the SCSI-scanning thread to stop.
|
|
||||||
*/
|
|
||||||
set_bit(FLIDX_DONT_SCAN, &rts51x->dflags);
|
|
||||||
wake_up(&rts51x->delay_wait);
|
|
||||||
wait_for_completion(&rts51x->scanning_done);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Removing the host will perform an orderly shutdown: caches
|
/* Removing the host will perform an orderly shutdown: caches
|
||||||
* synchronized, disks spun down, etc.
|
* synchronized, disks spun down, etc.
|
||||||
*/
|
*/
|
||||||
|
@ -757,9 +705,6 @@ static void quiesce_and_remove_host(struct rts51x_chip *chip)
|
||||||
scsi_lock(host);
|
scsi_lock(host);
|
||||||
set_bit(FLIDX_DISCONNECTING, &rts51x->dflags);
|
set_bit(FLIDX_DISCONNECTING, &rts51x->dflags);
|
||||||
scsi_unlock(host);
|
scsi_unlock(host);
|
||||||
#ifdef SCSI_SCAN_DELAY
|
|
||||||
wake_up(&rts51x->delay_wait);
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Second stage of disconnect processing: deallocate all resources */
|
/* Second stage of disconnect processing: deallocate all resources */
|
||||||
|
@ -818,10 +763,6 @@ static int rts51x_probe(struct usb_interface *intf,
|
||||||
init_completion(&rts51x->control_exit);
|
init_completion(&rts51x->control_exit);
|
||||||
init_completion(&rts51x->polling_exit);
|
init_completion(&rts51x->polling_exit);
|
||||||
init_completion(&(rts51x->notify));
|
init_completion(&(rts51x->notify));
|
||||||
#ifdef SCSI_SCAN_DELAY
|
|
||||||
init_waitqueue_head(&rts51x->delay_wait);
|
|
||||||
init_completion(&rts51x->scanning_done);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
chip->usb = rts51x;
|
chip->usb = rts51x;
|
||||||
|
|
||||||
|
@ -855,22 +796,7 @@ static int rts51x_probe(struct usb_interface *intf,
|
||||||
printk(KERN_WARNING RTS51X_TIP "Unable to add the scsi host\n");
|
printk(KERN_WARNING RTS51X_TIP "Unable to add the scsi host\n");
|
||||||
goto BadDevice;
|
goto BadDevice;
|
||||||
}
|
}
|
||||||
#ifdef SCSI_SCAN_DELAY
|
|
||||||
/* Start up the thread for delayed SCSI-device scanning */
|
|
||||||
th = kthread_create(rts51x_scan_thread, chip, RTS51X_SCAN_THREAD);
|
|
||||||
if (IS_ERR(th)) {
|
|
||||||
printk(KERN_WARNING RTS51X_TIP
|
|
||||||
"Unable to start the device-scanning thread\n");
|
|
||||||
complete(&rts51x->scanning_done);
|
|
||||||
quiesce_and_remove_host(chip);
|
|
||||||
result = PTR_ERR(th);
|
|
||||||
goto BadDevice;
|
|
||||||
}
|
|
||||||
|
|
||||||
wake_up_process(th);
|
|
||||||
#else
|
|
||||||
scsi_scan_host(rts51x_to_host(chip));
|
scsi_scan_host(rts51x_to_host(chip));
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Start up our polling thread */
|
/* Start up our polling thread */
|
||||||
th = kthread_run(rts51x_polling_thread, chip, RTS51X_POLLING_THREAD);
|
th = kthread_run(rts51x_polling_thread, chip, RTS51X_POLLING_THREAD);
|
||||||
|
|
|
@ -51,7 +51,6 @@
|
||||||
#define RTS51X_POLLING_THREAD "rts5139-polling"
|
#define RTS51X_POLLING_THREAD "rts5139-polling"
|
||||||
|
|
||||||
#define POLLING_IN_THREAD
|
#define POLLING_IN_THREAD
|
||||||
/* #define SCSI_SCAN_DELAY */
|
|
||||||
#define SUPPORT_FILE_OP
|
#define SUPPORT_FILE_OP
|
||||||
|
|
||||||
#define wait_timeout_x(task_state, msecs) \
|
#define wait_timeout_x(task_state, msecs) \
|
||||||
|
@ -116,10 +115,6 @@ struct rts51x_usb {
|
||||||
struct completion control_exit; /* control thread exit */
|
struct completion control_exit; /* control thread exit */
|
||||||
struct completion polling_exit; /* polling thread exit */
|
struct completion polling_exit; /* polling thread exit */
|
||||||
struct completion notify; /* thread begin/end */
|
struct completion notify; /* thread begin/end */
|
||||||
#ifdef SCSI_SCAN_DELAY
|
|
||||||
wait_queue_head_t delay_wait; /* wait during scan, reset */
|
|
||||||
struct completion scanning_done; /* wait for scan thread */
|
|
||||||
#endif
|
|
||||||
};
|
};
|
||||||
|
|
||||||
extern struct usb_driver rts51x_driver;
|
extern struct usb_driver rts51x_driver;
|
||||||
|
|
Loading…
Reference in New Issue