diff mbox

[4/4] HID: lg4ff: Minor coding style fixes in lg4ff and hid-lg

Message ID 4804940.l8EpFgnjXr@qosmio-x300 (mailing list archive)
State New, archived
Delegated to: Jiri Kosina
Headers show

Commit Message

Michal Malý Sept. 23, 2012, 11:13 p.m. UTC 
Fixes a couple of minor coding style issues.

Signed-off-by: Michal Malý <madcatxster@gmail.com>
---
From eaa8ca4efae69e2510fbdffcd758cd3b88daf8a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Mal=C3=BD?= <madcatxster@gmail.com>
Date: Mon, 24 Sep 2012 00:18:24 +0200
Subject: [PATCH 4/4] Various minor coding style fixes.

---
 drivers/hid/hid-lg.c    | 6 +++---
 drivers/hid/hid-lg4ff.c | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

 	switch (effect->type) {
 	case FF_CONSTANT:
@@ -285,7 +285,7 @@ static void hid_lg4ff_set_range_dfp(struct hid_device 
*hid, __u16 range)
 
 	/* Prepare "coarse" limit command */
 	value[0] = 0xf8;
-	value[1] = 0x00; 	/* Set later */
+	value[1] = 0x00;	/* Set later */
 	value[2] = 0x00;
 	value[3] = 0x00;
 	value[4] = 0x00;
diff mbox

Patch

diff --git a/drivers/hid/hid-lg.c b/drivers/hid/hid-lg.c
index 760b30b..afc4de3 100644
--- a/drivers/hid/hid-lg.c
+++ b/drivers/hid/hid-lg.c
@@ -361,7 +361,7 @@  static int lg_probe(struct hid_device *hdev, const struct 
hid_device_id *id)
 		return -ENOMEM;
 	}
 	drv_data->quirks = id->driver_data;
-	
+
 	hid_set_drvdata(hdev, (void *)drv_data);
 
 	if (drv_data->quirks & LG_NOGET)
@@ -383,7 +383,7 @@  static int lg_probe(struct hid_device *hdev, const struct 
hid_device_id *id)
 	}
 
 	/* Setup wireless link with Logitech Wii wheel */
-	if(hdev->product == USB_DEVICE_ID_LOGITECH_WII_WHEEL) {
+	if (hdev->product == USB_DEVICE_ID_LOGITECH_WII_WHEEL) {
 		unsigned char buf[] = { 0x00, 0xAF,  0x01, 0x00, 0x00, 0x00, 0x00, 
0x00, 0x00 };
 
 		ret = hdev->hid_output_raw_report(hdev, buf, sizeof(buf), 
HID_FEATURE_REPORT);
@@ -479,7 +479,7 @@  static const struct hid_device_id lg_devices[] = {
 		.driver_data = LG_NOGET | LG_FF4 },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 
USB_DEVICE_ID_LOGITECH_WII_WHEEL),
 		.driver_data = LG_FF4 },
-	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 
USB_DEVICE_ID_LOGITECH_WINGMAN_FFG ),
+	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 
USB_DEVICE_ID_LOGITECH_WINGMAN_FFG),
 		.driver_data = LG_FF },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 
USB_DEVICE_ID_LOGITECH_RUMBLEPAD2),
 		.driver_data = LG_FF2 },
diff --git a/drivers/hid/hid-lg4ff.c b/drivers/hid/hid-lg4ff.c
index 7007a12..9f5b2c5 100644
--- a/drivers/hid/hid-lg4ff.c
+++ b/drivers/hid/hid-lg4ff.c
@@ -193,7 +193,7 @@  static int hid_lg4ff_play(struct input_dev *dev, void 
*data, struct ff_effect *e
 	__s32 *value = report->field[0]->value;
 	int x;
 
-#define CLAMP(x) if (x < 0) x = 0; if (x > 0xff) x = 0xff
+#define CLAMP(x) do { if (x < 0) x = 0; else if (x > 0xff) x = 0xff; } while 
(0)