[PATCH] staging: ccg: remove two outdated dependencies

[PATCH] staging: ccg: remove two outdated dependencies

[Paul Bolle]

The Kconfig symbols USB_FILE_STORAGE and USB_FILE_STORAGE_TEST got
removed in commit fa06920a3ece1ed43333992d35c0044e7a6c048a ("usb:
gadget: Remove File-backed Storage Gadget (g_file_storage)."). That
commit failed to remove the negative dependencies on those two symbols
in the USB_G_CCG entry. Since these dependencies will always evaluate to
true, they can safely be removed.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
---
0) Untested.

1) This patch is rather hard to review. That is because the "depends on"
line is rather hard to read. Perhaps the easiest way to review is to do
    git grep -n "\bUSB_FILE_STORAGE\(_TEST\)\?\b"

before and after applying this patch. But that doesn't catch possible
other, unwanted, changes. Maybe we need to split up the "depends on"
line before removing these two negative entries.

 drivers/staging/ccg/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/ccg/Kconfig b/drivers/staging/ccg/Kconfig
index 7ed5bc6..5c5a415 100644
--- a/drivers/staging/ccg/Kconfig
+++ b/drivers/staging/ccg/Kconfig
@@ -2,7 +2,7 @@ if USB_GADGET
 
 config USB_G_CCG
 	tristate "Configurable Composite Gadget (STAGING)"
-	depends on STAGING && BLOCK && NET && !USB_ZERO && !USB_ZERO_HNPTEST && !USB_AUDIO && !GADGET_UAC1 && !USB_ETH && !USB_ETH_RNDIS && !USB_ETH_EEM && !USB_G_NCM && !USB_GADGETFS && !USB_FUNCTIONFS && !USB_FUNCTIONFS_ETH && !USB_FUNCTIONFS_RNDIS && !USB_FUNCTIONFS_GENERIC && !USB_FILE_STORAGE && !USB_FILE_STORAGE_TEST && !USB_MASS_STORAGE && !USB_G_SERIAL && !USB_MIDI_GADGET && !USB_G_PRINTER && !USB_CDC_COMPOSITE && !USB_G_NOKIA && !USB_G_ACM_MS && !USB_G_MULTI && !USB_G_MULTI_RNDIS && !USB_G_MULTI_CDC && !USB_G_HID && !USB_G_DBGP && !USB_G_WEBCAM && TTY
+	depends on STAGING && BLOCK && NET && !USB_ZERO && !USB_ZERO_HNPTEST && !USB_AUDIO && !GADGET_UAC1 && !USB_ETH && !USB_ETH_RNDIS && !USB_ETH_EEM && !USB_G_NCM && !USB_GADGETFS && !USB_FUNCTIONFS && !USB_FUNCTIONFS_ETH && !USB_FUNCTIONFS_RNDIS && !USB_FUNCTIONFS_GENERIC && !USB_MASS_STORAGE && !USB_G_SERIAL && !USB_MIDI_GADGET && !USB_G_PRINTER && !USB_CDC_COMPOSITE && !USB_G_NOKIA && !USB_G_ACM_MS && !USB_G_MULTI && !USB_G_MULTI_RNDIS && !USB_G_MULTI_CDC && !USB_G_HID && !USB_G_DBGP && !USB_G_WEBCAM && TTY
 	help
 	  The Configurable Composite Gadget supports multiple USB
 	  functions: acm, mass storage, rndis and FunctionFS.
-- 
1.7.11.7

Re: [PATCH] staging: ccg: remove two outdated dependencies

[Dan Carpenter]

On Thu, Mar 14, 2013 at 11:17:04AM +0100, Paul Bolle wrote:
> 1) This patch is rather hard to review. That is because the "depends on"
> line is rather hard to read. Perhaps the easiest way to review is to do
>     git grep -n "\bUSB_FILE_STORAGE\(_TEST\)\?\b"
> 
> before and after applying this patch. But that doesn't catch possible
> other, unwanted, changes. Maybe we need to split up the "depends on"
> line before removing these two negative entries.

Your patch is fine as is, but if you wanted to send a follow on
patch to break the depend mess into separate lines, that would also
be welcome.  :)

Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>

regards,
dan carpenter

Re: [PATCH] staging: ccg: remove two outdated dependencies

[Paul Bolle]

On Thu, 2013-03-14 at 13:59 +0300, Dan Carpenter wrote:
> Your patch is fine as is, but if you wanted to send a follow on
> patch to break the depend mess into separate lines, that would also
> be welcome.  :)

Well, now that you somehow managed to review this patch the urge to
clean this line up has suddenly diminished. But maybe you're lucky and
this will not pass Greg. 

> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>

Thanks.


Paul Bolle

Re: [PATCH] staging: ccg: remove two outdated dependencies

[Dan Carpenter]

On Thu, Mar 14, 2013 at 12:09:53PM +0100, Paul Bolle wrote:
> On Thu, 2013-03-14 at 13:59 +0300, Dan Carpenter wrote:
> > Your patch is fine as is, but if you wanted to send a follow on
> > patch to break the depend mess into separate lines, that would also
> > be welcome.  :)
> 
> Well, now that you somehow managed to review this patch the urge to
> clean this line up has suddenly diminished. But maybe you're lucky and
> this will not pass Greg. 
> 

This CCG driver was mentioned in the latest lwn kernel page so I was
just looking at it.  And I looked at it for a minute or two.  And
then I started backing away slowly...  :P

regards,
dan carpenter

Re: [PATCH] staging: ccg: remove two outdated dependencies

[Greg Kroah-Hartman]

On Thu, Mar 14, 2013 at 12:09:53PM +0100, Paul Bolle wrote:
> On Thu, 2013-03-14 at 13:59 +0300, Dan Carpenter wrote:
> > Your patch is fine as is, but if you wanted to send a follow on
> > patch to break the depend mess into separate lines, that would also
> > be welcome.  :)
> 
> Well, now that you somehow managed to review this patch the urge to
> clean this line up has suddenly diminished. But maybe you're lucky and
> this will not pass Greg. 

It didn't, please clean it up "properly", I'll drop this patch for now,
thanks. :)

greg k-h

Re: [PATCH] staging: ccg: remove two outdated dependencies

[Paul Bolle]

On Thu, 2013-03-14 at 15:02 -0700, Greg Kroah-Hartman wrote:
> On Thu, Mar 14, 2013 at 12:09:53PM +0100, Paul Bolle wrote:
> > Well, now that you somehow managed to review this patch the urge to
> > clean this line up has suddenly diminished. But maybe you're lucky and
> > this will not pass Greg. 
> 
> It didn't, please clean it up "properly", I'll drop this patch for now,
> thanks. :)

The horror is mostly caused by negative dependencies on USB Kconfig
symbols. Any clue why this driver conflicts with about twenty USB
related options?


Paul Bolle

Re: [PATCH] staging: ccg: remove two outdated dependencies

[Greg Kroah-Hartman]

On Thu, Mar 14, 2013 at 11:12:21PM +0100, Paul Bolle wrote:
> On Thu, 2013-03-14 at 15:02 -0700, Greg Kroah-Hartman wrote:
> > On Thu, Mar 14, 2013 at 12:09:53PM +0100, Paul Bolle wrote:
> > > Well, now that you somehow managed to review this patch the urge to
> > > clean this line up has suddenly diminished. But maybe you're lucky and
> > > this will not pass Greg. 
> > 
> > It didn't, please clean it up "properly", I'll drop this patch for now,
> > thanks. :)
> 
> The horror is mostly caused by negative dependencies on USB Kconfig
> symbols. Any clue why this driver conflicts with about twenty USB
> related options?

Yes, because it is a horrible thing and needs to be deleted.

Seriously, I had a number of people ask me to delete it last week at the
Linaro event.

Hm, I guess I should just do it, I know it would make the USB developers
much happier, nevermind about your patch, I'll just drop the whole
thing, which will fix your problem in a different way :)

thanks,

greg k-h