Merge remote-tracking branch 'usb/usb-next'

[karo-tx-linux.git] / drivers / usb / storage / ene_ub6250.c

diff --git a/drivers/usb/storage/ene_ub6250.c b/drivers/usb/storage/ene_ub6250.c
index b0a1687ca94263d99b1e1bc3c45874300dd67f3c..a6ade4071a9a115c0cd316bd1779ab958523dac3 100644 (file)
--- a/drivers/usb/storage/ene_ub6250.c
+++ b/drivers/usb/storage/ene_ub6250.c
@@ -42,7 +42,7 @@ MODULE_LICENSE("GPL");
 { USB_DEVICE_VER(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax), \
        .driver_info = (flags)|(USB_US_TYPE_STOR<<24) }
 
-struct usb_device_id ene_ub6250_usb_ids[] = {
+static struct usb_device_id ene_ub6250_usb_ids[] = {
 #      include "unusual_ene_ub6250.h"
        { }             /* Terminating entry */
 };
@@ -607,8 +607,8 @@ static int sd_scsi_mode_sense(struct us_data *us, struct scsi_cmnd *srb)
 
 static int sd_scsi_read_capacity(struct us_data *us, struct scsi_cmnd *srb)
 {
-       u32   bl_num;
-       u16    bl_len;
+       u32     bl_num;
+       u32     bl_len;
        unsigned int offset = 0;
        unsigned char    buf[8];
        struct scatterlist *sg = NULL;
@@ -622,7 +622,7 @@ static int sd_scsi_read_capacity(struct us_data *us, struct scsi_cmnd *srb)
                else
                        bl_num = (info->HC_C_SIZE + 1) * 1024 - 1;
        } else {
-               bl_len = 1<<(info->SD_READ_BL_LEN);
+               bl_len = 1 << (info->SD_READ_BL_LEN);
                bl_num = info->SD_Block_Mult * (info->SD_C_SIZE + 1)
                                * (1 << (info->SD_C_SIZE_MULT + 2)) - 1;
        }
@@ -777,7 +777,7 @@ static int ms_lib_free_logicalmap(struct us_data *us)
        return 0;
 }
 
-int ms_lib_alloc_logicalmap(struct us_data *us)
+static int ms_lib_alloc_logicalmap(struct us_data *us)
 {
        u32  i;
        struct ene_ub6250_info *info = (struct ene_ub6250_info *) us->extra;
@@ -2248,7 +2248,7 @@ static int sd_scsi_irp(struct us_data *us, struct scsi_cmnd *srb)
 /*
  * ms_scsi_irp()
  */
-int ms_scsi_irp(struct us_data *us, struct scsi_cmnd *srb)
+static int ms_scsi_irp(struct us_data *us, struct scsi_cmnd *srb)
 {
        int result;
        struct ene_ub6250_info *info = (struct ene_ub6250_info *)us->extra;