From 31dd8efeb661c8dbffff9175a09cf2bab090906a Mon Sep 17 00:00:00 2001 From: Bryan O'Donoghue Date: Mon, 30 Apr 2018 15:56:10 +0100 Subject: [PATCH] usb: composite convert __set_bit to generic_set_bit Compiling the f_mass_storage driver for an x86 target results in a compilation error as set_bit and clear_bit are provided by bitops.h To address that situation we discussed on the list moving to genetic_set_bit() instead. Doing a quick grep for similar situations in drivers/usb shows that the composite device is using __set_bit(). This patch switches over to generic_set_bit to maintain consistency between the two gadget drivers. Signed-off-by: Bryan O'Donoghue Cc: Lukasz Majewski Cc: Marek Vasut --- drivers/usb/gadget/composite.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c index e307c738fd..5106cc56cb 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -378,7 +378,7 @@ static int set_config(struct usb_composite_dev *cdev, ep = (struct usb_endpoint_descriptor *)*descriptors; addr = ((ep->bEndpointAddress & 0x80) >> 3) | (ep->bEndpointAddress & 0x0f); - __set_bit(addr, f->endpoints); + generic_set_bit(addr, f->endpoints); } result = f->set_alt(f, tmp, 0); -- 2.39.5