• Jesper Juhl's avatar
    USB, Mass Storage, composite, gadget: Fix build failure and memset of a struct · a283c03a
    Jesper Juhl authored
    Trying to compile drivers/usb/gadget/f_mass_storage.o currently fails and
    spews a ton of warnings :
    
      CC      drivers/usb/gadget/f_mass_storage.o
    drivers/usb/gadget/f_mass_storage.c:436:22: error: field ‘function’ has incomplete type
    drivers/usb/gadget/f_mass_storage.c: In function ‘fsg_from_func’:
    drivers/usb/gadget/f_mass_storage.c:466:9: warning: type defaults to ‘int’ in declaration of ‘__mptr’
    drivers/usb/gadget/f_mass_storage.c:466:9: warning: initialization from incompatible pointer type
    drivers/usb/gadget/f_mass_storage.c: At top level:
    drivers/usb/gadget/f_mass_storage.c:2743:15: warning: ‘struct usb_composite_dev’ declared inside parameter list
    drivers/usb/gadget/f_mass_storage.c:2743:15: warning: its scope is only this definition or declaration, which is probably not what you want
    drivers/usb/gadget/f_mass_storage.c: In function ‘fsg_common_init’:
    drivers/usb/gadget/f_mass_storage.c:2745:34: error: dereferencing pointer to incomplete type
    drivers/usb/gadget/f_mass_storage.c:2775:23: error: dereferencing pointer to incomplete type
    drivers/usb/gadget/f_mass_storage.c:2779:3: error: implicit declaration of function ‘usb_string_id’
    drivers/usb/gadget/f_mass_storage.c: At top level:
    drivers/usb/gadget/f_mass_storage.c:2984:60: warning: ‘struct usb_configuration’ declared inside parameter list
    drivers/usb/gadget/f_mass_storage.c:3003:57: warning: ‘struct usb_configuration’ declared inside parameter list
    drivers/usb/gadget/f_mass_storage.c: In function ‘fsg_bind’:
    drivers/usb/gadget/f_mass_storage.c:3006:31: error: dereferencing pointer to incomplete type
    drivers/usb/gadget/f_mass_storage.c:3013:2: error: implicit declaration of function ‘usb_interface_id’
    drivers/usb/gadget/f_mass_storage.c:3033:3: error: dereferencing pointer to incomplete type
    drivers/usb/gadget/f_mass_storage.c:3034:6: error: dereferencing pointer to incomplete type
    drivers/usb/gadget/f_mass_storage.c:3043:4: error: dereferencing pointer to incomplete type
    drivers/usb/gadget/f_mass_storage.c:3044:7: error: dereferencing pointer to incomplete type
    drivers/usb/gadget/f_mass_storage.c:3045:26: error: dereferencing pointer to incomplete type
    drivers/usb/gadget/f_mass_storage.c: At top level:
    drivers/usb/gadget/f_mass_storage.c:3067:14: warning: ‘struct usb_configuration’ declared inside parameter list
    drivers/usb/gadget/f_mass_storage.c:3067:14: warning: ‘struct usb_composite_dev’ declared inside parameter list
    drivers/usb/gadget/f_mass_storage.c: In function ‘fsg_bind_config’:
    drivers/usb/gadget/f_mass_storage.c:3093:2: error: implicit declaration of function ‘usb_add_function’
    drivers/usb/gadget/f_mass_storage.c: At top level:
    drivers/usb/gadget/f_mass_storage.c:3103:9: warning: ‘struct usb_configuration’ declared inside parameter list
    drivers/usb/gadget/f_mass_storage.c:3103:9: warning: ‘struct usb_composite_dev’ declared inside parameter list
    drivers/usb/gadget/f_mass_storage.c: In function ‘fsg_add’:
    drivers/usb/gadget/f_mass_storage.c:3105:2: warning: passing argument 1 of ‘fsg_bind_config’ from incompatible pointer type
    drivers/usb/gadget/f_mass_storage.c:3065:12: note: expected ‘struct usb_composite_dev *’ but argument is of type ‘struct usb_composite_dev *’
    drivers/usb/gadget/f_mass_storage.c:3105:2: warning: passing argument 2 of ‘fsg_bind_config’ from incompatible pointer type
    drivers/usb/gadget/f_mass_storage.c:3065:12: note: expected ‘struct usb_configuration *’ but argument is of type ‘struct usb_configuration *’
    drivers/usb/gadget/f_mass_storage.c: At top level:
    drivers/usb/gadget/f_mass_storage.c:3190:23: warning: ‘struct usb_composite_dev’ declared inside parameter list
    drivers/usb/gadget/f_mass_storage.c:3195:23: warning: ‘struct usb_composite_dev’ declared inside parameter list
    drivers/usb/gadget/f_mass_storage.c:3193:1: error: conflicting types for ‘fsg_common_from_params’
    drivers/usb/gadget/f_mass_storage.c:3188:1: note: previous declaration of ‘fsg_common_from_params’ was here
    drivers/usb/gadget/f_mass_storage.c: In function ‘fsg_common_from_params’:
    drivers/usb/gadget/f_mass_storage.c:3199:2: warning: passing argument 2 of ‘fsg_common_init’ from incompatible pointer type
    drivers/usb/gadget/f_mass_storage.c:2741:27: note: expected ‘struct usb_composite_dev *’ but argument is of type ‘struct usb_composite_dev *’
    make[1]: *** [drivers/usb/gadget/f_mass_storage.o] Error 1
    make: *** [drivers/usb/gadget/f_mass_storage.o] Error 2
    
    This is due to the missing include of linux/usb/composite.h - this patch
    adds the missing include.
    
    In addition there's also a problem in fsg_common_init() where we memset
    'common', but we use the size of a pointer to 'struct fsg_common' as the
    size argument to memset(), not the actual size of the struct. This patch
    fixes the sizeof so we zero the entire struct as intended.
    Signed-off-by: default avatarJesper Juhl <jj@chaosbits.net>
    Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
    a283c03a
f_mass_storage.c 89.3 KB