Hello, On 07/21/2016 11:20 AM, Javier Martinez Canillas wrote: > The IS_ENABLED() macro checks if a Kconfig symbol has been enabled either > built-in or as a module, use that macro instead of open coding the same. > > Using the macro makes the code more readable by helping abstract away some > of the Kconfig built-in and module enable details. > > Signed-off-by: Javier Martinez Canillas <[email protected]> > --- > > drivers/hid/hid-core.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c > index 08f53c7fd513..386f31481c06 100644 > *** a/drivers/hid/hid-core.c > --- b/drivers/hid/hid-core.c > *************** > *** 2480,2486 **** > { HID_USB_DEVICE(USB_VENDOR_ID_PANJIT, 0x0004) }, > { HID_USB_DEVICE(USB_VENDOR_ID_PHILIPS, > USB_DEVICE_ID_PHILIPS_IEEE802154_DONGLE) }, > { HID_USB_DEVICE(USB_VENDOR_ID_POWERCOM, USB_DEVICE_ID_POWERCOM_UPS) }, > ! #if defined(CONFIG_MOUSE_SYNAPTICS_USB) || > defined(CONFIG_MOUSE_SYNAPTICS_USB_MODULE) > { HID_USB_DEVICE(USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_TP) }, > { HID_USB_DEVICE(USB_VENDOR_ID_SYNAPTICS, > USB_DEVICE_ID_SYNAPTICS_INT_TP) }, > { HID_USB_DEVICE(USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_CPAD) > }, > - - > --- 2480,2486 ---- > { HID_USB_DEVICE(USB_VENDOR_ID_PANJIT, 0x0004) }, > { HID_USB_DEVICE(USB_VENDOR_ID_PHILIPS, > USB_DEVICE_ID_PHILIPS_IEEE802154_DONGLE) }, > { HID_USB_DEVICE(USB_VENDOR_ID_POWERCOM, USB_DEVICE_ID_POWERCOM_UPS) }, > ! #if IS_ENABLED(CONFIG_MOUSE_SYNAPTICS_USB) > { HID_USB_DEVICE(USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_TP) }, > { HID_USB_DEVICE(USB_VENDOR_ID_SYNAPTICS, > USB_DEVICE_ID_SYNAPTICS_INT_TP) }, > { HID_USB_DEVICE(USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_CPAD) > }, > 2.5.5 >
For some reasons this patch got borked by my mailer, I've post a v2 with the correct patch. Sorry for the noise. Best regards, -- Javier Martinez Canillas Open Source Group Samsung Research America
