Commit 663704db authored by Thorsten Blum's avatar Thorsten Blum Committed by Jiri Kosina
Browse files

HID: appletb-kbd: Use secs_to_jiffies() instead of msecs_to_jiffies() 



Use secs_to_jiffies() instead of msecs_to_jiffies() and avoid scaling
the module params 'appletb_tb_idle_timeout' and 'appletb_tb_dim_timeout'
to milliseconds. secs_to_jiffies() expands to simpler code and reduces
the size of 'hid-appletb-kbd.ko'.

Reformat the code to silence multiple checkpatch warnings.

No functional changes intended.

Signed-off-by: default avatarThorsten Blum <thorsten.blum@linux.dev>
Reviewed-by: default avatarAditya Garg <gargaditya08@live.com>
Tested-by: default avatarAditya Garg <gargaditya08@live.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.com>
parent 5e06802b

drivers/hid/hid-appletb-kbd.c

+6 −3
Original line number Diff line number Diff line
@@ -172,7 +172,8 @@ static void appletb_inactivity_timer(struct timer_list *t) 
		if (!kbd->has_dimmed) {

			backlight_device_set_brightness(kbd->backlight_dev, 1);

			kbd->has_dimmed = true;

			mod_timer(&kbd->inactivity_timer, jiffies + msecs_to_jiffies(appletb_tb_idle_timeout * 1000));

			mod_timer(&kbd->inactivity_timer,

				jiffies + secs_to_jiffies(appletb_tb_idle_timeout));

		} else if (!kbd->has_turned_off) {

			backlight_device_set_brightness(kbd->backlight_dev, 0);

			kbd->has_turned_off = true;
@@ -188,7 +189,8 @@ static void reset_inactivity_timer(struct appletb_kbd *kbd) 
			kbd->has_dimmed = false;

			kbd->has_turned_off = false;

		}

		mod_timer(&kbd->inactivity_timer, jiffies + msecs_to_jiffies(appletb_tb_dim_timeout * 1000));

		mod_timer(&kbd->inactivity_timer,

			jiffies + secs_to_jiffies(appletb_tb_dim_timeout));

	}

}
@@ -407,7 +409,8 @@ static int appletb_kbd_probe(struct hid_device *hdev, const struct hid_device_id 
	} else {

		backlight_device_set_brightness(kbd->backlight_dev, 2);

		timer_setup(&kbd->inactivity_timer, appletb_inactivity_timer, 0);

		mod_timer(&kbd->inactivity_timer, jiffies + msecs_to_jiffies(appletb_tb_dim_timeout * 1000));

		mod_timer(&kbd->inactivity_timer,

			jiffies + secs_to_jiffies(appletb_tb_dim_timeout));

	}



	kbd->inp_handler.event = appletb_kbd_inp_event;