summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorSachin Nikam <snikam@nvidia.com>2010-05-12 12:52:55 +0530
committerGary King <gking@nvidia.com>2010-05-12 19:40:40 -0700
commitf08aaa2cefd32204ab8c0010454756a34df06c52 (patch)
treedc330820d155d92606a046ab1b9da0109896af2b /arch
parentbae2012ac2c01124c6e102b3d2e7fb623169a965 (diff)
warnings: Cleaning up compilation warnings from tegra code
Bug 682070 warnings like: - defined but not used - unused variable - format type - control reaches to the end of non-void function Image builds and boots properly after these changes. Change-Id: I91578a9684b42fcf9652cf76e492f1020194e6e6 Reviewed-on: http://git-master/r/1339 Reviewed-by: Sachin Nikam <snikam@nvidia.com> Tested-by: Sachin Nikam <snikam@nvidia.com> Reviewed-by: Gary King <gking@nvidia.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-tegra/board_nvodm.c2
-rw-r--r--arch/arm/mach-tegra/include/nvcommon.h4
-rw-r--r--arch/arm/mach-tegra/iovmm.c2
-rw-r--r--arch/arm/mach-tegra/localtimer.c2
-rw-r--r--arch/arm/mach-tegra/nvrm/dispatch/nvrm_transport_dispatch.c4
-rw-r--r--arch/arm/mach-tegra/odm_kit/adaptations/pmu/max8907b/max8907b_rtc.c4
-rw-r--r--arch/arm/mach-tegra/timer.c2
7 files changed, 13 insertions, 7 deletions
diff --git a/arch/arm/mach-tegra/board_nvodm.c b/arch/arm/mach-tegra/board_nvodm.c
index f13f503a3683..bc3be0e24ef6 100644
--- a/arch/arm/mach-tegra/board_nvodm.c
+++ b/arch/arm/mach-tegra/board_nvodm.c
@@ -495,8 +495,6 @@ static struct spi_board_info tegra_spi_ipc_devices[] __initdata =
static void __init register_spi_ipc_devices(void)
{
- NvError err;
- NvU32 irq;
NvU32 instance = 0xFFFF;
NvU32 cs = 0xFFFF;
const NvOdmPeripheralConnectivity *pConnectivity = NULL;
diff --git a/arch/arm/mach-tegra/include/nvcommon.h b/arch/arm/mach-tegra/include/nvcommon.h
index 4936555d80a4..93c97c387c21 100644
--- a/arch/arm/mach-tegra/include/nvcommon.h
+++ b/arch/arm/mach-tegra/include/nvcommon.h
@@ -225,6 +225,10 @@ typedef NvS32 NvSPtr;
* This macro wraps its argument with the equivalent of "#if NV_DEBUG", but
* also can be used where "#ifdef"'s can't, like inside a macro.
*/
+#ifndef NV_DEBUG
+#define NV_DEBUG 0
+#endif
+
#if NV_DEBUG
#define NV_DEBUG_CODE(x) x
#else
diff --git a/arch/arm/mach-tegra/iovmm.c b/arch/arm/mach-tegra/iovmm.c
index a2f99806946d..5c64734d6341 100644
--- a/arch/arm/mach-tegra/iovmm.c
+++ b/arch/arm/mach-tegra/iovmm.c
@@ -534,7 +534,7 @@ int tegra_iovmm_client_lock(struct tegra_iovmm_client *client)
{
int ret;
- if (!client) return;
+ if (!client) return -EINVAL;
ret = wait_event_interruptible(client->domain->delay_lock,
_iovmm_client_lock(client)!=-EAGAIN);
diff --git a/arch/arm/mach-tegra/localtimer.c b/arch/arm/mach-tegra/localtimer.c
index 58bef261ab0a..ee7d690f782c 100644
--- a/arch/arm/mach-tegra/localtimer.c
+++ b/arch/arm/mach-tegra/localtimer.c
@@ -62,7 +62,7 @@ void local_timer_rescale(unsigned long cpu_freq_khz)
if (cpu_freq_scale_mult == 0) {
cpu_freq_scale_mult = ((timer_prescaler + 1) <<
CPU_FREQ_SCALE_SHIFT) / cpu_freq_khz;
- printk("Local timer scaling factor %d, shift %d\n",
+ printk("Local timer scaling factor %lu, shift %d\n",
cpu_freq_scale_mult, CPU_FREQ_SCALE_SHIFT);
return;
}
diff --git a/arch/arm/mach-tegra/nvrm/dispatch/nvrm_transport_dispatch.c b/arch/arm/mach-tegra/nvrm/dispatch/nvrm_transport_dispatch.c
index 0ab58edd8f17..d3da88180177 100644
--- a/arch/arm/mach-tegra/nvrm/dispatch/nvrm_transport_dispatch.c
+++ b/arch/arm/mach-tegra/nvrm/dispatch/nvrm_transport_dispatch.c
@@ -572,7 +572,7 @@ static NvError NvRmTransportGetPortName_dispatch_( void *InBuffer, NvU32 InSize,
}
}
clean:
- if ( PortName != PortNameBuff )
+ if ( PortName != (NvU8 *)PortNameBuff )
NvOsFree( PortName );
return err_;
}
@@ -624,7 +624,7 @@ static NvError NvRmTransportOpen_dispatch_( void *InBuffer, NvU32 InSize, void *
p_out->ret_ = NvRmTransportOpen( p_in->hRmDevice, pPortName, RecvMessageSemaphore, &p_out->phTransport );
clean:
- if( pPortName != PortNameBuff )
+ if( pPortName != (char *)PortNameBuff )
NvOsFree( pPortName );
NvOsSemaphoreDestroy( RecvMessageSemaphore );
return err_;
diff --git a/arch/arm/mach-tegra/odm_kit/adaptations/pmu/max8907b/max8907b_rtc.c b/arch/arm/mach-tegra/odm_kit/adaptations/pmu/max8907b/max8907b_rtc.c
index 88bfa06fa940..1c4d61a01a98 100644
--- a/arch/arm/mach-tegra/odm_kit/adaptations/pmu/max8907b/max8907b_rtc.c
+++ b/arch/arm/mach-tegra/odm_kit/adaptations/pmu/max8907b/max8907b_rtc.c
@@ -163,7 +163,9 @@ Max8907bRtcCountWrite(
NvU8 BcdDD, BcdMM, BcdYY1, BcdYY2;
NvU16 YYYY;
struct rtc_time tm;
+#if NV_DEBUG
NvU32 data1;
+#endif
NVODMPMU_PRINTF(("\n Rtc write count=0x%x ", Count));
// convert seconds since reference time into date
@@ -224,6 +226,8 @@ Max8907bRtcCountWrite(
NVODMPMU_PRINTF(("\n Max8907bRtcCountWrite() error. "));
return NV_FALSE;
}
+
+ return NV_TRUE;
}
NvBool
diff --git a/arch/arm/mach-tegra/timer.c b/arch/arm/mach-tegra/timer.c
index 07810db19891..3664fde41357 100644
--- a/arch/arm/mach-tegra/timer.c
+++ b/arch/arm/mach-tegra/timer.c
@@ -174,7 +174,7 @@ static unsigned long measure_input_freq(unsigned int *m, unsigned int *n)
static void __init tegra_timer_init(void)
{
void __iomem *tmr;
- unsigned int m, n;
+ unsigned int m = 0, n = 0;
unsigned long val;
tmr = IO_ADDRESS(TEGRA_TMR1_BASE + TIMERUS_OFFS);