| Message ID | 20240821120458.3702655-1-andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | [v1,1/1] platform/x86: intel-hid: Use string_choices API instead of ternary operator | expand |
On Wed, 21 Aug 2024, Andy Shevchenko wrote: > Use modern string_choices API instead of manually determining the > output using ternary operator. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > --- > drivers/platform/x86/intel/hid.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/drivers/platform/x86/intel/hid.c b/drivers/platform/x86/intel/hid.c > index 10cd65497cc1..445e7a59beb4 100644 > --- a/drivers/platform/x86/intel/hid.c > +++ b/drivers/platform/x86/intel/hid.c > @@ -13,6 +13,7 @@ > #include <linux/kernel.h> > #include <linux/module.h> > #include <linux/platform_device.h> > +#include <linux/string_choices.h> > #include <linux/suspend.h> > #include "../dual_accel_detect.h" > > @@ -331,10 +332,8 @@ static int intel_hid_set_enable(struct device *device, bool enable) > acpi_handle handle = ACPI_HANDLE(device); > > /* Enable|disable features - power button is always enabled */ > - if (!intel_hid_execute_method(handle, INTEL_HID_DSM_HDSM_FN, > - enable)) { > - dev_warn(device, "failed to %sable hotkeys\n", > - enable ? "en" : "dis"); > + if (!intel_hid_execute_method(handle, INTEL_HID_DSM_HDSM_FN, enable)) { > + dev_warn(device, "failed to %s hotkeys\n", str_enable_disable(enable)); > return -EIO; > } > > Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Hi, On 8/21/24 2:04 PM, Andy Shevchenko wrote: > Use modern string_choices API instead of manually determining the > output using ternary operator. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Thank you for your patch, I've applied this patch to my review-hans branch: https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=review-hans Note it will show up in my review-hans branch once I've pushed my local branch there, which might take a while. Once I've run some tests on this branch the patches there will be added to the platform-drivers-x86/for-next branch and eventually will be included in the pdx86 pull-request to Linus for the next merge-window. Regards, Hans > --- > drivers/platform/x86/intel/hid.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/drivers/platform/x86/intel/hid.c b/drivers/platform/x86/intel/hid.c > index 10cd65497cc1..445e7a59beb4 100644 > --- a/drivers/platform/x86/intel/hid.c > +++ b/drivers/platform/x86/intel/hid.c > @@ -13,6 +13,7 @@ > #include <linux/kernel.h> > #include <linux/module.h> > #include <linux/platform_device.h> > +#include <linux/string_choices.h> > #include <linux/suspend.h> > #include "../dual_accel_detect.h" > > @@ -331,10 +332,8 @@ static int intel_hid_set_enable(struct device *device, bool enable) > acpi_handle handle = ACPI_HANDLE(device); > > /* Enable|disable features - power button is always enabled */ > - if (!intel_hid_execute_method(handle, INTEL_HID_DSM_HDSM_FN, > - enable)) { > - dev_warn(device, "failed to %sable hotkeys\n", > - enable ? "en" : "dis"); > + if (!intel_hid_execute_method(handle, INTEL_HID_DSM_HDSM_FN, enable)) { > + dev_warn(device, "failed to %s hotkeys\n", str_enable_disable(enable)); > return -EIO; > } >
diff --git a/drivers/platform/x86/intel/hid.c b/drivers/platform/x86/intel/hid.c index 10cd65497cc1..445e7a59beb4 100644 --- a/drivers/platform/x86/intel/hid.c +++ b/drivers/platform/x86/intel/hid.c @@ -13,6 +13,7 @@ #include <linux/kernel.h> #include <linux/module.h> #include <linux/platform_device.h> +#include <linux/string_choices.h> #include <linux/suspend.h> #include "../dual_accel_detect.h" @@ -331,10 +332,8 @@ static int intel_hid_set_enable(struct device *device, bool enable) acpi_handle handle = ACPI_HANDLE(device); /* Enable|disable features - power button is always enabled */ - if (!intel_hid_execute_method(handle, INTEL_HID_DSM_HDSM_FN, - enable)) { - dev_warn(device, "failed to %sable hotkeys\n", - enable ? "en" : "dis"); + if (!intel_hid_execute_method(handle, INTEL_HID_DSM_HDSM_FN, enable)) { + dev_warn(device, "failed to %s hotkeys\n", str_enable_disable(enable)); return -EIO; }
Use modern string_choices API instead of manually determining the output using ternary operator. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/platform/x86/intel/hid.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)