watchdog: Prefer unsigned int to bare use of unsigned
Subsystems (7)
PATCH v2 1/1 watchdog: Prefer unsigned int to bare use of unsigned
Fix checkpatch warnings:
WARNING: Prefer 'unsigned int' to bare use of 'unsigned'
Signed-off-by Jinchao Wang <[email protected]>
---
- changes for v2:
- Solve the alignment problem and the problem of one more space after
- int
--- drivers/watchdog/ar7_wdt.c | 2 +- drivers/watchdog/ath79_wdt.c | 4 ++-- drivers/watchdog/bcm_kona_wdt.c | 6 +++--- drivers/watchdog/digicolor_wdt.c | 2 +- drivers/watchdog/ebc-c384_wdt.c | 6 +++--- drivers/watchdog/imx2_wdt.c | 2 +- drivers/watchdog/it8712f_wdt.c | 2 +- drivers/watchdog/mt7621_wdt.c | 4 ++-- drivers/watchdog/omap_wdt.c | 2 +- drivers/watchdog/pika_wdt.c | 2 +- drivers/watchdog/rt2880_wdt.c | 4 ++-- drivers/watchdog/sbc7240_wdt.c | 2 +- drivers/watchdog/shwdt.c | 2 +- drivers/watchdog/stmp3xxx_rtc_wdt.c | 4 ++-- drivers/watchdog/w83977f_wdt.c | 2 +- drivers/watchdog/watchdog_dev.c | 2 +- 16 files changed, 24 insertions(+), 24 deletions(-)
drivers/watchdog/ar7_wdt.c +1 -1
@@ -57,7 +57,7 @@ struct ar7_wdt { };static unsigned long wdt_is_open; -static unsigned expect_close; +static unsigned int expect_close;static DEFINE_SPINLOCK (wdt_lock);/* XXX currently fixed, allows max margin ~68.72 secs */
drivers/watchdog/ath79_wdt.c +2 -2
@@ -68,12 +68,12 @@ static int boot_status;static int max_timeout;static void __iomem *wdt_base; -static inline void ath79_wdt_wr (unsigned reg,u32 val) +static inline void ath79_wdt_wr (unsigned int reg,u32 val) {iowrite32 (val, wdt_base + reg); } -static inline u32 ath79_wdt_rr (unsigned reg) +static inline u32 ath79_wdt_rr (unsigned int reg) {return ioread32 (wdt_base + reg); }
drivers/watchdog/bcm_kona_wdt.c +3 -3
@@ -58,7 +58,7 @@ struct bcm_kona_wdt {static int secure_register_read (struct bcm_kona_wdt *wdt,uint32_t offset) {uint32_t val; -unsigned count =0 ; +unsigned int count =0 ;/* * If the WD_LOAD_FLAG is set, the watchdog counter field is being
@@ -165,7 +165,7 @@ static void bcm_kona_wdt_debug_exit(struct platform_device *pdev) {}#endif /* CONFIG_BCM_KONA_WDT_DEBUG */ static int bcm_kona_wdt_ctrl_reg_modify (struct bcm_kona_wdt *wdt, -unsigned mask,unsigned newval) +unsigned int mask,unsigned int newval) {int val;unsigned long flags;
@@ -197,7 +197,7 @@ static int bcm_kona_wdt_set_resolution_reg(struct bcm_kona_wdt *wdt) }static int bcm_kona_wdt_set_timeout_reg (struct watchdog_device *wdog, -unsigned watchdog_flags) +unsigned int watchdog_flags) {struct bcm_kona_wdt *wdt =watchdog_get_drvdata (wdog);
drivers/watchdog/digicolor_wdt.c +1 -1
@@ -27,7 +27,7 @@ struct dc_wdt {spinlock_t lock; }; -static unsigned timeout; +static unsigned int timeout;module_param (timeout, uint,0 );MODULE_PARM_DESC (timeout,"Watchdog timeout in seconds" );
drivers/watchdog/ebc-c384_wdt.c +3 -3
@@ -32,14 +32,14 @@ module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); -static unsigned timeout; +static unsigned int timeout;module_param (timeout, uint,0 ); MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds (default=" __MODULE_STRING(WATCHDOG_TIMEOUT) ")");static int ebc_c384_wdt_start (struct watchdog_device *wdev) { -unsigned t = wdev->timeout; +unsigned int t = wdev->timeout;/* resolution is in minutes for timeouts greater than 255 seconds */ if (t >255 )
@@ -57,7 +57,7 @@ static int ebc_c384_wdt_stop(struct watchdog_device *wdev)return 0 ; } -static int ebc_c384_wdt_set_timeout (struct watchdog_device *wdev,unsigned t) +static int ebc_c384_wdt_set_timeout (struct watchdog_device *wdev,unsigned int t) {/* resolution is in minutes for timeouts greater than 255 seconds */ if (t >255 ) {
drivers/watchdog/imx2_wdt.c +1 -1
@@ -73,7 +73,7 @@ module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); -static unsigned timeout; +static unsigned int timeout;module_param (timeout, uint,0 ); MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds (default=" __MODULE_STRING(IMX2_WDT_DEFAULT_TIME) ")");
drivers/watchdog/it8712f_wdt.c +1 -1
@@ -47,7 +47,7 @@ module_param(nowayout, bool, 0);MODULE_PARM_DESC (nowayout,"Disable watchdog shutdown on close" );static unsigned long wdt_open; -static unsigned expect_close; +static unsigned int expect_close;static unsigned char revision;/* Dog Food address - We use the game port address */
drivers/watchdog/mt7621_wdt.c +2 -2
@@ -40,12 +40,12 @@ MODULE_PARM_DESC(nowayout,"Watchdog cannot be stopped once started (default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); -static inline void rt_wdt_w32 (unsigned reg,u32 val) +static inline void rt_wdt_w32 (unsigned int reg,u32 val) {iowrite32 (val, mt7621_wdt_base + reg); } -static inline u32 rt_wdt_r32 (unsigned reg) +static inline u32 rt_wdt_r32 (unsigned int reg) {return ioread32 (mt7621_wdt_base + reg); }
drivers/watchdog/omap_wdt.c +1 -1
@@ -48,7 +48,7 @@ module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started " "(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); -static unsigned timer_margin; +static unsigned int timer_margin;module_param (timer_margin, uint,0 );MODULE_PARM_DESC (timer_margin,"initial watchdog timeout (in seconds)" );
drivers/watchdog/pika_wdt.c +1 -1
@@ -77,7 +77,7 @@ static inline void pikawdt_reset(void)* seconds. Valid ranges are 1 to 15 seconds. The value can * be modified dynamically. */ -unsigned reset =in_be32 (pikawdt_private.fpga +0x14 ); +unsigned int reset =in_be32 (pikawdt_private.fpga +0x14 );/* enable with max timeout - 15 seconds */ reset |= (1 <<7 ) + (WDT_HW_TIMEOUT <<8 );out_be32 (pikawdt_private.fpga +0x14 , reset);
drivers/watchdog/rt2880_wdt.c +2 -2
@@ -51,12 +51,12 @@ MODULE_PARM_DESC(nowayout,"Watchdog cannot be stopped once started (default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); -static inline void rt_wdt_w32 (unsigned reg,u32 val) +static inline void rt_wdt_w32 (unsigned int reg,u32 val) {iowrite32 (val, rt288x_wdt_base + reg); } -static inline u32 rt_wdt_r32 (unsigned reg) +static inline u32 rt_wdt_r32 (unsigned int reg) {return ioread32 (rt288x_wdt_base + reg); }
drivers/watchdog/sbc7240_wdt.c +1 -1
@@ -75,7 +75,7 @@ static int wdt_set_timeout(int t)return -1 ; }/* set the timeout */ -outb_p ((unsigned )t,SBC7240_SET_TIMEOUT_PORT ); +outb_p ((unsigned int )t,SBC7240_SET_TIMEOUT_PORT ); timeout = t;pr_info ("timeout set to %d seconds\n" , t);return 0 ;
drivers/watchdog/shwdt.c +1 -1
@@ -155,7 +155,7 @@ static int sh_wdt_keepalive(struct watchdog_device *wdt_dev)return 0 ; } -static int sh_wdt_set_heartbeat (struct watchdog_device *wdt_dev,unsigned t) +static int sh_wdt_set_heartbeat (struct watchdog_device *wdt_dev,unsigned int t) {struct sh_wdt *wdt =watchdog_get_drvdata (wdt_dev);unsigned long flags;
drivers/watchdog/stmp3xxx_rtc_wdt.c +2 -2
@@ -42,7 +42,7 @@ static int wdt_stop(struct watchdog_device *wdd)return 0 ; } -static int wdt_set_timeout (struct watchdog_device *wdd,unsigned new_timeout) +static int wdt_set_timeout (struct watchdog_device *wdd,unsigned int new_timeout) { wdd->timeout = new_timeout;return wdt_start (wdd);
@@ -94,7 +94,7 @@ static int stmp3xxx_wdt_probe(struct platform_device *pdev)watchdog_set_drvdata (&stmp3xxx_wdd, dev); - stmp3xxx_wdd.timeout =clamp_t (unsigned, heartbeat,1 ,STMP3XXX_MAX_TIMEOUT ); + stmp3xxx_wdd.timeout = clamp_t(unsigned int, heartbeat, 1, STMP3XXX_MAX_TIMEOUT); stmp3xxx_wdd.parent = dev; ret =devm_watchdog_register_device (dev, &stmp3xxx_wdd);
drivers/watchdog/w83977f_wdt.c +1 -1
@@ -102,7 +102,7 @@ static int wdt_start(void)outb_p (DEVICE_REGISTER ,IO_INDEX_PORT );outb_p (0x07 ,IO_DATA_PORT );if (!testmode) { -unsigned pin_map; +unsigned int pin_map;outb_p (0xE6 ,IO_INDEX_PORT );outb_p (0x0A ,IO_DATA_PORT );
drivers/watchdog/watchdog_dev.c +1 -1
@@ -57,7 +57,7 @@ static struct kthread_worker *watchdog_kworker;static bool handle_boot_enabled =IS_ENABLED (CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED ); -static unsigned open_timeout =CONFIG_WATCHDOG_OPEN_TIMEOUT ; +static unsigned int open_timeout =CONFIG_WATCHDOG_OPEN_TIMEOUT ;static bool watchdog_past_open_deadline (struct watchdog_core_data *data) {
Signature · 7 lines
2.31.1 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek