From bfdb79df1004fd3757f59a7c2882482880a3ee7b Mon Sep 17 00:00:00 2001 From: Sanjay Singh Rawat Date: Fri, 1 Jun 2012 16:31:55 +0530 Subject: arm: tegra: resolve compilation time warnings Bug 949219 Change-Id: I91a67d30869e9800c483f112d58b9f76e2dbe361 Signed-off-by: Sanjay Singh Rawat Reviewed-on: http://git-master/r/103534 Reviewed-by: Simone Willett Tested-by: Simone Willett --- arch/arm/mach-tegra/board-cardhu-pm298-power-rails.c | 3 +-- arch/arm/mach-tegra/board-cardhu-pm299-power-rails.c | 3 +-- arch/arm/mach-tegra/board-cardhu-power.c | 3 +-- arch/arm/mach-tegra/cpu-tegra3.c | 4 ++-- arch/arm/mach-tegra/pcie.c | 2 -- arch/arm/mach-tegra/tegra3_dvfs.c | 4 +--- arch/arm/mach-tegra/tegra3_usb_phy.c | 2 ++ drivers/media/video/tegra/ad5816.c | 11 ++++------- include/linux/tegra_audio.h | 2 +- include/media/ad5816.h | 12 +++++------- 10 files changed, 18 insertions(+), 28 deletions(-) diff --git a/arch/arm/mach-tegra/board-cardhu-pm298-power-rails.c b/arch/arm/mach-tegra/board-cardhu-pm298-power-rails.c index 26c77770d228..9168d9719b7c 100644 --- a/arch/arm/mach-tegra/board-cardhu-pm298-power-rails.c +++ b/arch/arm/mach-tegra/board-cardhu-pm298-power-rails.c @@ -1,7 +1,7 @@ /* * arch/arm/mach-tegra/board-cardhu-pm298-power-rails.c * - * Copyright (C) 2011 NVIDIA, Inc. + * Copyright (C) 2011-2012, NVIDIA Corporation. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -675,7 +675,6 @@ static struct platform_device *fixed_reg_devs_pm269[] = { int __init cardhu_pm298_gpio_switch_regulator_init(void) { - int i; struct board_info board_info; struct platform_device **fixed_reg_devs; int nfixreg_devs; diff --git a/arch/arm/mach-tegra/board-cardhu-pm299-power-rails.c b/arch/arm/mach-tegra/board-cardhu-pm299-power-rails.c index ab9798b0f080..32f07599fea4 100644 --- a/arch/arm/mach-tegra/board-cardhu-pm299-power-rails.c +++ b/arch/arm/mach-tegra/board-cardhu-pm299-power-rails.c @@ -1,7 +1,7 @@ /* * arch/arm/mach-tegra/board-cardhu-pm299-power-rails.c * - * Copyright (C) 2011 NVIDIA, Inc. + * Copyright (C) 2011-2012, NVIDIA Corporation. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -665,7 +665,6 @@ static struct platform_device *fixed_reg_devs_pm269[] = { int __init cardhu_pm299_gpio_switch_regulator_init(void) { - int i; struct board_info board_info; struct platform_device **fixed_reg_devs; int nfixreg_devs; diff --git a/arch/arm/mach-tegra/board-cardhu-power.c b/arch/arm/mach-tegra/board-cardhu-power.c index fa9299e10ba4..d517d8266204 100644 --- a/arch/arm/mach-tegra/board-cardhu-power.c +++ b/arch/arm/mach-tegra/board-cardhu-power.c @@ -1,7 +1,7 @@ /* * arch/arm/mach-tegra/board-cardhu-power.c * - * Copyright (C) 2011-2012 NVIDIA, Inc. + * Copyright (C) 2011-2012, NVIDIA Corporation. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -993,7 +993,6 @@ static struct platform_device *fixed_reg_devs_e1291_a04[] = { int __init cardhu_fixed_regulator_init(void) { - int i; struct board_info board_info; struct board_info pmu_board_info; struct board_info display_board_info; diff --git a/arch/arm/mach-tegra/cpu-tegra3.c b/arch/arm/mach-tegra/cpu-tegra3.c index fe2b6bbf1755..5b9ac4f770a2 100644 --- a/arch/arm/mach-tegra/cpu-tegra3.c +++ b/arch/arm/mach-tegra/cpu-tegra3.c @@ -302,8 +302,8 @@ static int min_cpus_notify(struct notifier_block *nb, unsigned long n, void *p) if ((n >= 1) && is_lp_cluster()) { /* make sure cpu rate is within g-mode range before switching */ - unsigned int speed = max( - tegra_getspeed(0), clk_get_min_rate(cpu_g_clk) / 1000); + unsigned int speed = max((unsigned long)tegra_getspeed(0), + clk_get_min_rate(cpu_g_clk) / 1000); tegra_update_cpu_speed(speed); if (!clk_set_parent(cpu_clk, cpu_g_clk)) { diff --git a/arch/arm/mach-tegra/pcie.c b/arch/arm/mach-tegra/pcie.c index 49aa39fdb8fd..68e0fda385ae 100644 --- a/arch/arm/mach-tegra/pcie.c +++ b/arch/arm/mach-tegra/pcie.c @@ -337,8 +337,6 @@ struct tegra_pcie_info { #define pmc_readl(reg) \ __raw_readl((u32)reg_pmc_base + (reg)) -static void __iomem *reg_pmc_base = IO_ADDRESS(TEGRA_PMC_BASE); - static struct tegra_pcie_info tegra_pcie = { .res_mmio = { .name = "PCI IO", diff --git a/arch/arm/mach-tegra/tegra3_dvfs.c b/arch/arm/mach-tegra/tegra3_dvfs.c index 657a6cfd6510..f36bfa774577 100644 --- a/arch/arm/mach-tegra/tegra3_dvfs.c +++ b/arch/arm/mach-tegra/tegra3_dvfs.c @@ -1,7 +1,7 @@ /* * arch/arm/mach-tegra/tegra3_dvfs.c * - * Copyright (C) 2010-2011 NVIDIA Corporation. + * Copyright (C) 2010-2012, NVIDIA Corporation. * * This software is licensed under the terms of the GNU General Public * License version 2, as published by the Free Software Foundation, and @@ -783,8 +783,6 @@ static void core_cap_update(void) static void core_cap_enable(bool enable) { - int i; - if (enable) tegra3_core_cap.refcnt++; else if (tegra3_core_cap.refcnt) diff --git a/arch/arm/mach-tegra/tegra3_usb_phy.c b/arch/arm/mach-tegra/tegra3_usb_phy.c index 05f807a60eae..8ada255cad55 100644 --- a/arch/arm/mach-tegra/tegra3_usb_phy.c +++ b/arch/arm/mach-tegra/tegra3_usb_phy.c @@ -888,6 +888,7 @@ static void uhsic_powerup_pmc_wake_detect(struct tegra_usb_phy *phy) mdelay(1); } +#ifdef KERNEL_WARNING static void usb_phy_power_down_pmc(void) { unsigned long val; @@ -931,6 +932,7 @@ static void usb_phy_power_down_pmc(void) UHSIC_MASTER_ENABLE_P0; writel(val, pmc_base + PMC_SLEEP_CFG); } +#endif static int usb_phy_bringup_host_controller(struct tegra_usb_phy *phy) { diff --git a/drivers/media/video/tegra/ad5816.c b/drivers/media/video/tegra/ad5816.c index d95368f43cf6..ed113b3a187c 100644 --- a/drivers/media/video/tegra/ad5816.c +++ b/drivers/media/video/tegra/ad5816.c @@ -249,9 +249,8 @@ static int ad5816_i2c_wr16(struct ad5816_info *info, u8 reg, u16 val) return 0; } -static int ad5816_gpio_wr(struct ad5816_info *info, - enum ad5816_gpio_types i, - int val) /* val: 0=deassert, 1=assert */ +static int ad5816_gpio_wr(struct ad5816_info *info, ad5816_gpio_types i, + int val) /* val: 0=deassert, 1=assert */ { int err = -EINVAL; if (info->gpio[i].valid) { @@ -370,8 +369,7 @@ static void ad5816_gpio_init(struct ad5816_info *info) } } -static int ad5816_vreg_dis(struct ad5816_info *info, - enum ad5816_vreg i) +static int ad5816_vreg_dis(struct ad5816_info *info, ad5816_vreg i) { int err = 0; if (info->vreg[i].vreg_flag && (info->vreg[i].vreg != NULL)) { @@ -396,8 +394,7 @@ static int ad5816_vreg_dis_all(struct ad5816_info *info) return err; } -static int ad5816_vreg_en(struct ad5816_info *info, - enum ad5816_vreg i) +static int ad5816_vreg_en(struct ad5816_info *info, ad5816_vreg i) { int err = 0; if (!info->vreg[i].vreg_flag && (info->vreg[i].vreg != NULL)) { diff --git a/include/linux/tegra_audio.h b/include/linux/tegra_audio.h index 3975913a5206..ddc9c93498a0 100644 --- a/include/linux/tegra_audio.h +++ b/include/linux/tegra_audio.h @@ -76,7 +76,7 @@ struct dam_srate { #define I2S_MODE_I2S _IOW(TEGRA_AUDIO_MAGIC, 18, unsigned int *) #ifdef CONFIG_SND_SOC_TEGRA -extern bool tegra_is_voice_call_active(); +extern bool tegra_is_voice_call_active(void); #else static inline bool tegra_is_voice_call_active() { diff --git a/include/media/ad5816.h b/include/media/ad5816.h index bfea25ffaddf..c51417ca472b 100644 --- a/include/media/ad5816.h +++ b/include/media/ad5816.h @@ -22,21 +22,19 @@ #include #include -typedef enum ad5816_vreg -{ +typedef enum { AD5816_VREG_VDD = 0, AD5816_VREG_VDD_AF, AD5816_VREG_VDD_I2C -}; +} ad5816_vreg; -typedef enum ad5816_gpio_types -{ +typedef enum { AD5816_GPIO_RESET = 0, AD5816_GPIO_I2CMUX, AD5816_GPIO_GP1, AD5816_GPIO_GP2, AD5816_GPIO_GP3 -}; +} ad5816_gpio_types; struct ad5816_platform_data { @@ -78,4 +76,4 @@ struct ad5816_pdata_info { #endif -/* __AD5816_H__ */ \ No newline at end of file +/* __AD5816_H__ */ -- cgit v1.2.3