diff options
| author | Quinn Jensen <quinn.jensen@freescale.com> | 2007-05-24 18:23:21 -0600 |
|---|---|---|
| committer | Quinn Jensen <quinn.jensen@freescale.com> | 2007-05-24 18:23:21 -0600 |
| commit | 2da6d55c901a6d662bef977e9933d40018313001 (patch) | |
| tree | d2f8444ee92877df9a8b01504bb7b0aa1e59bf2d | |
| parent | c364869ac185c93884f7c198a48928664b3e1660 (diff) | |
Bugzilla 540: Fix compile errors/warnings from latest patch set.
http://www.bitshrine.org/gpp/linux-2.6.19.2-mx-dvfs_compile_fixes.patch
| -rw-r--r-- | drivers/mxc/pm/dptc.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/drivers/mxc/pm/dptc.c b/drivers/mxc/pm/dptc.c index 40ce5c7ea0b7..e4168650f209 100644 --- a/drivers/mxc/pm/dptc.c +++ b/drivers/mxc/pm/dptc.c @@ -115,10 +115,10 @@ static void dptc_unmask_dptc_int(void) * * @return PTVAI bits value */ -static unsigned long dptc_get_ptvai(void) +static unsigned int dptc_get_ptvai(void) { - return (mxc_ccm_get_reg(MXC_CCM_PMCR0) & MXC_CCM_PMCR0_PTVAI_MASK) - >> MXC_CCM_PMCR0_PTVAI_OFFSET; + return (unsigned int)((mxc_ccm_get_reg(MXC_CCM_PMCR0) & + MXC_CCM_PMCR0_PTVAI_MASK) >> MXC_CCM_PMCR0_PTVAI_OFFSET); } /*! @@ -251,13 +251,12 @@ static void dptc_workqueue_handler(void *arg) params = (dvfs_dptc_params_s *) arg; - pr_debug("In %s: PTVAI = %d\n", __FUNCTION__, dptc_get_ptvai()); - pr_debug("PMCR0 = 0x%x ", mxc_ccm_get_reg(MXC_CCM_PMCR0)); - pr_debug("DCVR0 = 0x%x ", mxc_ccm_get_reg(MXC_CCM_DCVR0)); - pr_debug("DCVR1 = 0x%x ", mxc_ccm_get_reg(MXC_CCM_DCVR1)); - pr_debug("DCVR2 = 0x%x ", mxc_ccm_get_reg(MXC_CCM_DCVR2)); - pr_debug("DCVR3 = 0x%x ", mxc_ccm_get_reg(MXC_CCM_DCVR3)); - pr_debug("PTVAI = 0x%x\n", ptvai); + pr_debug("In %s: \nPTVAI = %d\n", __FUNCTION__, dptc_get_ptvai()); + pr_debug("PMCR0 = 0x%x ", (unsigned int)mxc_ccm_get_reg(MXC_CCM_PMCR0)); + pr_debug("DCVR0 = 0x%x ", (unsigned int)mxc_ccm_get_reg(MXC_CCM_DCVR0)); + pr_debug("DCVR1 = 0x%x ", (unsigned int)mxc_ccm_get_reg(MXC_CCM_DCVR1)); + pr_debug("DCVR2 = 0x%x ", (unsigned int)mxc_ccm_get_reg(MXC_CCM_DCVR2)); + pr_debug("DCVR3 = 0x%x ", (unsigned int)mxc_ccm_get_reg(MXC_CCM_DCVR3)); #ifndef CONFIG_MXC_DVFS_SDMA switch (ptvai) { @@ -357,8 +356,8 @@ void set_pmic_voltage(dvfs_dptc_tables_s * dvfs_dptc_tables_ptr, int wp) if (cpu_is_mx31()) { pr_debug("DPVV = 0x%x (0x%x)\n", - mxc_ccm_get_reg(MXC_CCM_PMCR0) & MXC_CCM_PMCR0_DPVV, - mxc_ccm_get_reg(MXC_CCM_PMCR0)); + (unsigned int)mxc_ccm_get_reg(MXC_CCM_PMCR0) & MXC_CCM_PMCR0_DPVV, + (unsigned int)mxc_ccm_get_reg(MXC_CCM_PMCR0)); } } |