Commit 249c576f authored by Kurt Borja's avatar Kurt Borja Committed by Ilpo Järvinen
Browse files

ACPI: platform_profile: Let drivers set drvdata to the class device 



Add *drvdata to platform_profile_register() signature and assign it to
the class device.

While at it, pass specific driver state as drvdata to replace uses of
container_of() with dev_get_drvdata().

Reviewed-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Signed-off-by: default avatarKurt Borja <kuurtb@gmail.com>
Reviewed-by: default avatarMark Pearson <mpearson-lenovo@squebb.ca>
Tested-by: default avatarMark Pearson <mpearson-lenovo@squebb.ca>
Link: https://lore.kernel.org/r/20250116002721.75592-3-kuurtb@gmail.com


Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
parent d960f148

drivers/acpi/platform_profile.c

+4 −3
Original line number Diff line number Diff line
@@ -460,7 +460,7 @@ int platform_profile_cycle(void) 
}

EXPORT_SYMBOL_GPL(platform_profile_cycle);



int platform_profile_register(struct platform_profile_handler *pprof)

int platform_profile_register(struct platform_profile_handler *pprof, void *drvdata)

{

	int err;
@@ -480,6 +480,7 @@ int platform_profile_register(struct platform_profile_handler *pprof) 


	pprof->class_dev.class = &platform_profile_class;

	pprof->class_dev.parent = pprof->dev;

	dev_set_drvdata(&pprof->class_dev, drvdata);

	dev_set_name(&pprof->class_dev, "platform-profile-%d", pprof->minor);

	err = device_register(&pprof->class_dev);

	if (err) {
@@ -529,7 +530,7 @@ static void devm_platform_profile_release(struct device *dev, void *res) 
	platform_profile_remove(*pprof);

}



int devm_platform_profile_register(struct platform_profile_handler *pprof)

int devm_platform_profile_register(struct platform_profile_handler *pprof, void *drvdata)

{

	struct platform_profile_handler **dr;

	int ret;
@@ -538,7 +539,7 @@ int devm_platform_profile_register(struct platform_profile_handler *pprof) 
	if (!dr)

		return -ENOMEM;



	ret = platform_profile_register(pprof);

	ret = platform_profile_register(pprof, drvdata);

	if (ret) {

		devres_free(dr);

		return ret;

drivers/platform/surface/surface_platform_profile.c

+3 −3
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ static int ssam_platform_profile_get(struct platform_profile_handler *pprof, 
	enum ssam_tmp_profile tp;

	int status;



	tpd = container_of(pprof, struct ssam_platform_profile_device, handler);

	tpd = dev_get_drvdata(&pprof->class_dev);



	status = ssam_tmp_profile_get(tpd->sdev, &tp);

	if (status)
@@ -181,7 +181,7 @@ static int ssam_platform_profile_set(struct platform_profile_handler *pprof, 
	struct ssam_platform_profile_device *tpd;

	int tp;



	tpd = container_of(pprof, struct ssam_platform_profile_device, handler);

	tpd = dev_get_drvdata(&pprof->class_dev);



	tp = convert_profile_to_ssam_tmp(tpd->sdev, profile);

	if (tp < 0)
@@ -224,7 +224,7 @@ static int surface_platform_profile_probe(struct ssam_device *sdev) 
	set_bit(PLATFORM_PROFILE_BALANCED_PERFORMANCE, tpd->handler.choices);

	set_bit(PLATFORM_PROFILE_PERFORMANCE, tpd->handler.choices);



	return platform_profile_register(&tpd->handler);

	return platform_profile_register(&tpd->handler, tpd);

}



static void surface_platform_profile_remove(struct ssam_device *sdev)

drivers/platform/x86/acer-wmi.c

+1 −1
Original line number Diff line number Diff line
@@ -2073,7 +2073,7 @@ static int acer_platform_profile_setup(struct platform_device *device) 
				ACER_PREDATOR_V4_THERMAL_PROFILE_TURBO;

		}



		err = platform_profile_register(&platform_profile_handler);

		err = platform_profile_register(&platform_profile_handler, NULL);

		if (err)

			return err;

drivers/platform/x86/amd/pmf/sps.c

+3 −3
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ bool is_pprof_balanced(struct amd_pmf_dev *pmf) 
static int amd_pmf_profile_get(struct platform_profile_handler *pprof,

			       enum platform_profile_option *profile)

{

	struct amd_pmf_dev *pmf = container_of(pprof, struct amd_pmf_dev, pprof);

	struct amd_pmf_dev *pmf = dev_get_drvdata(&pprof->class_dev);



	*profile = pmf->current_profile;

	return 0;
@@ -366,7 +366,7 @@ int amd_pmf_power_slider_update_event(struct amd_pmf_dev *dev) 
static int amd_pmf_profile_set(struct platform_profile_handler *pprof,

			       enum platform_profile_option profile)

{

	struct amd_pmf_dev *pmf = container_of(pprof, struct amd_pmf_dev, pprof);

	struct amd_pmf_dev *pmf = dev_get_drvdata(&pprof->class_dev);

	int ret = 0;



	pmf->current_profile = profile;
@@ -416,7 +416,7 @@ int amd_pmf_init_sps(struct amd_pmf_dev *dev) 
	set_bit(PLATFORM_PROFILE_PERFORMANCE, dev->pprof.choices);



	/* Create platform_profile structure and register */

	err = platform_profile_register(&dev->pprof);

	err = platform_profile_register(&dev->pprof, dev);

	if (err)

		dev_err(dev->dev, "Failed to register SPS support, this is most likely an SBIOS bug: %d\n",

			err);

drivers/platform/x86/asus-wmi.c

+3 −3
Original line number Diff line number Diff line
@@ -3806,7 +3806,7 @@ static int asus_wmi_platform_profile_get(struct platform_profile_handler *pprof, 
	struct asus_wmi *asus;

	int tp;



	asus = container_of(pprof, struct asus_wmi, platform_profile_handler);

	asus = dev_get_drvdata(&pprof->class_dev);

	tp = asus->throttle_thermal_policy_mode;



	switch (tp) {
@@ -3832,7 +3832,7 @@ static int asus_wmi_platform_profile_set(struct platform_profile_handler *pprof, 
	struct asus_wmi *asus;

	int tp;



	asus = container_of(pprof, struct asus_wmi, platform_profile_handler);

	asus = dev_get_drvdata(&pprof->class_dev);



	switch (profile) {

	case PLATFORM_PROFILE_PERFORMANCE:
@@ -3887,7 +3887,7 @@ static int platform_profile_setup(struct asus_wmi *asus) 
	set_bit(PLATFORM_PROFILE_PERFORMANCE,

		asus->platform_profile_handler.choices);



	err = platform_profile_register(&asus->platform_profile_handler);

	err = platform_profile_register(&asus->platform_profile_handler, asus);

	if (err == -EEXIST) {

		pr_warn("%s, a platform_profile handler is already registered\n", __func__);

		return 0;