diff --git a/msm8994/libgralloc/mapper.cpp b/msm8994/libgralloc/mapper.cpp index 90fe3e90..dd057245 100644 --- a/msm8994/libgralloc/mapper.cpp +++ b/msm8994/libgralloc/mapper.cpp @@ -136,7 +136,7 @@ static int gralloc_unmap(gralloc_module_t const* module, if(hnd->base) { err = memalloc->unmap_buffer((void*)hnd->base, hnd->size, hnd->offset); if (err) { - ALOGE("Could not unmap memory at address %p, %s", hnd->base, + ALOGE("Could not unmap memory at address %p, %s", (void*) hnd->base, strerror(errno)); return -errno; } @@ -149,7 +149,7 @@ static int gralloc_unmap(gralloc_module_t const* module, size, hnd->offset_metadata); if (err) { ALOGE("Could not unmap memory at address %p, %s", - hnd->base_metadata, strerror(errno)); + (void*) hnd->base_metadata, strerror(errno)); return -errno; } hnd->base_metadata = 0; diff --git a/msm8994/libhdmi/hdmi.cpp b/msm8994/libhdmi/hdmi.cpp index c8d36ef1..6a91975d 100644 --- a/msm8994/libhdmi/hdmi.cpp +++ b/msm8994/libhdmi/hdmi.cpp @@ -783,7 +783,7 @@ int HDMIDisplay::getAttrForConfig(int config, uint32_t& xres, int HDMIDisplay::getDisplayConfigs(uint32_t* configs, size_t* numConfigs) const { if (*numConfigs <= 0) { - ALOGE("%s Invalid number of configs (%d)", __FUNCTION__, *numConfigs); + ALOGE("%s Invalid number of configs (%zu)", __FUNCTION__, *numConfigs); return -EINVAL; } *numConfigs = mModeCount; diff --git a/msm8994/libhwcomposer/hwc.cpp b/msm8994/libhwcomposer/hwc.cpp index 67da2e52..a8a248de 100644 --- a/msm8994/libhwcomposer/hwc.cpp +++ b/msm8994/libhwcomposer/hwc.cpp @@ -794,7 +794,7 @@ int hwc_getDisplayConfigs(struct hwc_composer_device_1* dev, int disp, } if (*numConfigs <= 0) { - ALOGE("%s Invalid number of configs (%d)", __FUNCTION__, *numConfigs); + ALOGE("%s Invalid number of configs (%zu)", __FUNCTION__, *numConfigs); return -EINVAL; } diff --git a/msm8994/libhwcomposer/hwc_mdpcomp.cpp b/msm8994/libhwcomposer/hwc_mdpcomp.cpp index 4c7c7ade..5549d30e 100644 --- a/msm8994/libhwcomposer/hwc_mdpcomp.cpp +++ b/msm8994/libhwcomposer/hwc_mdpcomp.cpp @@ -1401,7 +1401,7 @@ bool MDPComp::mdpOnlyLayersComp(hwc_context_t *ctx, /* Bail out if we are processing only secured video/ui layers * and we dont have any */ if(secureOnly) { - ALOGD_IF(isDebug(), "%s: No secure video/ui layers"); + ALOGD_IF(isDebug(), "%s: No secure video/ui layers", __FUNCTION__); return false; } /* No Idle fall back for secure video/ui layers and if there is only