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

Commit 85f15cfc authored by Julia Lawall's avatar Julia Lawall Committed by Wim Van Sebroeck
Browse files

watchdog: constify watchdog_ops structures 

Check for watchdog_ops structures that are only stored in the ops field of
a watchdog_device structure.  This field is declared const, so watchdog_ops
structures that have this property can be declared as const also.

The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/

)

// <smpl>
@r disable optional_qualifier@
identifier i;
position p;
@@
static struct watchdog_ops i@p = { ... };

@ok@
identifier r.i;
struct watchdog_device e;
position p;
@@
e.ops = &i@p;

@bad@
position p != {r.p,ok.p};
identifier r.i;
struct watchdog_ops e;
@@
e@i@p

@depends on !bad disable optional_qualifier@
identifier r.i;
@@
static
+const
 struct watchdog_ops i = { ... };
// </smpl>

Signed-off-by: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent 7123f253

drivers/watchdog/bcm7038_wdt.c

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ static struct watchdog_info bcm7038_wdt_info = { 
				WDIOF_MAGICCLOSE

};



static struct watchdog_ops bcm7038_wdt_ops = {

static const struct watchdog_ops bcm7038_wdt_ops = {

	.owner		= THIS_MODULE,

	.start		= bcm7038_wdt_start,

	.stop		= bcm7038_wdt_stop,

drivers/watchdog/cadence_wdt.c

+1 −1
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ static struct watchdog_info cdns_wdt_info = { 
};



/* Watchdog Core Ops */

static struct watchdog_ops cdns_wdt_ops = {

static const struct watchdog_ops cdns_wdt_ops = {

	.owner = THIS_MODULE,

	.start = cdns_wdt_start,

	.stop = cdns_wdt_stop,

drivers/watchdog/kempld_wdt.c

+1 −1
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ static struct watchdog_info kempld_wdt_info = { 
			WDIOF_PRETIMEOUT

};



static struct watchdog_ops kempld_wdt_ops = {

static const struct watchdog_ops kempld_wdt_ops = {

	.owner		= THIS_MODULE,

	.start		= kempld_wdt_start,

	.stop		= kempld_wdt_stop,

drivers/watchdog/rn5t618_wdt.c

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ static struct watchdog_info rn5t618_wdt_info = { 
	.identity	= DRIVER_NAME,

};



static struct watchdog_ops rn5t618_wdt_ops = {

static const struct watchdog_ops rn5t618_wdt_ops = {

	.owner          = THIS_MODULE,

	.start          = rn5t618_wdt_start,

	.stop           = rn5t618_wdt_stop,

drivers/watchdog/softdog.c

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ static struct watchdog_info softdog_info = { 
	.options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE,

};



static struct watchdog_ops softdog_ops = {

static const struct watchdog_ops softdog_ops = {

	.owner = THIS_MODULE,

	.start = softdog_ping,

	.stop = softdog_stop,