Skip to content

Commit 663704d

Browse files
tobluxJiri Kosina
authored andcommitted
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: Thorsten Blum <thorsten.blum@linux.dev> Reviewed-by: Aditya Garg <gargaditya08@live.com> Tested-by: Aditya Garg <gargaditya08@live.com> Signed-off-by: Jiri Kosina <jkosina@suse.com>
1 parent 5e06802 commit 663704d

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

drivers/hid/hid-appletb-kbd.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,8 @@ static void appletb_inactivity_timer(struct timer_list *t)
172172
if (!kbd->has_dimmed) {
173173
backlight_device_set_brightness(kbd->backlight_dev, 1);
174174
kbd->has_dimmed = true;
175-
mod_timer(&kbd->inactivity_timer, jiffies + msecs_to_jiffies(appletb_tb_idle_timeout * 1000));
175+
mod_timer(&kbd->inactivity_timer,
176+
jiffies + secs_to_jiffies(appletb_tb_idle_timeout));
176177
} else if (!kbd->has_turned_off) {
177178
backlight_device_set_brightness(kbd->backlight_dev, 0);
178179
kbd->has_turned_off = true;
@@ -188,7 +189,8 @@ static void reset_inactivity_timer(struct appletb_kbd *kbd)
188189
kbd->has_dimmed = false;
189190
kbd->has_turned_off = false;
190191
}
191-
mod_timer(&kbd->inactivity_timer, jiffies + msecs_to_jiffies(appletb_tb_dim_timeout * 1000));
192+
mod_timer(&kbd->inactivity_timer,
193+
jiffies + secs_to_jiffies(appletb_tb_dim_timeout));
192194
}
193195
}
194196

@@ -407,7 +409,8 @@ static int appletb_kbd_probe(struct hid_device *hdev, const struct hid_device_id
407409
} else {
408410
backlight_device_set_brightness(kbd->backlight_dev, 2);
409411
timer_setup(&kbd->inactivity_timer, appletb_inactivity_timer, 0);
410-
mod_timer(&kbd->inactivity_timer, jiffies + msecs_to_jiffies(appletb_tb_dim_timeout * 1000));
412+
mod_timer(&kbd->inactivity_timer,
413+
jiffies + secs_to_jiffies(appletb_tb_dim_timeout));
411414
}
412415

413416
kbd->inp_handler.event = appletb_kbd_inp_event;

0 commit comments

Comments
 (0)