Skip to contentSkip to conversation

watchdog: iTCO_wdt: use pm_ptr()

PATCH In review Enrico Weigelt, metux IT consult 3 participants 6 messages Jun 16, 2021 – Jun 19, 2021 Watchdog device drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 watchdog: iTCO_wdt: use pm_ptr()

Reduce a little bit of boilerplate by using pm_ptr().

---
 drivers/watchdog/iTCO_wdt.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/watchdog/iTCO_wdt.c +1 -4
index bf31d7b67a69..6ba2b2f60737 100644
@@ -636,16 +636,13 @@ static const struct dev_pm_ops iTCO_wdt_pm = {
 	.resume_noirq = iTCO_wdt_resume_noirq,
 };
 
-#define ITCO_WDT_PM_OPS	(&iTCO_wdt_pm)
-#else
-#define ITCO_WDT_PM_OPS	NULL
 #endif /* CONFIG_PM_SLEEP */
 
 static struct platform_driver iTCO_wdt_driver = {
 	.probe          = iTCO_wdt_probe,
 	.driver         = {
 		.name   = DRV_NAME,
-		.pm     = ITCO_WDT_PM_OPS,
+		.pm     = pm_ptr(&iTCO_wdt_pm),
 	},
 };
 
Signature · 1 line
2.20.1
#1 lore raw

PATCH 2/2 watchdog: iTCO_wdt: use dev_err() instead of pr_err()

Use dev_err() instead of pr_err(), so device name is also shown in the log.

---
 drivers/watchdog/iTCO_wdt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/watchdog/iTCO_wdt.c +2 -2
index 6ba2b2f60737..35ff8d3fd9fc 100644
@@ -479,13 +479,13 @@ static int iTCO_wdt_probe(struct platform_device *pdev)
 		if (!devm_request_region(dev, p->smi_res->start,
 					 resource_size(p->smi_res),
 					 pdev->name)) {
-			pr_err("I/O address 0x%04llx already in use, device disabled\n",
+			dev_err(dev, "I/O address 0x%04llx already in use, device disabled\n",
 			       (u64)SMI_EN(p));
 			return -EBUSY;
 		}
 	} else if (iTCO_vendorsupport ||
 		   turn_SMI_watchdog_clear_off >= p->iTCO_version) {
-		pr_err("SMI I/O resource is missing\n");
+		dev_err(dev, "SMI I/O resource is missing\n");
 		return -ENODEV;
 	}
 
Signature · 1 line
2.20.1
maintainer Reviewed-by on v1 2/2
#2 lore raw

Re: [PATCH 2/2] watchdog: iTCO_wdt: use dev_err() instead of pr_err()

Quoted 3 lines · metux IT consult

Use dev_err() instead of pr_err(), so device name is also shown in the log.

Quoted 27 lines
---
 drivers/watchdog/iTCO_wdt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/watchdog/iTCO_wdt.c +2 -2
index 6ba2b2f60737..35ff8d3fd9fc 100644
@@ -479,13 +479,13 @@ static int iTCO_wdt_probe(struct platform_device *pdev)
 		if (!devm_request_region(dev, p->smi_res->start,
 					 resource_size(p->smi_res),
 					 pdev->name)) {
-			pr_err("I/O address 0x%04llx already in use, device disabled\n",
+			dev_err(dev, "I/O address 0x%04llx already in use, device disabled\n",
 			       (u64)SMI_EN(p));
 			return -EBUSY;
 		}
 	} else if (iTCO_vendorsupport ||
 		   turn_SMI_watchdog_clear_off >= p->iTCO_version) {
-		pr_err("SMI I/O resource is missing\n");
+		dev_err(dev, "SMI I/O resource is missing\n");
 		return -ENODEV;
 	}
 
Signature · 1 line
2.20.1
maintainer Reviewed-by on v1 1/2
#3 lore raw
In reply to Enrico Weigelt, metux IT consult
Quoted 3 lines · metux IT consult

Reduce a little bit of boilerplate by using pm_ptr().

Quoted 29 lines
---
 drivers/watchdog/iTCO_wdt.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/watchdog/iTCO_wdt.c +1 -4
index bf31d7b67a69..6ba2b2f60737 100644
@@ -636,16 +636,13 @@ static const struct dev_pm_ops iTCO_wdt_pm = {
 	.resume_noirq = iTCO_wdt_resume_noirq,
 };
 
-#define ITCO_WDT_PM_OPS	(&iTCO_wdt_pm)
-#else
-#define ITCO_WDT_PM_OPS	NULL
 #endif /* CONFIG_PM_SLEEP */
 
 static struct platform_driver iTCO_wdt_driver = {
 	.probe          = iTCO_wdt_probe,
 	.driver         = {
 		.name   = DRV_NAME,
-		.pm     = ITCO_WDT_PM_OPS,
+		.pm     = pm_ptr(&iTCO_wdt_pm),
 	},
 };
 
Signature · 1 line
2.20.1
#4 lore raw
In reply to Enrico Weigelt, metux IT consult
I love your patch! Yet something to improve:

Hi "Enrico,

I love your patch! Yet something to improve:

[auto build test ERROR on linux/master]
[also build test ERROR on hwmon/hwmon-next linus/master v5.13-rc6 next-20210618] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/0day-ci/linux/commits/Enrico-Weigelt-metux-IT-consult/watchdog-iTCO_wdt-use-pm_ptr/20210617-024441
base:   https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git dd860052c99b1e088352bdd4fb7aef46f8d2ef47
config: ia64-allmodconfig (attached as .config)
compiler: ia64-linux-gcc (GCC) 9.3.0

reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/670a790c3acfccf4b5405459048ba2a05b912eef
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Enrico-Weigelt-metux-IT-consult/watchdog-iTCO_wdt-use-pm_ptr/20210617-024441 git checkout 670a790c3acfccf4b5405459048ba2a05b912eef
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=ia64

If you fix the issue, kindly add following tag as appropriate

All errors (new ones prefixed by >>):

In file included from include/linux/device.h:25,
from include/linux/acpi.h:15, from drivers/watchdog/iTCO_wdt.c:48:

>> drivers/watchdog/iTCO_wdt.c:645:21: error: 'iTCO_wdt_pm' undeclared here (not in a function); did you mean 'iTCO_wdt_ops'?
     645 |   .pm     = pm_ptr(&iTCO_wdt_pm),
         |                     ^~~~~~~~~~~
   include/linux/pm.h:377:23: note: in definition of macro 'pm_ptr'
     377 | #define pm_ptr(_ptr) (_ptr)
         |                       ^~~~

vim +645 drivers/watchdog/iTCO_wdt.c

640
641 static struct platform_driver iTCO_wdt_driver = {
642 .probe = iTCO_wdt_probe,
643 .driver = {
644 .name = DRV_NAME,

 > 645			.pm     = pm_ptr(&iTCO_wdt_pm),

646 },
647 };
648

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org

maintainer
#5 lore raw
Quoted 40 lines · kernel test robot

Hi "Enrico,

I love your patch! Yet something to improve:

[auto build test ERROR on linux/master]
[also build test ERROR on hwmon/hwmon-next linus/master v5.13-rc6 next-20210618] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/0day-ci/linux/commits/Enrico-Weigelt-metux-IT-consult/watchdog-iTCO_wdt-use-pm_ptr/20210617-024441
base:   https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git dd860052c99b1e088352bdd4fb7aef46f8d2ef47
config: ia64-allmodconfig (attached as .config)
compiler: ia64-linux-gcc (GCC) 9.3.0

reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/670a790c3acfccf4b5405459048ba2a05b912eef
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Enrico-Weigelt-metux-IT-consult/watchdog-iTCO_wdt-use-pm_ptr/20210617-024441 git checkout 670a790c3acfccf4b5405459048ba2a05b912eef
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=ia64

If you fix the issue, kindly add following tag as appropriate

All errors (new ones prefixed by >>):

In file included from include/linux/device.h:25,
from include/linux/acpi.h:15, from drivers/watchdog/iTCO_wdt.c:48:

Quoted 1 line
Quoted 1 line

drivers/watchdog/iTCO_wdt.c:645:21: error: 'iTCO_wdt_pm' undeclared here (not in a function); did you mean 'iTCO_wdt_ops'?

     645 |   .pm     = pm_ptr(&iTCO_wdt_pm),
         |                     ^~~~~~~~~~~
   include/linux/pm.h:377:23: note: in definition of macro 'pm_ptr'
     377 | #define pm_ptr(_ptr) (_ptr)
         |                       ^~~~
Quoted 8 lines

vim +645 drivers/watchdog/iTCO_wdt.c

   640	
   641	static struct platform_driver iTCO_wdt_driver = {
   642		.probe          = iTCO_wdt_probe,
   643		.driver         = {
   644			.name   = DRV_NAME,
Quoted 1 line

645 .pm = pm_ptr(&iTCO_wdt_pm),

I'll drop this patch for now.

Guenter

Quoted 7 lines
   646		},
   647	};
   648	

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org