Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c368932 authored by Bhumika Goyal's avatar Bhumika Goyal Committed by Guenter Roeck
Browse files

watchdog: constify watchdog_info structures 



Declare watchdog_info structures as const as they are only stored in the
info field of watchdog_device structures. This field is of type const
struct watchdog_info *, so watchdog_info structures having this property
can be declared const too.
Done using Coccinelle:

@r1 disable optional_qualifier@
identifier i;
position p;
@@
static struct watchdog_info i@p={...};

@ok@
identifier r1.i;
position p;
struct watchdog_device obj;
@@
obj.info=&i@p;

@bad@
position p!={r1.p,ok.p};
identifier r1.i;
@@
i@p

@depends on !bad disable optional_qualifier@
identifier r1.i;
@@
+const
struct watchdog_info i;

Signed-off-by: default avatarBhumika Goyal <bhumirks@gmail.com>
Acked-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Acked-by: default avatarBaruch Siach <baruch@tkos.co.il>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Acked-by: default avatarAdam Thomson <Adam.Thomson.Opensource@diasemi.com>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent cb5f9d40

drivers/watchdog/bcm7038_wdt.c

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ static unsigned int bcm7038_wdt_get_timeleft(struct watchdog_device *wdog) 
	return time_left / wdt->rate;

}



static struct watchdog_info bcm7038_wdt_info = {

static const struct watchdog_info bcm7038_wdt_info = {

	.identity	= "Broadcom BCM7038 Watchdog Timer",

	.options	= WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING |

				WDIOF_MAGICCLOSE

drivers/watchdog/bcm_kona_wdt.c

+1 −1
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ static struct watchdog_ops bcm_kona_wdt_ops = { 
	.get_timeleft =	bcm_kona_wdt_get_timeleft,

};



static struct watchdog_info bcm_kona_wdt_info = {

static const struct watchdog_info bcm_kona_wdt_info = {

	.options =	WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE |

			WDIOF_KEEPALIVEPING,

	.identity =	"Broadcom Kona Watchdog Timer",

drivers/watchdog/cadence_wdt.c

+1 −1
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ static irqreturn_t cdns_wdt_irq_handler(int irq, void *dev_id) 
 * Info structure used to indicate the features supported by the device

 * to the upper layers. This is defined in watchdog.h header file.

 */

static struct watchdog_info cdns_wdt_info = {

static const struct watchdog_info cdns_wdt_info = {

	.identity	= "cdns_wdt watchdog",

	.options	= WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING |

			  WDIOF_MAGICCLOSE,

drivers/watchdog/da9052_wdt.c

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ static int da9052_wdt_ping(struct watchdog_device *wdt_dev) 
	return ret;

}



static struct watchdog_info da9052_wdt_info = {

static const struct watchdog_info da9052_wdt_info = {

	.options	= WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,

	.identity	= "DA9052 Watchdog",

};

drivers/watchdog/da9055_wdt.c

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ static int da9055_wdt_stop(struct watchdog_device *wdt_dev) 
	return da9055_wdt_set_timeout(wdt_dev, 0);

}



static struct watchdog_info da9055_wdt_info = {

static const struct watchdog_info da9055_wdt_info = {

	.options	= WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,

	.identity	= "DA9055 Watchdog",

};