Randy --
Go ahead an apply this patch. Not all of the new messages are accurate,
but they're close enough for government work. :) I'll fix them in a later
patch.
Matt
On Sun, 26 Mar 2000, Pavel Machek wrote:
> Hi!
>
> I did this to clean up usb-storage a bit. It *might* make it work
> better in backport, if someone can test that easily, please do that.
>
> Randy, this cleans things up, and should do no harm. Please apply.
>
> Pavel
>
> --- clean/drivers/usb/usb-storage.c Sat Mar 25 22:47:36 2000
> +++ linux/drivers/usb/usb-storage.c Sun Mar 26 22:22:02 2000
> @@ -1174,6 +1187,7 @@
> /* FIXME: This doesn't actually abort anything */
> static int us_abort( Scsi_Cmnd *srb )
> {
> + printk(KERN_CRIT "usb-storage: abort() requested but not implemented\n" );
> return 0;
> }
>
> @@ -1182,6 +1196,7 @@
> {
> struct us_data *us = (struct us_data *)srb->host->hostdata[0];
>
> + printk(KERN_CRIT "usb-storage: bus_reset() requested but not implemented\n" );
> US_DEBUGP("Bus reset requested\n");
> if (us->ip_wanted)
> up(&(us->ip_waitq));
> @@ -1192,6 +1207,7 @@
> /* FIXME: This doesn't actually reset anything */
> static int us_host_reset( Scsi_Cmnd *srb )
> {
> + printk(KERN_CRIT "usb-storage: host_reset() requested but not implemented\n" );
> return 0;
> }
>
> @@ -1298,36 +1314,27 @@
> */
>
> static Scsi_Host_Template my_host_template = {
> - NULL, /* next */
> - NULL, /* module */
> - NULL, /* proc_dir */
> - usb_stor_proc_info,
> - NULL, /* name - points to unique */
> - us_detect,
> - us_release,
> - NULL, /* info */
> - NULL, /* ioctl */
> - us_command,
> - us_queuecommand,
> - NULL, /* eh_strategy */
> - us_abort,
> - us_bus_reset,
> - us_bus_reset,
> - us_host_reset,
> - NULL, /* abort */
> - NULL, /* reset */
> - NULL, /* slave_attach */
> - NULL, /* bios_param */
> - NULL, /* select_queue_depths */
> - 1, /* can_queue */
> - -1, /* this_id */
> - SG_ALL, /* sg_tablesize */
> - 1, /* cmd_per_lun */
> - 0, /* present */
> - FALSE, /* unchecked_isa_dma */
> - TRUE, /* use_clustering */
> - TRUE, /* use_new_eh_code */
> - TRUE /* emulated */
> + proc_info: usb_stor_proc_info,
> + detect: us_detect,
> + release: us_release,
> + command: us_command,
> + queuecommand: us_queuecommand,
> +
> + eh_abort_handler: us_abort,
> + eh_device_reset_handler:us_bus_reset,
> + eh_bus_reset_handler: us_bus_reset,
> + eh_host_reset_handler: us_host_reset,
> +
> + can_queue: 1,
> + this_id: -1,
> +
> + sg_tablesize: SG_ALL,
> + cmd_per_lun: 1,
> + present: 0,
> + unchecked_isa_dma: FALSE,
> + use_clustering: TRUE,
> + use_new_eh_code: TRUE,
> + emulated: TRUE,
> };
>
> static unsigned char sense_notready[] = {
> @@ -1795,7 +1802,7 @@
> down(&(ss->notify));
>
> /* now register - our detect function will be called */
> - ss->htmplt.module = &__this_module;
> + ss->htmplt.module = THIS_MODULE;
> scsi_register_module(MODULE_SCSI_HA, &(ss->htmplt));
>
> /* put us in the list */
> @@ -1849,19 +1856,6 @@
>
> int __init usb_stor_init(void)
> {
> - /*
> - * Check to see if the host template is a different size from
> - * what we're expected -- people have updated this in the past
> - * and forgotten about this driver.
> - */
> - if (sizeof(my_host_template) != SCSI_HOST_TEMPLATE_SIZE) {
> - printk(KERN_ERR "usb-storage: SCSI_HOST_TEMPLATE_SIZE bad\n");
> - printk(KERN_ERR
> - "usb-storage: expected %d bytes, got %d bytes\n",
> - SCSI_HOST_TEMPLATE_SIZE, sizeof(my_host_template)) ;
> - return -1 ;
> - }
> -
> /* register the driver, return -1 if error */
> if (usb_register(&storage_driver) < 0)
> return -1;
>
>
>
--
Matthew Dharm Home: [EMAIL PROTECTED]
Engineer, Qualcomm, Inc. Work: [EMAIL PROTECTED]
I'm seen in many forms. Now open your mouth. It's caffeine time.
-- Cola Man to Greg
User Friendly, 10/28/1998
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
