Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-01 10:43:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

watchdog: da9063: Do not use a global variable

Browse Source 
Using the 'use_sw_pm' variable as global is not recommended
as it prevents multi instances of the driver to run.

Make it a member of the da9063 structure instead.

Signed-off-by: Fabio Estevam <festevam@denx.de>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20241018135821.274376-1-festevam@gmail.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
This commit is contained in:
Fabio Estevam 2024-10-18 10:58:20 -03:00 committed by Wim Van Sebroeck
parent 3a6a399cfb
commit 076354a4d4
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/watchdog/da9063_wdt.c
View File

@ -27,7 +27,6 @@
* others: timeout = 2048 ms * 2^(TWDSCALE-1). * others: timeout = 2048 ms * 2^(TWDSCALE-1).
*/ */
static const unsigned int wdt_timeout[] = { 0, 2, 4, 8, 16, 32, 65, 131 }; static const unsigned int wdt_timeout[] = { 0, 2, 4, 8, 16, 32, 65, 131 };
static bool use_sw_pm;
#define DA9063_TWDSCALE_DISABLE 0 #define DA9063_TWDSCALE_DISABLE 0
#define DA9063_TWDSCALE_MIN 1 #define DA9063_TWDSCALE_MIN 1
@ -230,7 +229,7 @@ static int da9063_wdt_probe(struct platform_device *pdev)
if (!wdd) if (!wdd)
return -ENOMEM; return -ENOMEM;
use_sw_pm = device_property_present(dev, "dlg,use-sw-pm"); da9063->use_sw_pm = device_property_present(dev, "dlg,use-sw-pm");
wdd->info = &da9063_watchdog_info; wdd->info = &da9063_watchdog_info;
wdd->ops = &da9063_watchdog_ops; wdd->ops = &da9063_watchdog_ops;
@ -267,8 +266,9 @@ static int da9063_wdt_probe(struct platform_device *pdev)
static int __maybe_unused da9063_wdt_suspend(struct device *dev) static int __maybe_unused da9063_wdt_suspend(struct device *dev)
{ {
struct watchdog_device *wdd = dev_get_drvdata(dev); struct watchdog_device *wdd = dev_get_drvdata(dev);
struct da9063 *da9063 = watchdog_get_drvdata(wdd);
if (!use_sw_pm) if (!da9063->use_sw_pm)
return 0; return 0;
if (watchdog_active(wdd)) if (watchdog_active(wdd))
@ -280,8 +280,9 @@ static int __maybe_unused da9063_wdt_suspend(struct device *dev)
static int __maybe_unused da9063_wdt_resume(struct device *dev) static int __maybe_unused da9063_wdt_resume(struct device *dev)
{ {
struct watchdog_device *wdd = dev_get_drvdata(dev); struct watchdog_device *wdd = dev_get_drvdata(dev);
struct da9063 *da9063 = watchdog_get_drvdata(wdd);
if (!use_sw_pm) if (!da9063->use_sw_pm)
return 0; return 0;
if (watchdog_active(wdd)) if (watchdog_active(wdd))

1
include/linux/mfd/da9063/core.h
View File

@ -78,6 +78,7 @@ struct da9063 {
enum da9063_type type; enum da9063_type type;
unsigned char variant_code; unsigned char variant_code;
unsigned int flags; unsigned int flags;
bool use_sw_pm;
/* Control interface */ /* Control interface */
struct regmap *regmap; struct regmap *regmap;