]> rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commitdiff
arm: tegra: fix compile warning latency_allowance.c
authorPhilip Rakity <prakity@nvidia.com>
Tue, 3 Sep 2013 21:03:18 +0000 (22:03 +0100)
committerAjay Nandakumar <anandakumarm@nvidia.com>
Thu, 3 Oct 2013 18:01:16 +0000 (23:31 +0530)
min requries that types match

Change-Id: Iee9203f1d2bc6694194e3cbc2221052bb463fd35
Signed-off-by: Philip Rakity <prakity@nvidia.com>
Reviewed-on: http://git-master/r/269685
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
(cherry picked from commit d8d29f9e86ced222f2dd55f74e38158f09daf837)
Signed-off-by: Ajay Nandakumar <anandakumarm@nvidia.com>
arch/arm/mach-tegra/latency_allowance.c

index 5d3ebfb654b6ba4709062379dc75eaedbe809902..2052aa770ac466f377c17fc2b6aeb16ee5d8f30c 100644 (file)
@@ -352,7 +352,8 @@ static int __init tegra_latency_allowance_init(void)
                                if (574 > emc_freq_mhz)
                                        val_2 = val_2 * 574 / emc_freq_mhz;
 
-                               la_to_set = min3(T12X_MC_LA_MAX_VALUE,
+                               la_to_set = min3((unsigned int)
+                                                       T12X_MC_LA_MAX_VALUE,
                                                val_1,
                                                val_2);
                        } else if (cs.la_info_array[i].la_ref_clk_mhz != 0) {
@@ -366,14 +367,16 @@ static int __init tegra_latency_allowance_init(void)
                                if (cs.la_info_array[i].la_ref_clk_mhz <=
                                        emc_freq_mhz) {
                                        la_to_set =
-                                               min(cs.la_info_array[i].init_la,
+                                               min((unsigned long)
+                                               cs.la_info_array[i].init_la,
+                                               (unsigned long)
                                                        T12X_MC_LA_MAX_VALUE);
                                } else {
                                        la_to_set =
                                        min(cs.la_info_array[i].init_la *
                                        cs.la_info_array[i].la_ref_clk_mhz /
                                        emc_freq_mhz,
-                                       T12X_MC_LA_MAX_VALUE);
+                                       (unsigned long)T12X_MC_LA_MAX_VALUE);
                                }
                        } else
                                la_to_set = cs.la_info_array[i].init_la;