Merge branch 'master' of git://www.denx.de/git/u-boot-imx

[karo-tx-uboot.git] / drivers / usb / gadget / storage_common.c

diff --git a/drivers/usb/gadget/storage_common.c b/drivers/usb/gadget/storage_common.c
index 594dc10afa89157b81fb1cfc6ed67d5ec14f5eb8..b55e40bbda947bb1c1c4f6f9c25ee03d0237df0f 100644 (file)
--- a/drivers/usb/gadget/storage_common.c
+++ b/drivers/usb/gadget/storage_common.c
@@ -11,19 +11,7 @@
  * Code refactoring & cleanup:
  * Łukasz Majewski <l.majewski@samsung.com>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 
@@ -279,15 +267,9 @@ struct interrupt_data {
 #define ASCQ(x)                ((u8) (x))
 
 struct device_attribute { int i; };
-struct rw_semaphore { int i; };
-#define down_write(...)                        do { } while (0)
-#define up_write(...)                  do { } while (0)
-#define down_read(...)                 do { } while (0)
-#define up_read(...)                   do { } while (0)
 #define ETOOSMALL      525
 
 #include <usb_mass_storage.h>
-extern struct ums_board_info           *ums_info;
 
 /*-------------------------------------------------------------------------*/
 
@@ -585,36 +567,16 @@ static struct usb_gadget_strings  fsg_stringtab = {
 static int fsg_lun_open(struct fsg_lun *curlun, const char *filename)
 {
        int                             ro;
-       int                             rc = -EINVAL;
-       loff_t                          size;
-       loff_t                          num_sectors;
-       loff_t                          min_sectors;
 
        /* R/W if we can, R/O if we must */
        ro = curlun->initially_ro;
 
-       ums_info->get_capacity(&(ums_info->ums_dev), &size);
-       if (size < 0) {
-               printf("unable to find file size: %s\n", filename);
-               rc = (int) size;
-               goto out;
-       }
-       num_sectors = size >> 9;        /* File size in 512-byte blocks */
-       min_sectors = 1;
-       if (num_sectors < min_sectors) {
-               printf("file too small: %s\n", filename);
-               rc = -ETOOSMALL;
-               goto out;
-       }
-
        curlun->ro = ro;
-       curlun->file_length = size;
-       curlun->num_sectors = num_sectors;
+       curlun->file_length = ums->num_sectors << 9;
+       curlun->num_sectors = ums->num_sectors;
        debug("open backing file: %s\n", filename);
-       rc = 0;
 
-out:
-       return rc;
+       return 0;
 }
 
 static void fsg_lun_close(struct fsg_lun *curlun)