HID: magicmouse: fix code style errors
PATCH 1/2 HID: magicmouse: fix code style errors
Fix errors reported by checkpatch in hid-magicmouse.c:
hid-magicmouse.c:35: ERROR: open brace '{' following function
definitions go on the next line
hid-magicmouse.c:46: ERROR: do not initialise statics to false
hid-magicmouse.c:79: ERROR: Macros with complex values should be
enclosed in parentheses
hid-magicmouse.c:83: ERROR: Macros with complex values should be
enclosed in parentheses
hid-magicmouse.c:88: ERROR: Macros with complex values should be
enclosed in parentheses
hid-magicmouse.c:93: ERROR: Macros with complex values should be
enclosed in parentheses
hid-magicmouse.c:99: ERROR: Macros with complex values should be
enclosed in parentheses
hid-magicmouse.c:104: ERROR: Macros with complex values should be
enclosed in parentheses
hid-magicmouse.c:185: ERROR: do not use assignment in if condition
--- drivers/hid/hid-magicmouse.c | 37 ++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-)
drivers/hid/hid-magicmouse.c +21 -16
@@ -33,7 +33,8 @@ MODULE_PARM_DESC(emulate_scroll_wheel, "Emulate a scroll wheel");static unsigned int scroll_speed =32 ;static int param_set_scroll_speed (const char *val, -const struct kernel_param *kp) { +const struct kernel_param *kp) +{unsigned long speed;if (!val ||kstrtoul (val,0 , &speed) || speed >63 )return -EINVAL ;
@@ -43,7 +44,7 @@ static int param_set_scroll_speed(const char *val,module_param_call (scroll_speed, param_set_scroll_speed, param_get_uint, &scroll_speed,0644 );MODULE_PARM_DESC (scroll_speed,"Scroll speed, value from 0 (slow) to 63 (fast)" ); -static bool scroll_acceleration = false; +static bool scroll_acceleration;module_param (scroll_acceleration, bool,0644 );MODULE_PARM_DESC (scroll_acceleration,"Accelerate sequential scroll events" );
@@ -76,32 +77,32 @@ MODULE_PARM_DESC(report_undeciphered, "Report undeciphered multi-touch state fie/* Touch surface information. Dimension is in hundredths of a mm, min and max * are in units. */ -#define MOUSE_DIMENSION_X (float)9056 +#define MOUSE_DIMENSION_X ((float)9056)#define MOUSE_MIN_X -1100#define MOUSE_MAX_X 1258#define MOUSE_RES_X ((MOUSE_MAX_X - MOUSE_MIN_X) / (MOUSE_DIMENSION_X / 100)) -#define MOUSE_DIMENSION_Y (float)5152 +#define MOUSE_DIMENSION_Y ((float)5152)#define MOUSE_MIN_Y -1589#define MOUSE_MAX_Y 2047#define MOUSE_RES_Y ((MOUSE_MAX_Y - MOUSE_MIN_Y) / (MOUSE_DIMENSION_Y / 100)) -#define TRACKPAD_DIMENSION_X (float)13000 +#define TRACKPAD_DIMENSION_X ((float)13000)#define TRACKPAD_MIN_X -2909#define TRACKPAD_MAX_X 3167#define TRACKPAD_RES_X \ ((TRACKPAD_MAX_X - TRACKPAD_MIN_X) / (TRACKPAD_DIMENSION_X / 100)) -#define TRACKPAD_DIMENSION_Y (float)11000 +#define TRACKPAD_DIMENSION_Y ((float)11000)#define TRACKPAD_MIN_Y -2456#define TRACKPAD_MAX_Y 2565#define TRACKPAD_RES_Y \ ((TRACKPAD_MAX_Y - TRACKPAD_MIN_Y) / (TRACKPAD_DIMENSION_Y / 100)) -#define TRACKPAD2_DIMENSION_X (float)16000 +#define TRACKPAD2_DIMENSION_X ((float)16000)#define TRACKPAD2_MIN_X -3678#define TRACKPAD2_MAX_X 3934#define TRACKPAD2_RES_X \ ((TRACKPAD2_MAX_X - TRACKPAD2_MIN_X) / (TRACKPAD2_DIMENSION_X / 100)) -#define TRACKPAD2_DIMENSION_Y (float)11490 +#define TRACKPAD2_DIMENSION_Y ((float)11490)#define TRACKPAD2_MIN_Y -2478#define TRACKPAD2_MAX_Y 2587#define TRACKPAD2_RES_Y \
@@ -182,14 +183,18 @@ static void magicmouse_emit_buttons(struct magicmouse_sc *msc, int state)/* The button was released. */ }else if (last_state !=0 ) { state = last_state; - }else if ((id =magicmouse_firm_touch (msc)) >=0 ) { -int x = msc->touches[id].x; -if (x < middle_button_start) - state =1 ; -else if (x > middle_button_stop) - state =2 ; -else - state =4 ; + }else { + id =magicmouse_firm_touch (msc); +if (id >=0 ) { +int x = msc->touches[id].x; + +if (x < middle_button_start) + state =1 ; +else if (x > middle_button_stop) + state =2 ; +else + state =4 ; + } }/* else: we keep the mouse's guess */ input_report_key (msc->input,BTN_MIDDLE , state &4 );
Signature · 1 line
2.25.1
PATCH 2/2 HID: magicmouse: fix code style warnings
Fix warnings reported by checkpatch in hid-magicmouse.c:
hid-magicmouse.c:39: WARNING: Missing a blank line after declarations
hid-magicmouse.c:79: WARNING: Block comments use a trailing */ on a
separate line
hid-magicmouse.c:156: WARNING: Missing a blank line after declarations
hid-magicmouse.c:190: WARNING: Missing a blank line after declarations
hid-magicmouse.c:505: WARNING: Missing a blank line after declarations
hid-magicmouse.c:756: WARNING: Possible unnecessary 'out of memory'
message
hid-magicmouse.c:825: WARNING: braces {} are not necessary for single
statement blocks
Ignore the following warning because, in this case, the else statement is useful:
hid-magicmouse.c:161: WARNING: else is not generally useful after a
break or return
--- drivers/hid/hid-magicmouse.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/hid/hid-magicmouse.c +7 -6
@@ -36,6 +36,7 @@ static int param_set_scroll_speed(const char *val, const struct kernel_param *kp) {unsigned long speed; +if (!val ||kstrtoul (val,0 , &speed) || speed >63 )return -EINVAL ; scroll_speed = speed;
@@ -76,7 +77,8 @@ MODULE_PARM_DESC(report_undeciphered, "Report undeciphered multi-touch state fie#define SCROLL_ACCEL_DEFAULT 7/* Touch surface information. Dimension is in hundredths of a mm, min and max -* are in units. */ +* are in units. +*/ #define MOUSE_DIMENSION_X ((float)9056)#define MOUSE_MIN_X -1100#define MOUSE_MAX_X 1258
@@ -153,6 +155,7 @@ static int magicmouse_firm_touch(struct magicmouse_sc *msc)*/ for (ii =0 ; ii < msc->ntouches; ii++) {int idx = msc->tracking_ids[ii]; +if (msc->touches[idx].size <8 ) {/* Ignore this touch. */ }else if (touch >=0 ) {
@@ -503,6 +506,7 @@ static int magicmouse_event(struct hid_device *hdev, struct hid_field *field, struct hid_usage *usage, __s32 value) {struct magicmouse_sc *msc =hid_get_drvdata (hdev); +if (msc->input->id.product ==USB_DEVICE_ID_APPLE_MAGICMOUSE2 && field->report->id ==MOUSE2_REPORT_ID ) {/*
@@ -753,10 +757,8 @@ static int magicmouse_probe(struct hid_device *hdev,return -ENODEV ; msc =devm_kzalloc (&hdev->dev,sizeof (*msc),GFP_KERNEL ); -if (msc ==NULL ) { -hid_err (hdev,"can't alloc magicmouse descriptor\n" ); +if (msc ==NULL )return -ENOMEM ; - } msc->scroll_accel =SCROLL_ACCEL_DEFAULT ; msc->hdev = hdev;
@@ -823,9 +825,8 @@ static int magicmouse_probe(struct hid_device *hdev,hid_err (hdev,"unable to request touch data (%d)\n" , ret); goto err_stop_hw; } -if (ret == -EIO && id->product ==USB_DEVICE_ID_APPLE_MAGICMOUSE2 ) { +if (ret == -EIO && id->product ==USB_DEVICE_ID_APPLE_MAGICMOUSE2 )schedule_delayed_work (&msc->work,msecs_to_jiffies (500 )); - }return 0 ; err_stop_hw:
Signature · 1 line
2.25.1