From 28c901d7d11d38b99a853fffa48a32b39599f2d1 Mon Sep 17 00:00:00 2001 From: Douglas Anderson Date: Fri, 15 Mar 2019 21:01:45 +0800 Subject: [PATCH] PM / Domains: Mark "name" const in dev_pm_domain_attach_by_name() mainline inclusion from mainline-5.0 commit eeb35df05244 category: bugfix bugzilla: 11678 CVE: NA ------------------------------------------------- As of the patch ("PM / Domains: Mark "name" const in genpd_dev_pm_attach_by_name()") it's clear that the name in dev_pm_domain_attach_by_name() can be const. Mark it as so. This allows drivers to pass in a name that was declared "const" in a driver. Fixes: 27dceb81f445 ("PM / Domains: Introduce dev_pm_domain_attach_by_name()") Signed-off-by: Douglas Anderson Reviewed-by: Stephen Boyd Acked-by: Viresh Kumar Reviewed-by: Ulf Hansson Signed-off-by: Rafael J. Wysocki Signed-off-by: Yang Yingliang Reviewed-by: Xiongfeng Wang Signed-off-by: Yang Yingliang --- drivers/base/power/common.c | 2 +- include/linux/pm_domain.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/base/power/common.c b/drivers/base/power/common.c index b413951c6abc..22aedb28aad7 100644 --- a/drivers/base/power/common.c +++ b/drivers/base/power/common.c @@ -160,7 +160,7 @@ EXPORT_SYMBOL_GPL(dev_pm_domain_attach_by_id); * For a detailed function description, see dev_pm_domain_attach_by_id(). */ struct device *dev_pm_domain_attach_by_name(struct device *dev, - char *name) + const char *name) { if (dev->pm_domain) return ERR_PTR(-EEXIST); diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h index ebd9589979af..b15579e535fa 100644 --- a/include/linux/pm_domain.h +++ b/include/linux/pm_domain.h @@ -310,7 +310,7 @@ int dev_pm_domain_attach(struct device *dev, bool power_on); struct device *dev_pm_domain_attach_by_id(struct device *dev, unsigned int index); struct device *dev_pm_domain_attach_by_name(struct device *dev, - char *name); + const char *name); void dev_pm_domain_detach(struct device *dev, bool power_off); void dev_pm_domain_set(struct device *dev, struct dev_pm_domain *pd); #else @@ -324,7 +324,7 @@ static inline struct device *dev_pm_domain_attach_by_id(struct device *dev, return NULL; } static inline struct device *dev_pm_domain_attach_by_name(struct device *dev, - char *name) + const char *name) { return NULL; } -- GitLab