Commit 58318828 authored by Eray Orçunus's avatar Eray Orçunus Committed by Hans de Goede

platform/x86: ideapad-laptop: Revert "check for touchpad support in _CFG"

Last 8 bit of _CFG started being used in later IdeaPads, thus 30th bit
doesn't always show whether device supports touchpad or touchpad switch.
Remove checking bit 30 of _CFG, so older IdeaPads like S10-3 can switch
touchpad again via touchpad attribute.

This reverts commit b3ed1b7f ("platform/x86: ideapad-laptop: check for
touchpad support in _CFG").
Signed-off-by: default avatarEray Orçunus <erayorcunus@gmail.com>
Acked-by: default avatarIke Panhc <ike.pan@canonical.com>
Link: https://lore.kernel.org/r/20221029120311.11152-2-erayorcunus@gmail.comReviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
parent c7891884
...@@ -46,11 +46,10 @@ static const char *const ideapad_wmi_fnesc_events[] = { ...@@ -46,11 +46,10 @@ static const char *const ideapad_wmi_fnesc_events[] = {
#endif #endif
enum { enum {
CFG_CAP_BT_BIT = 16, CFG_CAP_BT_BIT = 16,
CFG_CAP_3G_BIT = 17, CFG_CAP_3G_BIT = 17,
CFG_CAP_WIFI_BIT = 18, CFG_CAP_WIFI_BIT = 18,
CFG_CAP_CAM_BIT = 19, CFG_CAP_CAM_BIT = 19,
CFG_CAP_TOUCHPAD_BIT = 30,
}; };
enum { enum {
...@@ -386,8 +385,6 @@ static int debugfs_cfg_show(struct seq_file *s, void *data) ...@@ -386,8 +385,6 @@ static int debugfs_cfg_show(struct seq_file *s, void *data)
seq_puts(s, " wifi"); seq_puts(s, " wifi");
if (test_bit(CFG_CAP_CAM_BIT, &priv->cfg)) if (test_bit(CFG_CAP_CAM_BIT, &priv->cfg))
seq_puts(s, " camera"); seq_puts(s, " camera");
if (test_bit(CFG_CAP_TOUCHPAD_BIT, &priv->cfg))
seq_puts(s, " touchpad");
seq_puts(s, "\n"); seq_puts(s, "\n");
seq_puts(s, "Graphics: "); seq_puts(s, "Graphics: ");
...@@ -680,8 +677,7 @@ static umode_t ideapad_is_visible(struct kobject *kobj, ...@@ -680,8 +677,7 @@ static umode_t ideapad_is_visible(struct kobject *kobj,
else if (attr == &dev_attr_fn_lock.attr) else if (attr == &dev_attr_fn_lock.attr)
supported = priv->features.fn_lock; supported = priv->features.fn_lock;
else if (attr == &dev_attr_touchpad.attr) else if (attr == &dev_attr_touchpad.attr)
supported = priv->features.touchpad_ctrl_via_ec && supported = priv->features.touchpad_ctrl_via_ec;
test_bit(CFG_CAP_TOUCHPAD_BIT, &priv->cfg);
else if (attr == &dev_attr_usb_charging.attr) else if (attr == &dev_attr_usb_charging.attr)
supported = priv->features.usb_charging; supported = priv->features.usb_charging;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment