Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b5203f1 authored by Fabio Estevam's avatar Fabio Estevam Committed by Felipe Balbi
Browse files

usb: gadget: f_mass_storage: Use "bool" instead of "int" in fsg_module_parameters 



Fix the following build warnings:

 CC [M]  drivers/usb/gadget/acm_ms.o
drivers/usb/gadget/acm_ms.c: In function ‘__check_ro’:
drivers/usb/gadget/acm_ms.c:119: warning: return from incompatible pointer type
drivers/usb/gadget/acm_ms.c: In function ‘__check_removable’:
drivers/usb/gadget/acm_ms.c:119: warning: return from incompatible pointer type
drivers/usb/gadget/acm_ms.c: In function ‘__check_cdrom’:
drivers/usb/gadget/acm_ms.c:119: warning: return from incompatible pointer type
drivers/usb/gadget/acm_ms.c: In function ‘__check_nofua’:
drivers/usb/gadget/acm_ms.c:119: warning: return from incompatible pointer type
drivers/usb/gadget/acm_ms.c: In function ‘__check_stall’:
drivers/usb/gadget/acm_ms.c:119: warning: return from incompatible pointer type
  CC [M]  drivers/usb/gadget/mass_storage.o
drivers/usb/gadget/mass_storage.c: In function ‘__check_ro’:
drivers/usb/gadget/mass_storage.c:94: warning: return from incompatible pointer type
drivers/usb/gadget/mass_storage.c: In function ‘__check_removable’:
drivers/usb/gadget/mass_storage.c:94: warning: return from incompatible pointer type
drivers/usb/gadget/mass_storage.c: In function ‘__check_cdrom’:
drivers/usb/gadget/mass_storage.c:94: warning: return from incompatible pointer type
drivers/usb/gadget/mass_storage.c: In function ‘__check_nofua’:
drivers/usb/gadget/mass_storage.c:94: warning: return from incompatible pointer type
drivers/usb/gadget/mass_storage.c: In function ‘__check_stall’:
drivers/usb/gadget/mass_storage.c:94: warning: return from incompatible pointer type

Declare the fsg_module_parameters fields as "bool" so that they can match the types
passed in FSG_MODULE_PARAM_ARRAY macro.

Since commit 493c90ef (module_param: check that bool parameters really are bool.),
moduleparam.h was changed in a way that the "bool" parameter type now really
requires "bool" type and no longer allows "unsigned int".

Signed-off-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
Acked-by: default avatarMichal Nazarewicz <mina86@mina86.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent c74c9300

drivers/usb/gadget/f_mass_storage.c

+5 −5
Original line number Diff line number Diff line
@@ -3123,15 +3123,15 @@ fsg_add(struct usb_composite_dev *cdev, struct usb_configuration *c, 


struct fsg_module_parameters {

	char		*file[FSG_MAX_LUNS];

	int		ro[FSG_MAX_LUNS];

	int		removable[FSG_MAX_LUNS];

	int		cdrom[FSG_MAX_LUNS];

	int		nofua[FSG_MAX_LUNS];

	bool		ro[FSG_MAX_LUNS];

	bool		removable[FSG_MAX_LUNS];

	bool		cdrom[FSG_MAX_LUNS];

	bool		nofua[FSG_MAX_LUNS];



	unsigned int	file_count, ro_count, removable_count, cdrom_count;

	unsigned int	nofua_count;

	unsigned int	luns;	/* nluns */

	int		stall;	/* can_stall */

	bool		stall;	/* can_stall */

};



#define _FSG_MODULE_PARAM_ARRAY(prefix, params, name, type, desc)	\