tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[WATCHDOG] watchdog_info constify

make the watchdog_info struct const where possible.

Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

Wim Van Sebroeck 42747d71 cda61c94

+53 -53
unified split
+1 -1
arch/powerpc/platforms/52xx/mpc52xx_gpt.c
··· 553 553 return 0; 554 554 } 555 555 556 - static struct watchdog_info mpc5200_wdt_info = { 556 + static const struct watchdog_info mpc5200_wdt_info = { 557 557 .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING, 558 558 .identity = WDT_IDENTITY, 559 559 };
+1 -1
drivers/watchdog/acquirewdt.c
··· 150 150 int options, retval = -EINVAL; 151 151 void __user *argp = (void __user *)arg; 152 152 int __user *p = argp; 153 - static struct watchdog_info ident = { 153 + static const struct watchdog_info ident = { 154 154 .options = WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE, 155 155 .firmware_version = 1, 156 156 .identity = WATCHDOG_NAME,
+1 -1
drivers/watchdog/advantechwdt.c
··· 137 137 int new_timeout; 138 138 void __user *argp = (void __user *)arg; 139 139 int __user *p = argp; 140 - static struct watchdog_info ident = { 140 + static const struct watchdog_info ident = { 141 141 .options = WDIOF_KEEPALIVEPING | 142 142 WDIOF_SETTIMEOUT | 143 143 WDIOF_MAGICCLOSE,
+1 -1
drivers/watchdog/adx_wdt.c
··· 37 37 spinlock_t lock; 38 38 }; 39 39 40 - static struct watchdog_info adx_wdt_info = { 40 + static const struct watchdog_info adx_wdt_info = { 41 41 .identity = "Avionic Design Xanthos Watchdog", 42 42 .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING, 43 43 };
+1 -1
drivers/watchdog/alim1535_wdt.c
··· 180 180 { 181 181 void __user *argp = (void __user *)arg; 182 182 int __user *p = argp; 183 - static struct watchdog_info ident = { 183 + static const struct watchdog_info ident = { 184 184 .options = WDIOF_KEEPALIVEPING | 185 185 WDIOF_SETTIMEOUT | 186 186 WDIOF_MAGICCLOSE,
+1 -1
drivers/watchdog/alim7101_wdt.c
··· 238 238 { 239 239 void __user *argp = (void __user *)arg; 240 240 int __user *p = argp; 241 - static struct watchdog_info ident = { 241 + static const struct watchdog_info ident = { 242 242 .options = WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT 243 243 | WDIOF_MAGICCLOSE, 244 244 .firmware_version = 1,
+1 -1
drivers/watchdog/ar7_wdt.c
··· 219 219 static long ar7_wdt_ioctl(struct file *file, 220 220 unsigned int cmd, unsigned long arg) 221 221 { 222 - static struct watchdog_info ident = { 222 + static const struct watchdog_info ident = { 223 223 .identity = LONGNAME, 224 224 .firmware_version = 1, 225 225 .options = (WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING |
+1 -1
drivers/watchdog/at32ap700x_wdt.c
··· 202 202 return status; 203 203 } 204 204 205 - static struct watchdog_info at32_wdt_info = { 205 + static const struct watchdog_info at32_wdt_info = { 206 206 .identity = "at32ap700x watchdog", 207 207 .options = WDIOF_SETTIMEOUT | 208 208 WDIOF_KEEPALIVEPING |
+1 -1
drivers/watchdog/at91rm9200_wdt.c
··· 121 121 return 0; 122 122 } 123 123 124 - static struct watchdog_info at91_wdt_info = { 124 + static const struct watchdog_info at91_wdt_info = { 125 125 .identity = "at91 watchdog", 126 126 .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING, 127 127 };
+1 -1
drivers/watchdog/bcm47xx_wdt.c
··· 149 149 return len; 150 150 } 151 151 152 - static struct watchdog_info bcm47xx_wdt_info = { 152 + static const struct watchdog_info bcm47xx_wdt_info = { 153 153 .identity = DRV_NAME, 154 154 .options = WDIOF_SETTIMEOUT | 155 155 WDIOF_KEEPALIVEPING |
+2 -2
drivers/watchdog/bfin_wdt.c
··· 74 74 75 75 static unsigned int timeout = WATCHDOG_TIMEOUT; 76 76 static int nowayout = WATCHDOG_NOWAYOUT; 77 - static struct watchdog_info bfin_wdt_info; 77 + static const struct watchdog_info bfin_wdt_info; 78 78 static unsigned long open_check; 79 79 static char expect_close; 80 80 static DEFINE_SPINLOCK(bfin_wdt_spinlock); ··· 388 388 .fops = &bfin_wdt_fops, 389 389 }; 390 390 391 - static struct watchdog_info bfin_wdt_info = { 391 + static const struct watchdog_info bfin_wdt_info = { 392 392 .identity = "Blackfin Watchdog", 393 393 .options = WDIOF_SETTIMEOUT | 394 394 WDIOF_KEEPALIVEPING |
+1 -1
drivers/watchdog/booke_wdt.c
··· 121 121 return count; 122 122 } 123 123 124 - static struct watchdog_info ident = { 124 + static const struct watchdog_info ident = { 125 125 .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING, 126 126 .identity = "PowerPC Book-E Watchdog", 127 127 };
+1 -1
drivers/watchdog/coh901327_wdt.c
··· 257 257 struct watchdog_info __user *ident; 258 258 int __user *i; 259 259 } uarg; 260 - static struct watchdog_info ident = { 260 + static const struct watchdog_info ident = { 261 261 .options = WDIOF_CARDRESET | 262 262 WDIOF_SETTIMEOUT | 263 263 WDIOF_KEEPALIVEPING,
+1 -1
drivers/watchdog/cpu5wdt.c
··· 154 154 void __user *argp = (void __user *)arg; 155 155 int __user *p = argp; 156 156 unsigned int value; 157 - static struct watchdog_info ident = { 157 + static const struct watchdog_info ident = { 158 158 .options = WDIOF_CARDRESET, 159 159 .identity = "CPU5 WDT", 160 160 };
+1 -1
drivers/watchdog/cpwd.c
··· 403 403 404 404 static long cpwd_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 405 405 { 406 - static struct watchdog_info info = { 406 + static const struct watchdog_info info = { 407 407 .options = WDIOF_SETTIMEOUT, 408 408 .firmware_version = 1, 409 409 .identity = DRIVER_NAME,
+1 -1
drivers/watchdog/davinci_wdt.c
··· 142 142 return len; 143 143 } 144 144 145 - static struct watchdog_info ident = { 145 + static const struct watchdog_info ident = { 146 146 .options = WDIOF_KEEPALIVEPING, 147 147 .identity = "DaVinci Watchdog", 148 148 };
+1 -1
drivers/watchdog/ep93xx_wdt.c
··· 131 131 return len; 132 132 } 133 133 134 - static struct watchdog_info ident = { 134 + static const struct watchdog_info ident = { 135 135 .options = WDIOF_CARDRESET | WDIOF_MAGICCLOSE, 136 136 .identity = "EP93xx Watchdog", 137 137 };
+1 -1
drivers/watchdog/eurotechwdt.c
··· 238 238 { 239 239 void __user *argp = (void __user *)arg; 240 240 int __user *p = argp; 241 - static struct watchdog_info ident = { 241 + static const struct watchdog_info ident = { 242 242 .options = WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT 243 243 | WDIOF_MAGICCLOSE, 244 244 .firmware_version = 1,
+1 -1
drivers/watchdog/gef_wdt.c
··· 161 161 int timeout; 162 162 int options; 163 163 void __user *argp = (void __user *)arg; 164 - static struct watchdog_info info = { 164 + static const struct watchdog_info info = { 165 165 .options = WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE | 166 166 WDIOF_KEEPALIVEPING, 167 167 .firmware_version = 0,
+1 -1
drivers/watchdog/geodewdt.c
··· 142 142 int __user *p = argp; 143 143 int interval; 144 144 145 - static struct watchdog_info ident = { 145 + static const struct watchdog_info ident = { 146 146 .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING 147 147 | WDIOF_MAGICCLOSE, 148 148 .firmware_version = 1,
+1 -1
drivers/watchdog/hpwdt.c
··· 554 554 return len; 555 555 } 556 556 557 - static struct watchdog_info ident = { 557 + static const struct watchdog_info ident = { 558 558 .options = WDIOF_SETTIMEOUT | 559 559 WDIOF_KEEPALIVEPING | 560 560 WDIOF_MAGICCLOSE,
+1 -1
drivers/watchdog/i6300esb.c
··· 256 256 int new_heartbeat; 257 257 void __user *argp = (void __user *)arg; 258 258 int __user *p = argp; 259 - static struct watchdog_info ident = { 259 + static const struct watchdog_info ident = { 260 260 .options = WDIOF_SETTIMEOUT | 261 261 WDIOF_KEEPALIVEPING | 262 262 WDIOF_MAGICCLOSE,
+1 -1
drivers/watchdog/iTCO_wdt.c
··· 584 584 int new_heartbeat; 585 585 void __user *argp = (void __user *)arg; 586 586 int __user *p = argp; 587 - static struct watchdog_info ident = { 587 + static const struct watchdog_info ident = { 588 588 .options = WDIOF_SETTIMEOUT | 589 589 WDIOF_KEEPALIVEPING | 590 590 WDIOF_MAGICCLOSE,
+1 -1
drivers/watchdog/ib700wdt.c
··· 174 174 void __user *argp = (void __user *)arg; 175 175 int __user *p = argp; 176 176 177 - static struct watchdog_info ident = { 177 + static const struct watchdog_info ident = { 178 178 .options = WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT 179 179 | WDIOF_MAGICCLOSE, 180 180 .firmware_version = 1,
+1 -1
drivers/watchdog/indydog.c
··· 111 111 unsigned long arg) 112 112 { 113 113 int options, retval = -EINVAL; 114 - static struct watchdog_info ident = { 114 + static const struct watchdog_info ident = { 115 115 .options = WDIOF_KEEPALIVEPING, 116 116 .firmware_version = 0, 117 117 .identity = "Hardware Watchdog for SGI IP22",
+1 -1
drivers/watchdog/it8712f_wdt.c
··· 236 236 { 237 237 void __user *argp = (void __user *)arg; 238 238 int __user *p = argp; 239 - static struct watchdog_info ident = { 239 + static const struct watchdog_info ident = { 240 240 .identity = "IT8712F Watchdog", 241 241 .firmware_version = 1, 242 242 .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING |
+1 -1
drivers/watchdog/it87_wdt.c
··· 421 421 return count; 422 422 } 423 423 424 - static struct watchdog_info ident = { 424 + static const struct watchdog_info ident = { 425 425 .options = WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE | WDIOF_KEEPALIVEPING, 426 426 .firmware_version = 1, 427 427 .identity = WATCHDOG_NAME,
+1 -1
drivers/watchdog/ixp2000_wdt.c
··· 100 100 } 101 101 102 102 103 - static struct watchdog_info ident = { 103 + static const struct watchdog_info ident = { 104 104 .options = WDIOF_MAGICCLOSE | WDIOF_SETTIMEOUT | 105 105 WDIOF_KEEPALIVEPING, 106 106 .identity = "IXP2000 Watchdog",
+1 -1
drivers/watchdog/ixp4xx_wdt.c
··· 89 89 return len; 90 90 } 91 91 92 - static struct watchdog_info ident = { 92 + static const struct watchdog_info ident = { 93 93 .options = WDIOF_CARDRESET | WDIOF_MAGICCLOSE | 94 94 WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING, 95 95 .identity = "IXP4xx Watchdog",
+1 -1
drivers/watchdog/ks8695_wdt.c
··· 145 145 return 0; 146 146 } 147 147 148 - static struct watchdog_info ks8695_wdt_info = { 148 + static const struct watchdog_info ks8695_wdt_info = { 149 149 .identity = "ks8695 watchdog", 150 150 .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING, 151 151 };
+1 -1
drivers/watchdog/machzwd.c
··· 101 101 102 102 #define PFX "machzwd" 103 103 104 - static struct watchdog_info zf_info = { 104 + static const struct watchdog_info zf_info = { 105 105 .options = WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE, 106 106 .firmware_version = 1, 107 107 .identity = "ZF-Logic watchdog",
+1 -1
drivers/watchdog/mixcomwd.c
··· 201 201 void __user *argp = (void __user *)arg; 202 202 int __user *p = argp; 203 203 int status; 204 - static struct watchdog_info ident = { 204 + static const struct watchdog_info ident = { 205 205 .options = WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE, 206 206 .firmware_version = 1, 207 207 .identity = "MixCOM watchdog",
+1 -1
drivers/watchdog/mpc8xxx_wdt.c
··· 148 148 { 149 149 void __user *argp = (void __user *)arg; 150 150 int __user *p = argp; 151 - static struct watchdog_info ident = { 151 + static const struct watchdog_info ident = { 152 152 .options = WDIOF_KEEPALIVEPING, 153 153 .firmware_version = 1, 154 154 .identity = "MPC8xxx",
+1 -1
drivers/watchdog/mpcore_wdt.c
··· 213 213 return len; 214 214 } 215 215 216 - static struct watchdog_info ident = { 216 + static const struct watchdog_info ident = { 217 217 .options = WDIOF_SETTIMEOUT | 218 218 WDIOF_KEEPALIVEPING | 219 219 WDIOF_MAGICCLOSE,
+1 -1
drivers/watchdog/mv64x60_wdt.c
··· 179 179 int timeout; 180 180 int options; 181 181 void __user *argp = (void __user *)arg; 182 - static struct watchdog_info info = { 182 + static const struct watchdog_info info = { 183 183 .options = WDIOF_SETTIMEOUT | 184 184 WDIOF_MAGICCLOSE | 185 185 WDIOF_KEEPALIVEPING,
+1 -1
drivers/watchdog/pc87413_wdt.c
··· 407 407 int __user *i; 408 408 } uarg; 409 409 410 - static struct watchdog_info ident = { 410 + static const struct watchdog_info ident = { 411 411 .options = WDIOF_KEEPALIVEPING | 412 412 WDIOF_SETTIMEOUT | 413 413 WDIOF_MAGICCLOSE,
+1 -1
drivers/watchdog/pcwd.c
··· 606 606 int temperature; 607 607 int new_heartbeat; 608 608 int __user *argp = (int __user *)arg; 609 - static struct watchdog_info ident = { 609 + static const struct watchdog_info ident = { 610 610 .options = WDIOF_OVERHEAT | 611 611 WDIOF_CARDRESET | 612 612 WDIOF_KEEPALIVEPING |
+1 -1
drivers/watchdog/pcwd_pci.c
··· 481 481 { 482 482 void __user *argp = (void __user *)arg; 483 483 int __user *p = argp; 484 - static struct watchdog_info ident = { 484 + static const struct watchdog_info ident = { 485 485 .options = WDIOF_OVERHEAT | 486 486 WDIOF_CARDRESET | 487 487 WDIOF_KEEPALIVEPING |
+1 -1
drivers/watchdog/pcwd_usb.c
··· 404 404 { 405 405 void __user *argp = (void __user *)arg; 406 406 int __user *p = argp; 407 - static struct watchdog_info ident = { 407 + static const struct watchdog_info ident = { 408 408 .options = WDIOF_KEEPALIVEPING | 409 409 WDIOF_SETTIMEOUT | 410 410 WDIOF_MAGICCLOSE,
+1 -1
drivers/watchdog/pika_wdt.c
··· 52 52 struct timer_list timer; /* The timer that pings the watchdog */ 53 53 } pikawdt_private; 54 54 55 - static struct watchdog_info ident = { 55 + static const struct watchdog_info ident = { 56 56 .identity = DRV_NAME, 57 57 .options = WDIOF_CARDRESET | 58 58 WDIOF_SETTIMEOUT |
+1 -1
drivers/watchdog/pnx833x_wdt.c
··· 141 141 int options, new_timeout = 0; 142 142 uint32_t timeout, timeout_left = 0; 143 143 144 - static struct watchdog_info ident = { 144 + static const struct watchdog_info ident = { 145 145 .options = WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT, 146 146 .firmware_version = 0, 147 147 .identity = "Hardware Watchdog for PNX833x",
+1 -1
drivers/watchdog/rc32434_wdt.c
··· 198 198 void __user *argp = (void __user *)arg; 199 199 int new_timeout; 200 200 unsigned int value; 201 - static struct watchdog_info ident = { 201 + static const struct watchdog_info ident = { 202 202 .options = WDIOF_SETTIMEOUT | 203 203 WDIOF_KEEPALIVEPING | 204 204 WDIOF_MAGICCLOSE,
+1 -1
drivers/watchdog/rdc321x_wdt.c
··· 149 149 { 150 150 void __user *argp = (void __user *)arg; 151 151 unsigned int value; 152 - static struct watchdog_info ident = { 152 + static const struct watchdog_info ident = { 153 153 .options = WDIOF_CARDRESET, 154 154 .identity = "RDC321x WDT", 155 155 };
+1 -1
drivers/watchdog/riowd.c
··· 85 85 86 86 static long riowd_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 87 87 { 88 - static struct watchdog_info info = { 88 + static const struct watchdog_info info = { 89 89 .options = WDIOF_SETTIMEOUT, 90 90 .firmware_version = 1, 91 91 .identity = DRIVER_NAME,
+1 -1
drivers/watchdog/sbc_fitpc2_wdt.c
··· 111 111 } 112 112 113 113 114 - static struct watchdog_info ident = { 114 + static const struct watchdog_info ident = { 115 115 .options = WDIOF_MAGICCLOSE | WDIOF_SETTIMEOUT | 116 116 WDIOF_KEEPALIVEPING, 117 117 .identity = WATCHDOG_NAME,
+1 -1
drivers/watchdog/sch311x_wdt.c
··· 250 250 int new_timeout; 251 251 void __user *argp = (void __user *)arg; 252 252 int __user *p = argp; 253 - static struct watchdog_info ident = { 253 + static const struct watchdog_info ident = { 254 254 .options = WDIOF_KEEPALIVEPING | 255 255 WDIOF_SETTIMEOUT | 256 256 WDIOF_MAGICCLOSE,
+1 -1
drivers/watchdog/stmp3xxx_wdt.c
··· 94 94 return len; 95 95 } 96 96 97 - static struct watchdog_info ident = { 97 + static const struct watchdog_info ident = { 98 98 .options = WDIOF_CARDRESET | 99 99 WDIOF_MAGICCLOSE | 100 100 WDIOF_SETTIMEOUT |
+1 -1
drivers/watchdog/w83627hf_wdt.c
··· 201 201 void __user *argp = (void __user *)arg; 202 202 int __user *p = argp; 203 203 int new_timeout; 204 - static struct watchdog_info ident = { 204 + static const struct watchdog_info ident = { 205 205 .options = WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT | 206 206 WDIOF_MAGICCLOSE, 207 207 .firmware_version = 1,
+1 -1
drivers/watchdog/w83977f_wdt.c
··· 371 371 * according to their available features. 372 372 */ 373 373 374 - static struct watchdog_info ident = { 374 + static const struct watchdog_info ident = { 375 375 .options = WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE | WDIOF_KEEPALIVEPING, 376 376 .firmware_version = 1, 377 377 .identity = WATCHDOG_NAME,
+1 -1
drivers/watchdog/wdrtas.c
··· 312 312 { 313 313 int __user *argp = (void __user *)arg; 314 314 int i; 315 - static struct watchdog_info wdinfo = { 315 + static const struct watchdog_info wdinfo = { 316 316 .options = WDRTAS_SUPPORTED_MASK, 317 317 .firmware_version = 0, 318 318 .identity = "wdrtas",
+1 -1
drivers/watchdog/wm831x_wdt.c
··· 213 213 return count; 214 214 } 215 215 216 - static struct watchdog_info ident = { 216 + static const struct watchdog_info ident = { 217 217 .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE, 218 218 .identity = "WM831x Watchdog", 219 219 };
+1 -1
drivers/watchdog/wm8350_wdt.c
··· 177 177 return count; 178 178 } 179 179 180 - static struct watchdog_info ident = { 180 + static const struct watchdog_info ident = { 181 181 .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE, 182 182 .identity = "WM8350 Watchdog", 183 183 };