Merge "Fix format warnings in hardware/qcom/display" am: ce3c060962
am: e160c256ba
Change-Id: I16c0800a6b9bbc690ce6125e7b4631a9008d6f91
This commit is contained in:
commit
7ff6e1a2e2
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue