summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschowdary <schowdary@nvidia.com>2012-07-24 18:46:07 +0530
committerSimone Willett <swillett@nvidia.com>2012-08-02 09:25:20 -0700
commit0254c4fc1ffd4075904f22dbbcbd1052b1dae95e (patch)
tree7420e3d182338f36569ad851b3923bde31ae7661
parent8c6bf6af6db76131b9daf9c1d82e0f8e4e1acbf0 (diff)
watchdog: tegra: enable compile warning as error
- Add compilation flag to treat warning as error - Handle error of unused variable - Handle error of uninitialised variable bug 949219 Change-Id: I07437be5eaa7bf7abe5494c828690b6be3b98178 Signed-off-by: schowdary <schowdary@nvidia.com> Reviewed-on: http://git-master/r/118039 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Sachin Nikam <snikam@nvidia.com>
-rw-r--r--drivers/watchdog/Makefile1
-rw-r--r--drivers/watchdog/tegra_wdt.c5
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
index dd35599a2612..9c6cc30bb905 100644
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@ -44,6 +44,7 @@ obj-$(CONFIG_S3C2410_WATCHDOG) += s3c2410_wdt.o
obj-$(CONFIG_SA1100_WATCHDOG) += sa1100_wdt.o
obj-$(CONFIG_DW_WATCHDOG) += dw_wdt.o
obj-$(CONFIG_MPCORE_WATCHDOG) += mpcore_wdt.o
+CFLAGS_tegra_wdt.o = -Werror
obj-$(CONFIG_TEGRA_WATCHDOG) += tegra_wdt.o
obj-$(CONFIG_EP93XX_WATCHDOG) += ep93xx_wdt.o
obj-$(CONFIG_PNX4008_WATCHDOG) += pnx4008_wdt.o
diff --git a/drivers/watchdog/tegra_wdt.c b/drivers/watchdog/tegra_wdt.c
index 0d8373efd3f1..1bcd726ebbd6 100644
--- a/drivers/watchdog/tegra_wdt.c
+++ b/drivers/watchdog/tegra_wdt.c
@@ -330,11 +330,11 @@ static const struct file_operations tegra_wdt_fops = {
static int tegra_wdt_probe(struct platform_device *pdev)
{
- struct resource *res_src, *res_wdt, *res_irq, *res_int_base;
+ struct resource *res_src, *res_wdt, *res_irq;
+ struct resource *res_int_base = NULL;
struct tegra_wdt *wdt;
u32 src;
int ret = 0;
- u32 val = 0;
if (pdev->id < -1 && pdev->id > 3) {
dev_err(&pdev->dev, "only IDs 3:0 supported\n");
@@ -469,6 +469,7 @@ static int tegra_wdt_probe(struct platform_device *pdev)
#ifdef CONFIG_TEGRA_WATCHDOG_ENABLE_ON_PROBE
/* Init and enable watchdog on WDT0 with timer 8 during probe */
if (!(pdev->id)) {
+ u32 val = 0;
wdt->status = WDT_ENABLED | WDT_ENABLED_AT_PROBE;
wdt->timeout = heartbeat;
tegra_wdt_enable(wdt);