Browse Source

USB: usb-storage: remove us->sensebuf

This patch (as1171) removes us->sensebuf, since it isn't used anywhere.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Alan Stern 16 years ago
parent
commit
a658367dae
2 changed files with 0 additions and 9 deletions
  1. 0 8
      drivers/usb/storage/usb.c
  2. 0 1
      drivers/usb/storage/usb.h

+ 0 - 8
drivers/usb/storage/usb.c

@@ -474,12 +474,6 @@ static int associate_dev(struct us_data *us, struct usb_interface *intf)
 		US_DEBUGP("I/O buffer allocation failed\n");
 		US_DEBUGP("I/O buffer allocation failed\n");
 		return -ENOMEM;
 		return -ENOMEM;
 	}
 	}
-
-	us->sensebuf = kmalloc(US_SENSE_SIZE, GFP_KERNEL);
-	if (!us->sensebuf) {
-		US_DEBUGP("Sense buffer allocation failed\n");
-		return -ENOMEM;
-	}
 	return 0;
 	return 0;
 }
 }
 
 
@@ -875,8 +869,6 @@ static void dissociate_dev(struct us_data *us)
 {
 {
 	US_DEBUGP("-- %s\n", __func__);
 	US_DEBUGP("-- %s\n", __func__);
 
 
-	kfree(us->sensebuf);
-
 	/* Free the device-related DMA-mapped buffers */
 	/* Free the device-related DMA-mapped buffers */
 	if (us->cr)
 	if (us->cr)
 		usb_buffer_free(us->pusb_dev, sizeof(*us->cr), us->cr,
 		usb_buffer_free(us->pusb_dev, sizeof(*us->cr), us->cr,

+ 0 - 1
drivers/usb/storage/usb.h

@@ -138,7 +138,6 @@ struct us_data {
 	struct usb_ctrlrequest	*cr;		 /* control requests	 */
 	struct usb_ctrlrequest	*cr;		 /* control requests	 */
 	struct usb_sg_request	current_sg;	 /* scatter-gather req.  */
 	struct usb_sg_request	current_sg;	 /* scatter-gather req.  */
 	unsigned char		*iobuf;		 /* I/O buffer		 */
 	unsigned char		*iobuf;		 /* I/O buffer		 */
-	unsigned char		*sensebuf;	 /* sense data buffer	 */
 	dma_addr_t		cr_dma;		 /* buffer DMA addresses */
 	dma_addr_t		cr_dma;		 /* buffer DMA addresses */
 	dma_addr_t		iobuf_dma;
 	dma_addr_t		iobuf_dma;
 	struct task_struct	*ctl_thread;	 /* the control thread   */
 	struct task_struct	*ctl_thread;	 /* the control thread   */