Skip to contentSkip to conversation

gadget: make USB_CONFIGFS_MASS_STORAGE depend on BLOCK

PATCH In review Randy Dunlap 3 participants 5 messages Dec 9, 2013 – Dec 10, 2013 USB

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gadget: make USB_CONFIGFS_MASS_STORAGE depend on BLOCK

From: Randy Dunlap <[email protected]>

Make USB_CONFIGFS_MASS_STORAGE depend on BLOCK just like the other gadget MASS_STORAGE options do. This fixes the following build errors that occur when BLOCK is not enabled:

drivers/usb/gadget/storage_common.c: In function 'fsg_lun_open':
drivers/usb/gadget/storage_common.c:241:3: error: implicit declaration of function 'bdev_logical_block_size' [-Werror=implicit-function-declaration] drivers/usb/gadget/storage_common.c:242:3: error: implicit declaration of function 'blksize_bits' [-Werror=implicit-function-declaration]

Cc Andrzej Pietrasiewicz <[email protected]>
Cc Felipe Balbi <[email protected]>
---
 drivers/usb/gadget/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/gadget/Kconfig +1 -1
@@ -681,7 +681,7 @@ config USB_CONFIGFS_PHONET
 
 config USB_CONFIGFS_MASS_STORAGE
 	boolean "Mass storage"
-	depends on USB_CONFIGFS
+	depends on USB_CONFIGFS && BLOCK
 	select USB_F_MASS_STORAGE
 	help
 	  The Mass Storage Gadget acts as a USB Mass Storage disk drive.
#1 lore raw
Quoted 6 lines · Randy Dunlap

From: Randy Dunlap <[email protected]>

Make USB_CONFIGFS_MASS_STORAGE depend on BLOCK just like the other gadget MASS_STORAGE options do. This fixes the following build errors that occur when BLOCK is not enabled:

Quoted 7 lines

drivers/usb/gadget/storage_common.c: In function 'fsg_lun_open':
drivers/usb/gadget/storage_common.c:241:3: error: implicit declaration of function 'bdev_logical_block_size' [-Werror=implicit-function-declaration] drivers/usb/gadget/storage_common.c:242:3: error: implicit declaration of function 'blksize_bits' [-Werror=implicit-function-declaration]

Cc Andrzej Pietrasiewicz <[email protected]>
Cc Felipe Balbi <[email protected]>

Already have a patch for that

commit bc912b0d237c1d376214616ae0c9d12b7d542ab4

Author: Andrzej Pietrasiewicz <[email protected]>
Date:   Mon Nov 4 13:46:17 2013 +0100

usb: gadget: f_mass_storage: fix mass storage dependency

Legacy gadgets supporting mass storage (g_mass_storage, g_acm_ms, g_multi) all depend on BLOCK.

Make the standalone compilation of f_mass_storage (without any legacy gadget) dependent no BLOCK, too.

drivers/usb/gadget/Kconfig +1 -0
index a91e642..f66d96a 100644
@@ -682,6 +682,7 @@ config USB_CONFIGFS_PHONET
 config USB_CONFIGFS_MASS_STORAGE
 	boolean "Mass storage"
 	depends on USB_CONFIGFS
+	depends on BLOCK
 	select USB_F_MASS_STORAGE
 	help
 	  The Mass Storage Gadget acts as a USB Mass Storage disk drive.
Signature · 1 line
balbi
#2 lore raw
Quoted 11 lines · Felipe Balbi
Quoted 10 lines · Randy Dunlap

From: Randy Dunlap <[email protected]>

Make USB_CONFIGFS_MASS_STORAGE depend on BLOCK just like the other gadget MASS_STORAGE options do. This fixes the following build errors that occur when BLOCK is not enabled:

drivers/usb/gadget/storage_common.c: In function 'fsg_lun_open':
drivers/usb/gadget/storage_common.c:241:3: error: implicit declaration of function 'bdev_logical_block_size' [-Werror=implicit-function-declaration] drivers/usb/gadget/storage_common.c:242:3: error: implicit declaration of function 'blksize_bits' [-Werror=implicit-function-declaration]

Quoted 5 lines
Quoted 3 lines
Cc Andrzej Pietrasiewicz <[email protected]>
Cc Felipe Balbi <[email protected]>

Already have a patch for that

Thanks.

It wouldn't hurt to fix mainline so that it builds without this error, eh?

Quoted 29 lines

commit bc912b0d237c1d376214616ae0c9d12b7d542ab4

Author: Andrzej Pietrasiewicz <[email protected]>
Date:   Mon Nov 4 13:46:17 2013 +0100

usb: gadget: f_mass_storage: fix mass storage dependency

Legacy gadgets supporting mass storage (g_mass_storage, g_acm_ms, g_multi) all depend on BLOCK.

Make the standalone compilation of f_mass_storage (without any legacy gadget) dependent no BLOCK, too.

drivers/usb/gadget/Kconfig +1 -0
index a91e642..f66d96a 100644
@@ -682,6 +682,7 @@ config USB_CONFIGFS_PHONET
 config USB_CONFIGFS_MASS_STORAGE
 	boolean "Mass storage"
 	depends on USB_CONFIGFS
+	depends on BLOCK
 	select USB_F_MASS_STORAGE
 	help
 	  The Mass Storage Gadget acts as a USB Mass Storage disk drive.
Signature · 1 line
~Randy
#3 lore raw
Quoted 16 lines · Randy Dunlap
Quoted 15 lines · Felipe Balbi
Quoted 13 lines · Randy Dunlap

From: Randy Dunlap <[email protected]>

Make USB_CONFIGFS_MASS_STORAGE depend on BLOCK just like the other gadget MASS_STORAGE options do. This fixes the following build errors that occur when BLOCK is not enabled:

drivers/usb/gadget/storage_common.c: In function 'fsg_lun_open':
drivers/usb/gadget/storage_common.c:241:3: error: implicit declaration of function 'bdev_logical_block_size' [-Werror=implicit-function-declaration] drivers/usb/gadget/storage_common.c:242:3: error: implicit declaration of function 'blksize_bits' [-Werror=implicit-function-declaration]

Cc Andrzej Pietrasiewicz <[email protected]>
Cc Felipe Balbi <[email protected]>
Quoted 5 lines
Quoted 1 line

Already have a patch for that

Thanks.

It wouldn't hurt to fix mainline so that it builds without this error, eh?

I'm not the one who merges patches in Linus' tree, that's only up to Linus eh ?

That patch is already in Greg's branch and he has already sent a pull request to Linus.

If you're concerned it takes too long to fix build errors, you can ping Linus to see if he'll merge Greg's pull request sooner. There's nothing I can do.

Signature · 1 line
balbi
#4 lore raw
In reply to Randy Dunlap

W dniu 09.12.2013 20:18, Randy Dunlap pisze:

Quoted 5 lines

From: Randy Dunlap <[email protected]>

Make USB_CONFIGFS_MASS_STORAGE depend on BLOCK just like the other gadget MASS_STORAGE options do. This fixes the following build errors that occur when BLOCK is not enabled:

Already submitted

http://www.spinics.net/lists/linux-usb/msg96739.html

AP

Quoted 28 lines

drivers/usb/gadget/storage_common.c: In function 'fsg_lun_open':
drivers/usb/gadget/storage_common.c:241:3: error: implicit declaration of function 'bdev_logical_block_size' [-Werror=implicit-function-declaration] drivers/usb/gadget/storage_common.c:242:3: error: implicit declaration of function 'blksize_bits' [-Werror=implicit-function-declaration]

Cc Andrzej Pietrasiewicz <[email protected]>
Cc Felipe Balbi <[email protected]>
---
  drivers/usb/gadget/Kconfig |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/gadget/Kconfig +1 -2
@@ -681,7 +681,7 @@ config USB_CONFIGFS_PHONET
 
  config USB_CONFIGFS_MASS_STORAGE
  	boolean "Mass storage"
-	depends on USB_CONFIGFS
+	depends on USB_CONFIGFS && BLOCK
  	select USB_F_MASS_STORAGE
  	help
  	  The Mass Storage Gadget acts as a USB Mass Storage disk drive.
--

To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html