Re: [2.6 patch] drivers/usb/storage/: cleanups
On Tue, Mar 01, 2005 at 01:37:58AM +0100, Adrian Bunk wrote: > This patch contains the following cleanups: > - make needlessly global code static > - scsiglue.c: remove the unused usb_stor_sense_notready > > Signed-off-by: Adrian Bunk <[EMAIL PROTECTED]> Applied, thanks. greg k-h - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [2.6 patch] drivers/usb/storage/: cleanups
On Tue, Mar 01, 2005 at 01:37:58AM +0100, Adrian Bunk wrote: This patch contains the following cleanups: - make needlessly global code static - scsiglue.c: remove the unused usb_stor_sense_notready Signed-off-by: Adrian Bunk [EMAIL PROTECTED] Applied, thanks. greg k-h - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[2.6 patch] drivers/usb/storage/: cleanups
This patch contains the following cleanups:
- make needlessly global code static
- scsiglue.c: remove the unused usb_stor_sense_notready
Signed-off-by: Adrian Bunk <[EMAIL PROTECTED]>
---
drivers/usb/storage/scsiglue.c |9 -
drivers/usb/storage/scsiglue.h |1 -
drivers/usb/storage/shuttle_usbat.c | 13 -
drivers/usb/storage/shuttle_usbat.h |4
drivers/usb/storage/transport.c |5 +++--
drivers/usb/storage/transport.h |5 -
drivers/usb/storage/usb.c |4 ++--
drivers/usb/storage/usb.h |3 ---
8 files changed, 13 insertions(+), 31 deletions(-)
--- linux-2.6.11-rc4-mm1-full/drivers/usb/storage/scsiglue.h.old
2005-02-28 23:17:23.0 +0100
+++ linux-2.6.11-rc4-mm1-full/drivers/usb/storage/scsiglue.h2005-02-28
23:18:41.0 +0100
@@ -48,7 +48,6 @@
extern void usb_stor_report_device_reset(struct us_data *us);
-extern unsigned char usb_stor_sense_notready[18];
extern unsigned char usb_stor_sense_invalidCDB[18];
extern struct scsi_host_template usb_stor_host_template;
--- linux-2.6.11-rc4-mm1-full/drivers/usb/storage/scsiglue.c.old
2005-02-28 23:18:51.0 +0100
+++ linux-2.6.11-rc4-mm1-full/drivers/usb/storage/scsiglue.c2005-02-28
23:19:00.0 +0100
@@ -477,15 +477,6 @@
.module = THIS_MODULE
};
-/* For a device that is "Not Ready" */
-unsigned char usb_stor_sense_notready[18] = {
- [0] = 0x70, /* current error */
- [2] = 0x02, /* not ready */
- [7] = 0x0a, /* additional length */
- [12]= 0x04, /* not ready */
- [13]= 0x03 /* manual intervention */
-};
-
/* To Report "Illegal Request: Invalid Field in CDB */
unsigned char usb_stor_sense_invalidCDB[18] = {
[0] = 0x70, /* current error */
--- linux-2.6.11-rc4-mm1-full/drivers/usb/storage/shuttle_usbat.h.old
2005-02-28 23:20:36.0 +0100
+++ linux-2.6.11-rc4-mm1-full/drivers/usb/storage/shuttle_usbat.h
2005-02-28 23:20:55.0 +0100
@@ -105,10 +105,6 @@
#define USBAT_FEAT_ET1 0x02
#define USBAT_FEAT_ET2 0x01
-/* Transport functions */
-int usbat_hp8200e_transport(struct scsi_cmnd *srb, struct us_data *us);
-int usbat_flash_transport(struct scsi_cmnd * srb, struct us_data *us);
-
extern int usbat_transport(struct scsi_cmnd *srb, struct us_data *us);
extern int init_usbat(struct us_data *us);
--- linux-2.6.11-rc4-mm1-full/drivers/usb/storage/shuttle_usbat.c.old
2005-02-28 23:19:48.0 +0100
+++ linux-2.6.11-rc4-mm1-full/drivers/usb/storage/shuttle_usbat.c
2005-02-28 23:22:52.0 +0100
@@ -61,7 +61,10 @@
#define LSB_of(s) ((s)&0xFF)
#define MSB_of(s) ((s)>>8)
-int transferred = 0;
+static int transferred = 0;
+
+static int usbat_flash_transport(struct scsi_cmnd * srb, struct us_data *us);
+static int usbat_hp8200e_transport(struct scsi_cmnd *srb, struct us_data *us);
/*
* Convenience function to produce an ATAPI read/write sectors command
@@ -872,8 +875,8 @@
/*
* Set the transport function based on the device type
*/
-int usbat_set_transport(struct us_data *us,
- struct usbat_info *info)
+static int usbat_set_transport(struct us_data *us,
+ struct usbat_info *info)
{
int rc;
@@ -1417,7 +1420,7 @@
/*
* Transport for the HP 8200e
*/
-int usbat_hp8200e_transport(struct scsi_cmnd *srb, struct us_data *us)
+static int usbat_hp8200e_transport(struct scsi_cmnd *srb, struct us_data *us)
{
int result;
unsigned char *status = us->iobuf;
@@ -1560,7 +1563,7 @@
/*
* Transport for USBAT02-based CompactFlash and similar storage devices
*/
-int usbat_flash_transport(struct scsi_cmnd * srb, struct us_data *us)
+static int usbat_flash_transport(struct scsi_cmnd * srb, struct us_data *us)
{
int rc;
struct usbat_info *info = (struct usbat_info *) (us->extra);
--- linux-2.6.11-rc4-mm1-full/drivers/usb/storage/transport.h.old
2005-02-28 23:23:10.0 +0100
+++ linux-2.6.11-rc4-mm1-full/drivers/usb/storage/transport.h 2005-02-28
23:23:56.0 +0100
@@ -169,13 +169,8 @@
extern int usb_stor_ctrl_transfer(struct us_data *us, unsigned int pipe,
u8 request, u8 requesttype, u16 value, u16 index,
void *data, u16 size);
-extern int usb_stor_intr_transfer(struct us_data *us, void *buf,
- unsigned int length);
extern int usb_stor_bulk_transfer_buf(struct us_data *us, unsigned int pipe,
void *buf, unsigned int length, unsigned int *act_len);
-extern int usb_stor_bulk_transfer_sglist(struct us_data *us, unsigned int pipe,
- struct scatterlist *sg, int num_sg, unsigned int length,
- unsigned int *act_len);
extern int usb_stor_bulk_transfer_sg(struct us_data
[2.6 patch] drivers/usb/storage/: cleanups
This patch contains the following cleanups:
- make needlessly global code static
- scsiglue.c: remove the unused usb_stor_sense_notready
Signed-off-by: Adrian Bunk [EMAIL PROTECTED]
---
drivers/usb/storage/scsiglue.c |9 -
drivers/usb/storage/scsiglue.h |1 -
drivers/usb/storage/shuttle_usbat.c | 13 -
drivers/usb/storage/shuttle_usbat.h |4
drivers/usb/storage/transport.c |5 +++--
drivers/usb/storage/transport.h |5 -
drivers/usb/storage/usb.c |4 ++--
drivers/usb/storage/usb.h |3 ---
8 files changed, 13 insertions(+), 31 deletions(-)
--- linux-2.6.11-rc4-mm1-full/drivers/usb/storage/scsiglue.h.old
2005-02-28 23:17:23.0 +0100
+++ linux-2.6.11-rc4-mm1-full/drivers/usb/storage/scsiglue.h2005-02-28
23:18:41.0 +0100
@@ -48,7 +48,6 @@
extern void usb_stor_report_device_reset(struct us_data *us);
-extern unsigned char usb_stor_sense_notready[18];
extern unsigned char usb_stor_sense_invalidCDB[18];
extern struct scsi_host_template usb_stor_host_template;
--- linux-2.6.11-rc4-mm1-full/drivers/usb/storage/scsiglue.c.old
2005-02-28 23:18:51.0 +0100
+++ linux-2.6.11-rc4-mm1-full/drivers/usb/storage/scsiglue.c2005-02-28
23:19:00.0 +0100
@@ -477,15 +477,6 @@
.module = THIS_MODULE
};
-/* For a device that is Not Ready */
-unsigned char usb_stor_sense_notready[18] = {
- [0] = 0x70, /* current error */
- [2] = 0x02, /* not ready */
- [7] = 0x0a, /* additional length */
- [12]= 0x04, /* not ready */
- [13]= 0x03 /* manual intervention */
-};
-
/* To Report Illegal Request: Invalid Field in CDB */
unsigned char usb_stor_sense_invalidCDB[18] = {
[0] = 0x70, /* current error */
--- linux-2.6.11-rc4-mm1-full/drivers/usb/storage/shuttle_usbat.h.old
2005-02-28 23:20:36.0 +0100
+++ linux-2.6.11-rc4-mm1-full/drivers/usb/storage/shuttle_usbat.h
2005-02-28 23:20:55.0 +0100
@@ -105,10 +105,6 @@
#define USBAT_FEAT_ET1 0x02
#define USBAT_FEAT_ET2 0x01
-/* Transport functions */
-int usbat_hp8200e_transport(struct scsi_cmnd *srb, struct us_data *us);
-int usbat_flash_transport(struct scsi_cmnd * srb, struct us_data *us);
-
extern int usbat_transport(struct scsi_cmnd *srb, struct us_data *us);
extern int init_usbat(struct us_data *us);
--- linux-2.6.11-rc4-mm1-full/drivers/usb/storage/shuttle_usbat.c.old
2005-02-28 23:19:48.0 +0100
+++ linux-2.6.11-rc4-mm1-full/drivers/usb/storage/shuttle_usbat.c
2005-02-28 23:22:52.0 +0100
@@ -61,7 +61,10 @@
#define LSB_of(s) ((s)0xFF)
#define MSB_of(s) ((s)8)
-int transferred = 0;
+static int transferred = 0;
+
+static int usbat_flash_transport(struct scsi_cmnd * srb, struct us_data *us);
+static int usbat_hp8200e_transport(struct scsi_cmnd *srb, struct us_data *us);
/*
* Convenience function to produce an ATAPI read/write sectors command
@@ -872,8 +875,8 @@
/*
* Set the transport function based on the device type
*/
-int usbat_set_transport(struct us_data *us,
- struct usbat_info *info)
+static int usbat_set_transport(struct us_data *us,
+ struct usbat_info *info)
{
int rc;
@@ -1417,7 +1420,7 @@
/*
* Transport for the HP 8200e
*/
-int usbat_hp8200e_transport(struct scsi_cmnd *srb, struct us_data *us)
+static int usbat_hp8200e_transport(struct scsi_cmnd *srb, struct us_data *us)
{
int result;
unsigned char *status = us-iobuf;
@@ -1560,7 +1563,7 @@
/*
* Transport for USBAT02-based CompactFlash and similar storage devices
*/
-int usbat_flash_transport(struct scsi_cmnd * srb, struct us_data *us)
+static int usbat_flash_transport(struct scsi_cmnd * srb, struct us_data *us)
{
int rc;
struct usbat_info *info = (struct usbat_info *) (us-extra);
--- linux-2.6.11-rc4-mm1-full/drivers/usb/storage/transport.h.old
2005-02-28 23:23:10.0 +0100
+++ linux-2.6.11-rc4-mm1-full/drivers/usb/storage/transport.h 2005-02-28
23:23:56.0 +0100
@@ -169,13 +169,8 @@
extern int usb_stor_ctrl_transfer(struct us_data *us, unsigned int pipe,
u8 request, u8 requesttype, u16 value, u16 index,
void *data, u16 size);
-extern int usb_stor_intr_transfer(struct us_data *us, void *buf,
- unsigned int length);
extern int usb_stor_bulk_transfer_buf(struct us_data *us, unsigned int pipe,
void *buf, unsigned int length, unsigned int *act_len);
-extern int usb_stor_bulk_transfer_sglist(struct us_data *us, unsigned int pipe,
- struct scatterlist *sg, int num_sg, unsigned int length,
- unsigned int *act_len);
extern int usb_stor_bulk_transfer_sg(struct us_data *us,
