* [PATCH] gadget: make USB_CONFIGFS_MASS_STORAGE depend on BLOCK
@ 2013-12-09 19:18 Randy Dunlap
2013-12-09 19:21 ` Felipe Balbi
2013-12-10 6:47 ` Andrzej Pietrasiewicz
0 siblings, 2 replies; 5+ messages in thread
From: Randy Dunlap @ 2013-12-09 19:18 UTC (permalink / raw)
To: USB list, LKML; +Cc: Greg Kroah-Hartman, Andrzej Pietrasiewicz, Felipe Balbi
From: Randy Dunlap <rdunlap@infradead.org>
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]
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
Cc: Felipe Balbi <balbi@ti.com>
---
drivers/usb/gadget/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- lnx-313-rc3.orig/drivers/usb/gadget/Kconfig
+++ lnx-313-rc3/drivers/usb/gadget/Kconfig
@@ -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.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] gadget: make USB_CONFIGFS_MASS_STORAGE depend on BLOCK
2013-12-09 19:18 [PATCH] gadget: make USB_CONFIGFS_MASS_STORAGE depend on BLOCK Randy Dunlap
@ 2013-12-09 19:21 ` Felipe Balbi
2013-12-09 19:27 ` Randy Dunlap
2013-12-10 6:47 ` Andrzej Pietrasiewicz
1 sibling, 1 reply; 5+ messages in thread
From: Felipe Balbi @ 2013-12-09 19:21 UTC (permalink / raw)
To: Randy Dunlap
Cc: USB list, LKML, Greg Kroah-Hartman, Andrzej Pietrasiewicz,
Felipe Balbi
[-- Attachment #1: Type: text/plain, Size: 1911 bytes --]
On Mon, Dec 09, 2013 at 11:18:25AM -0800, Randy Dunlap wrote:
> From: Randy Dunlap <rdunlap@infradead.org>
>
> 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]
>
> Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
> Cc: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
> Cc: Felipe Balbi <balbi@ti.com>
Already have a patch for that
commit bc912b0d237c1d376214616ae0c9d12b7d542ab4
Author: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
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.
Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index a91e642..f66d96a 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -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.
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] gadget: make USB_CONFIGFS_MASS_STORAGE depend on BLOCK
2013-12-09 19:21 ` Felipe Balbi
@ 2013-12-09 19:27 ` Randy Dunlap
2013-12-09 19:31 ` Felipe Balbi
0 siblings, 1 reply; 5+ messages in thread
From: Randy Dunlap @ 2013-12-09 19:27 UTC (permalink / raw)
To: balbi; +Cc: USB list, LKML, Greg Kroah-Hartman, Andrzej Pietrasiewicz
On 12/09/13 11:21, Felipe Balbi wrote:
> On Mon, Dec 09, 2013 at 11:18:25AM -0800, Randy Dunlap wrote:
>> From: Randy Dunlap <rdunlap@infradead.org>
>>
>> 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]
>>
>> Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
>> Cc: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
>> Cc: Felipe Balbi <balbi@ti.com>
>
> Already have a patch for that
Thanks.
It wouldn't hurt to fix mainline so that it builds without this error, eh?
> commit bc912b0d237c1d376214616ae0c9d12b7d542ab4
> Author: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
> 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.
>
> Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> Signed-off-by: Felipe Balbi <balbi@ti.com>
>
> diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
> index a91e642..f66d96a 100644
> --- a/drivers/usb/gadget/Kconfig
> +++ b/drivers/usb/gadget/Kconfig
> @@ -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.
>
--
~Randy
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] gadget: make USB_CONFIGFS_MASS_STORAGE depend on BLOCK
2013-12-09 19:27 ` Randy Dunlap
@ 2013-12-09 19:31 ` Felipe Balbi
0 siblings, 0 replies; 5+ messages in thread
From: Felipe Balbi @ 2013-12-09 19:31 UTC (permalink / raw)
To: Randy Dunlap
Cc: balbi, USB list, LKML, Greg Kroah-Hartman, Andrzej Pietrasiewicz
[-- Attachment #1: Type: text/plain, Size: 1442 bytes --]
On Mon, Dec 09, 2013 at 11:27:31AM -0800, Randy Dunlap wrote:
> On 12/09/13 11:21, Felipe Balbi wrote:
> > On Mon, Dec 09, 2013 at 11:18:25AM -0800, Randy Dunlap wrote:
> >> From: Randy Dunlap <rdunlap@infradead.org>
> >>
> >> 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]
> >>
> >> Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
> >> Cc: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
> >> Cc: Felipe Balbi <balbi@ti.com>
> >
> > 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.
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] gadget: make USB_CONFIGFS_MASS_STORAGE depend on BLOCK
2013-12-09 19:18 [PATCH] gadget: make USB_CONFIGFS_MASS_STORAGE depend on BLOCK Randy Dunlap
2013-12-09 19:21 ` Felipe Balbi
@ 2013-12-10 6:47 ` Andrzej Pietrasiewicz
1 sibling, 0 replies; 5+ messages in thread
From: Andrzej Pietrasiewicz @ 2013-12-10 6:47 UTC (permalink / raw)
To: Randy Dunlap; +Cc: USB list, LKML, Greg Kroah-Hartman, Felipe Balbi
W dniu 09.12.2013 20:18, Randy Dunlap pisze:
> From: Randy Dunlap <rdunlap@infradead.org>
>
> 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
>
> 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]
>
> Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
> Cc: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
> Cc: Felipe Balbi <balbi@ti.com>
> ---
> drivers/usb/gadget/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> --- lnx-313-rc3.orig/drivers/usb/gadget/Kconfig
> +++ lnx-313-rc3/drivers/usb/gadget/Kconfig
> @@ -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 majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-12-10 6:48 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-09 19:18 [PATCH] gadget: make USB_CONFIGFS_MASS_STORAGE depend on BLOCK Randy Dunlap
2013-12-09 19:21 ` Felipe Balbi
2013-12-09 19:27 ` Randy Dunlap
2013-12-09 19:31 ` Felipe Balbi
2013-12-10 6:47 ` Andrzej Pietrasiewicz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox