summaryrefslogtreecommitdiff
path: root/drivers/platform/surface
diff options
context:
space:
mode:
authorIlpo Järvinen <ilpo.jarvinen@linux.intel.com>2024-12-12 17:07:26 +0300
committerIlpo Järvinen <ilpo.jarvinen@linux.intel.com>2024-12-12 17:07:26 +0300
commit18131e9f1682bd6082ec6c194f8ed3243f0fc230 (patch)
tree8f6d7bac52881d71e67a7c7e831d90ac037fa615 /drivers/platform/surface
parent3b6f9c6505a34450a4dd5d9bbbe5cfec4718adb2 (diff)
parent0056b0852c326cf21201661f68ab41002ae9a845 (diff)
downloadlinux-18131e9f1682bd6082ec6c194f8ed3243f0fc230.tar.xz
Merge branch 'platform-drivers-x86-platform-profile' into for-next
Diffstat (limited to 'drivers/platform/surface')
-rw-r--r--drivers/platform/surface/surface_platform_profile.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/platform/surface/surface_platform_profile.c b/drivers/platform/surface/surface_platform_profile.c
index 08db878f1d7d..6c87e982bfc8 100644
--- a/drivers/platform/surface/surface_platform_profile.c
+++ b/drivers/platform/surface/surface_platform_profile.c
@@ -210,7 +210,10 @@ static int surface_platform_profile_probe(struct ssam_device *sdev)
return -ENOMEM;
tpd->sdev = sdev;
+ ssam_device_set_drvdata(sdev, tpd);
+ tpd->handler.name = "Surface Platform Profile";
+ tpd->handler.dev = &sdev->dev;
tpd->handler.profile_get = ssam_platform_profile_get;
tpd->handler.profile_set = ssam_platform_profile_set;
@@ -226,7 +229,10 @@ static int surface_platform_profile_probe(struct ssam_device *sdev)
static void surface_platform_profile_remove(struct ssam_device *sdev)
{
- platform_profile_remove();
+ struct ssam_platform_profile_device *tpd;
+
+ tpd = ssam_device_get_drvdata(sdev);
+ platform_profile_remove(&tpd->handler);
}
static const struct ssam_device_id ssam_platform_profile_match[] = {