| Message ID | 20240402143059.8456-3-W_Armin@gmx.de (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | [v2,1/4] platform/x86: wmi: Mark simple WMI drivers as legacy-free | expand |
On 4/2/24 7:30 AM, Armin Wolf wrote: > The WMI driver core already makes sure that: > > - a valid WMI device is passed to each callback > - the notify() callback runs after the probe() callback succeeds > > Remove the unnecessary NULL checks. > > Compile-tested only. > > Signed-off-by: Armin Wolf <W_Armin@gmx.de> > --- LGTM Reviewed-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com> > drivers/platform/x86/xiaomi-wmi.c | 11 ++--------- > 1 file changed, 2 insertions(+), 9 deletions(-) > > diff --git a/drivers/platform/x86/xiaomi-wmi.c b/drivers/platform/x86/xiaomi-wmi.c > index 7efbdc111803..cbed29ca502a 100644 > --- a/drivers/platform/x86/xiaomi-wmi.c > +++ b/drivers/platform/x86/xiaomi-wmi.c > @@ -38,7 +38,7 @@ static int xiaomi_wmi_probe(struct wmi_device *wdev, const void *context) > struct xiaomi_wmi *data; > int ret; > > - if (wdev == NULL || context == NULL) > + if (!context) > return -EINVAL; > > data = devm_kzalloc(&wdev->dev, sizeof(struct xiaomi_wmi), GFP_KERNEL); > @@ -66,14 +66,7 @@ static int xiaomi_wmi_probe(struct wmi_device *wdev, const void *context) > > static void xiaomi_wmi_notify(struct wmi_device *wdev, union acpi_object *dummy) > { > - struct xiaomi_wmi *data; > - > - if (wdev == NULL) > - return; > - > - data = dev_get_drvdata(&wdev->dev); > - if (data == NULL) > - return; > + struct xiaomi_wmi *data = dev_get_drvdata(&wdev->dev); > > mutex_lock(&data->key_lock); > input_report_key(data->input_dev, data->key_code, 1); > -- > 2.39.2 > >
diff --git a/drivers/platform/x86/xiaomi-wmi.c b/drivers/platform/x86/xiaomi-wmi.c index 7efbdc111803..cbed29ca502a 100644 --- a/drivers/platform/x86/xiaomi-wmi.c +++ b/drivers/platform/x86/xiaomi-wmi.c @@ -38,7 +38,7 @@ static int xiaomi_wmi_probe(struct wmi_device *wdev, const void *context) struct xiaomi_wmi *data; int ret; - if (wdev == NULL || context == NULL) + if (!context) return -EINVAL; data = devm_kzalloc(&wdev->dev, sizeof(struct xiaomi_wmi), GFP_KERNEL); @@ -66,14 +66,7 @@ static int xiaomi_wmi_probe(struct wmi_device *wdev, const void *context) static void xiaomi_wmi_notify(struct wmi_device *wdev, union acpi_object *dummy) { - struct xiaomi_wmi *data; - - if (wdev == NULL) - return; - - data = dev_get_drvdata(&wdev->dev); - if (data == NULL) - return; + struct xiaomi_wmi *data = dev_get_drvdata(&wdev->dev); mutex_lock(&data->key_lock); input_report_key(data->input_dev, data->key_code, 1);
The WMI driver core already makes sure that: - a valid WMI device is passed to each callback - the notify() callback runs after the probe() callback succeeds Remove the unnecessary NULL checks. Compile-tested only. Signed-off-by: Armin Wolf <W_Armin@gmx.de> --- drivers/platform/x86/xiaomi-wmi.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) -- 2.39.2