redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

USB: usb-storage: remove us->sensebuf

Browse source 
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>
This commit is contained in:
Alan Stern 2008-11-18 14:08:38 -05:00 committed by Greg Kroah-Hartman
parent f9dc8f99e5
commit a658367dae
2 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/usb/storage/usb.c
View file

@ -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,

1
drivers/usb/storage/usb.h
View file

@ -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 */