Commit ba358964 authored by Armin Wolf's avatar Armin Wolf Committed by Hans de Goede

platform/x86: dell-smbios-wmi: Use devm_get_free_pages()

Use devres version of __get_free_pages() to simplify the
error handling code.
Signed-off-by: default avatarArmin Wolf <W_Armin@gmx.de>
Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/r/20231210202443.646427-4-W_Armin@gmx.deReviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
parent ed72a2b5
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/device.h>
#include <linux/dmi.h> #include <linux/dmi.h>
#include <linux/list.h> #include <linux/list.h>
#include <linux/module.h> #include <linux/module.h>
...@@ -183,7 +184,7 @@ static int dell_smbios_wmi_probe(struct wmi_device *wdev, const void *context) ...@@ -183,7 +184,7 @@ static int dell_smbios_wmi_probe(struct wmi_device *wdev, const void *context)
return ret; return ret;
count = get_order(priv->req_buf_size); count = get_order(priv->req_buf_size);
priv->buf = (void *)__get_free_pages(GFP_KERNEL, count); priv->buf = (void *)devm_get_free_pages(&wdev->dev, GFP_KERNEL, count);
if (!priv->buf) if (!priv->buf)
return -ENOMEM; return -ENOMEM;
...@@ -191,7 +192,7 @@ static int dell_smbios_wmi_probe(struct wmi_device *wdev, const void *context) ...@@ -191,7 +192,7 @@ static int dell_smbios_wmi_probe(struct wmi_device *wdev, const void *context)
wdev->dev.id = 1; wdev->dev.id = 1;
ret = dell_smbios_register_device(&wdev->dev, &dell_smbios_wmi_call); ret = dell_smbios_register_device(&wdev->dev, &dell_smbios_wmi_call);
if (ret) if (ret)
goto fail_register; return ret;
priv->wdev = wdev; priv->wdev = wdev;
dev_set_drvdata(&wdev->dev, priv); dev_set_drvdata(&wdev->dev, priv);
...@@ -200,24 +201,17 @@ static int dell_smbios_wmi_probe(struct wmi_device *wdev, const void *context) ...@@ -200,24 +201,17 @@ static int dell_smbios_wmi_probe(struct wmi_device *wdev, const void *context)
mutex_unlock(&list_mutex); mutex_unlock(&list_mutex);
return 0; return 0;
fail_register:
free_pages((unsigned long)priv->buf, count);
return ret;
} }
static void dell_smbios_wmi_remove(struct wmi_device *wdev) static void dell_smbios_wmi_remove(struct wmi_device *wdev)
{ {
struct wmi_smbios_priv *priv = dev_get_drvdata(&wdev->dev); struct wmi_smbios_priv *priv = dev_get_drvdata(&wdev->dev);
int count;
mutex_lock(&call_mutex); mutex_lock(&call_mutex);
mutex_lock(&list_mutex); mutex_lock(&list_mutex);
list_del(&priv->list); list_del(&priv->list);
mutex_unlock(&list_mutex); mutex_unlock(&list_mutex);
dell_smbios_unregister_device(&wdev->dev); dell_smbios_unregister_device(&wdev->dev);
count = get_order(priv->req_buf_size);
free_pages((unsigned long)priv->buf, count);
mutex_unlock(&call_mutex); mutex_unlock(&call_mutex);
} }
......
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