GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-07 07:08:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

HID: lenovo: Rename fn_lock sysfs attr handlers to make them generic

Browse source 
Except for a single call, there is nothing keyboard-model specific about
the cptkbd fn_lock sysfs attr handlers, rename them dropping the cptkbd
post-/pre-fix, so that they can be re-used for supporting Fn-lock on the
Thinkpad 10 ultrabook kbd.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Hans de Goede 2020-07-04 15:27:40 +02:00 • committed by Jiri Kosina
parent 484921f571
commit ef550c5d0a
1 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
drivers/hid/hid-lenovo.c
View file

@ -249,23 +249,23 @@ static void lenovo_features_set_cptkbd(struct hid_device *hdev)
hid_err(hdev, "Sensitivity setting failed: %d\n", ret); hid_err(hdev, "Sensitivity setting failed: %d\n", ret);
} }
static ssize_t attr_fn_lock_show_cptkbd(struct device *dev, static ssize_t attr_fn_lock_show(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
char *buf) char *buf)
{ {
struct hid_device *hdev = to_hid_device(dev); struct hid_device *hdev = to_hid_device(dev);
struct lenovo_drvdata *cptkbd_data = hid_get_drvdata(hdev); struct lenovo_drvdata *data = hid_get_drvdata(hdev);
return snprintf(buf, PAGE_SIZE, "%u\n", cptkbd_data->fn_lock); return snprintf(buf, PAGE_SIZE, "%u\n", data->fn_lock);
} }
static ssize_t attr_fn_lock_store_cptkbd(struct device *dev, static ssize_t attr_fn_lock_store(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
const char *buf, const char *buf,
size_t count) size_t count)
{ {
struct hid_device *hdev = to_hid_device(dev); struct hid_device *hdev = to_hid_device(dev);
struct lenovo_drvdata *cptkbd_data = hid_get_drvdata(hdev); struct lenovo_drvdata *data = hid_get_drvdata(hdev);
int value; int value;
if (kstrtoint(buf, 10, &value)) if (kstrtoint(buf, 10, &value))
@ -273,8 +273,14 @@ static ssize_t attr_fn_lock_store_cptkbd(struct device *dev,
if (value < 0 || value > 1) if (value < 0 || value > 1)
return -EINVAL; return -EINVAL;
cptkbd_data->fn_lock = !!value; data->fn_lock = !!value;
lenovo_features_set_cptkbd(hdev);
switch (hdev->product) {
case USB_DEVICE_ID_LENOVO_CUSBKBD:
case USB_DEVICE_ID_LENOVO_CBTKBD:
lenovo_features_set_cptkbd(hdev);
break;
}
return count; return count;
} }
@ -309,10 +315,10 @@ static ssize_t attr_sensitivity_store_cptkbd(struct device *dev,
} }
static struct device_attribute dev_attr_fn_lock_cptkbd = static struct device_attribute dev_attr_fn_lock =
__ATTR(fn_lock, S_IWUSR | S_IRUGO, __ATTR(fn_lock, S_IWUSR | S_IRUGO,
attr_fn_lock_show_cptkbd, attr_fn_lock_show,
attr_fn_lock_store_cptkbd); attr_fn_lock_store);
static struct device_attribute dev_attr_sensitivity_cptkbd = static struct device_attribute dev_attr_sensitivity_cptkbd =
__ATTR(sensitivity, S_IWUSR | S_IRUGO, __ATTR(sensitivity, S_IWUSR | S_IRUGO,
@ -321,7 +327,7 @@ static struct device_attribute dev_attr_sensitivity_cptkbd =
static struct attribute *lenovo_attributes_cptkbd[] = { static struct attribute *lenovo_attributes_cptkbd[] = {
&dev_attr_fn_lock_cptkbd.attr, &dev_attr_fn_lock.attr,
&dev_attr_sensitivity_cptkbd.attr, &dev_attr_sensitivity_cptkbd.attr,
NULL NULL
}; };