Commit b8470e98 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge tag 'dtpm-v5.17' of https://git.linaro.org/people/daniel.lezcano/linux 

Pull DTPM (Dynamic Thermal Power Management) changes for 5.17-rc1
from Daniel Lezcano:

 - Clean up and reduce trace verbosity (Daniel Lezcano)

* tag 'dtpm-v5.17' of https://git.linaro.org/people/daniel.lezcano/linux:
  powercap/drivers/dtpm: Reduce trace verbosity
  powercap/drivers/dtpm: Remove unused function definition
parents a7904a53 c1af85e4

drivers/powercap/dtpm.c

+3 −3
Original line number Diff line number Diff line
@@ -382,7 +382,7 @@ void dtpm_unregister(struct dtpm *dtpm) 
{

	powercap_unregister_zone(pct, &dtpm->zone);



	pr_info("Unregistered dtpm node '%s'\n", dtpm->zone.name);

	pr_debug("Unregistered dtpm node '%s'\n", dtpm->zone.name);

}



/**
@@ -453,7 +453,7 @@ int dtpm_register(const char *name, struct dtpm *dtpm, struct dtpm *parent) 
		dtpm->power_limit = dtpm->power_max;

	}



	pr_info("Registered dtpm node '%s' / %llu-%llu uW, \n",

	pr_debug("Registered dtpm node '%s' / %llu-%llu uW, \n",

		 dtpm->zone.name, dtpm->power_min, dtpm->power_max);



	mutex_unlock(&dtpm_lock);

include/linux/dtpm.h

+0 −2
Original line number Diff line number Diff line
@@ -70,6 +70,4 @@ void dtpm_unregister(struct dtpm *dtpm); 


int dtpm_register(const char *name, struct dtpm *dtpm, struct dtpm *parent);



int dtpm_register_cpu(struct dtpm *parent);



#endif