rk3368: efuse: fix warning and

	renamed rockchip_efuse_get_temp to rockchip_efuse_get_temp_adjust;

Signed-off-by: guoyi <gy@rock-chips.com>

diff --git a/arch/arm/mach-rockchip/efuse.c b/arch/arm/mach-rockchip/efuse.c
index 35fb4dec0caebf4c42a29e7223c71fc8ec875d30..b979e411dcd471faa29ee6dd27c93f8abf9c1cb3 100644 (file)
--- a/arch/arm/mach-rockchip/efuse.c
+++ b/arch/arm/mach-rockchip/efuse.c
@@ -144,7 +144,7 @@ int secure_regs_wr_32(u64 addr_phy, u32 val)
        return invoke_regs_wr_fn(PSCI_OS_ACCESS_REG, val_64, addr_phy, SEC_REG_WR_32);
 }
 
-static int __init rk3368_efuse_readregs(u32 addr, u32 length, u8 *buf)
+static int rk3368_efuse_readregs(u32 addr, u32 length, u8 *buf)
 {
        int ret = length;
                if (!length)
@@ -314,7 +314,7 @@ int rockchip_get_leakage(int ch)
        }
        return 0;
 }
-int rockchip_efuse_get_temp(int ch)
+int rockchip_efuse_get_temp_adjust(int ch)
 {
        int ret = 0;
        int temp = 0;

diff --git a/arch/arm/mach-rockchip/efuse.h b/arch/arm/mach-rockchip/efuse.h
index 01c894c6a9b0b8eb5e62c5765a2550af088f1d9c..96193114aaa9a3475ba6f0a78cc1e2efd638b816 100644 (file)
--- a/arch/arm/mach-rockchip/efuse.h
+++ b/arch/arm/mach-rockchip/efuse.h
@@ -28,5 +28,5 @@
 int rockchip_efuse_version(void);
 int rockchip_process_version(void);
 int rockchip_get_leakage(int ch);
-int rockchip_efuse_get_temp(int ch);
+int rockchip_efuse_get_temp_adjust(int ch);
 #endif

diff --git a/drivers/thermal/rockchip_thermal.c b/drivers/thermal/rockchip_thermal.c
index 7ee48169cafacee32e4076d1c40dce7465424690..1532783c2f4b8663b67a2a644c07ad296c451259 100755 (executable)
--- a/drivers/thermal/rockchip_thermal.c
+++ b/drivers/thermal/rockchip_thermal.c
@@ -1041,7 +1041,7 @@ static int rockchip_thermal_probe(struct platform_device *pdev)
                        error);
                goto err_disable_pclk;
        }
-       thermal->cpu_temp_adjust = rockchip_efuse_get_temp(0);
+       thermal->cpu_temp_adjust = rockchip_efuse_get_temp_adjust(0);
        if (thermal->chip->mode == TSADC_AUTO_MODE)
        {
                thermal->chip->initialize(thermal->regs, thermal->tshut_polarity);