The patch titled
microtek usb scanner: Scsi_Cmnd conversion
has been added to the -mm tree. Its filename is
microtek-usb-scanner-scsi_cmnd-conversion.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: microtek usb scanner: Scsi_Cmnd conversion
From: Henrik Kretzschmar <henne@xxxxxxxxxxxxxxxx>
Converts obsolete typedef'd Scsi_Cmnd into struct scsi_cmnd.
Signed-off-by: Henrik Kretzschmar <henne@xxxxxxxxxxxxxxxx>
Cc: James Bottomley <James.Bottomley@xxxxxxxxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/usb/image/microtek.c | 18 +++++++++---------
drivers/usb/image/microtek.h | 4 ++--
2 files changed, 11 insertions(+), 11 deletions(-)
diff -puN drivers/usb/image/microtek.c~microtek-usb-scanner-scsi_cmnd-conversion drivers/usb/image/microtek.c
--- a/drivers/usb/image/microtek.c~microtek-usb-scanner-scsi_cmnd-conversion
+++ a/drivers/usb/image/microtek.c
@@ -225,7 +225,7 @@ static inline void mts_debug_dump(struct
}
-static inline void mts_show_command(Scsi_Cmnd *srb)
+static inline void mts_show_command(struct scsi_cmnd *srb)
{
char *what = NULL;
@@ -309,7 +309,7 @@ static inline void mts_show_command(Scsi
#else
-static inline void mts_show_command(Scsi_Cmnd * dummy)
+static inline void mts_show_command(struct scsi_cmnd * dummy)
{
}
@@ -338,7 +338,7 @@ static int mts_slave_configure (struct s
return 0;
}
-static int mts_scsi_abort (Scsi_Cmnd *srb)
+static int mts_scsi_abort(struct scsi_cmnd *srb)
{
struct mts_desc* desc = (struct mts_desc*)(srb->device->host->hostdata[0]);
@@ -349,7 +349,7 @@ static int mts_scsi_abort (Scsi_Cmnd *sr
return FAILED;
}
-static int mts_scsi_host_reset (Scsi_Cmnd *srb)
+static int mts_scsi_host_reset(struct scsi_cmnd *srb)
{
struct mts_desc* desc = (struct mts_desc*)(srb->device->host->hostdata[0]);
int result, rc;
@@ -366,8 +366,8 @@ static int mts_scsi_host_reset (Scsi_Cmn
return result ? FAILED : SUCCESS;
}
-static
-int mts_scsi_queuecommand (Scsi_Cmnd *srb, mts_scsi_cmnd_callback callback );
+static int
+mts_scsi_queuecommand(struct scsi_cmnd *srb, mts_scsi_cmnd_callback callback);
static void mts_transfer_cleanup( struct urb *transfer );
static void mts_do_sg(struct urb * transfer, struct pt_regs *regs);
@@ -537,7 +537,7 @@ static const unsigned char mts_direction
#define MTS_DIRECTION_IS_IN(x) ((mts_direction[x>>3] >> (x & 7)) & 1)
static void
-mts_build_transfer_context( Scsi_Cmnd *srb, struct mts_desc* desc )
+mts_build_transfer_context(struct scsi_cmnd *srb, struct mts_desc* desc)
{
int pipe;
struct scatterlist * sg;
@@ -588,8 +588,8 @@ mts_build_transfer_context( Scsi_Cmnd *s
}
-static
-int mts_scsi_queuecommand( Scsi_Cmnd *srb, mts_scsi_cmnd_callback callback )
+static int
+mts_scsi_queuecommand(struct scsi_cmnd *srb, mts_scsi_cmnd_callback callback)
{
struct mts_desc* desc = (struct mts_desc*)(srb->device->host->hostdata[0]);
int err = 0;
diff -puN drivers/usb/image/microtek.h~microtek-usb-scanner-scsi_cmnd-conversion drivers/usb/image/microtek.h
--- a/drivers/usb/image/microtek.h~microtek-usb-scanner-scsi_cmnd-conversion
+++ a/drivers/usb/image/microtek.h
@@ -8,14 +8,14 @@
*
*/
-typedef void (*mts_scsi_cmnd_callback)(Scsi_Cmnd *);
+typedef void (*mts_scsi_cmnd_callback)(struct scsi_cmnd *);
struct mts_transfer_context
{
struct mts_desc* instance;
mts_scsi_cmnd_callback final_callback;
- Scsi_Cmnd *srb;
+ struct scsi_cmnd *srb;
void* data;
unsigned data_length;
_
Patches currently in -mm which might be from henne@xxxxxxxxxxxxxxxx are
git-libata-all.patch
kerneldoc-error-on-ata_piixc.patch
git-netdev-all.patch
git-net.patch
git-scsi-misc.patch
pci_module_init-conversion-in-scsi-subsys-2nd-try.patch
scsi-remove-seagateh.patch
scsi-seagate-scsi_cmnd-conversion.patch
gregkh-usb-usbcore-add-autosuspend-autoresume-infrastructure-2.patch
microtek-usb-scanner-scsi_cmnd-conversion.patch
docbook-fix-segfault-in-docprocc.patch
pci_module_init-convertion-in-ata_genericc.patch
pci_module_init-convertion-in-ata_genericc-fix.patch
pci_module_init-convertion-in-amso1100-driver.patch
pci_module_init-convertion-for-k8_edacc.patch
pci_module_init-convertion-in-the-legacy-megaraid-driver.patch
nozomi-pci_module_init-conversion.patch
pci_module_init-convertion-in-olympicc.patch
pci_module_init-conversion-for-pata_pdc2027x.patch
pci_module_init-convertion-in-tmscsimc.patch
mark-pci_module_init-deprecated.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
