From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville Syrjala Subject: [PATCH 03/18] video/hdmi: Constify infoframe passed to the log functions Date: Thu, 20 Sep 2018 21:51:30 +0300 Message-ID: <20180920185145.1912-4-ville.syrjala@linux.intel.com> References: <20180920185145.1912-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180920185145.1912-1-ville.syrjala@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org, Thierry Reding , Hans Verkuil , linux-media@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClRo ZSBsb2cgZnVuY3Rpb25zIGRvbid0IG1vZGlmeSB0aGUgcGFzc2VkIGluIGluZm9mcmFtZSBzbyBt YWtlIGl0IGNvbnN0LgoKQ2M6IFRoaWVycnkgUmVkaW5nIDx0aGllcnJ5LnJlZGluZ0BnbWFpbC5j b20+CkNjOiBIYW5zIFZlcmt1aWwgPGhhbnMudmVya3VpbEBjaXNjby5jb20+CkNjOiBsaW51eC1t ZWRpYUB2Z2VyLmtlcm5lbC5vcmcKU2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxs ZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL3ZpZGVvL2hkbWkuYyB8IDIy ICsrKysrKysrKysrLS0tLS0tLS0tLS0KIGluY2x1ZGUvbGludXgvaGRtaS5oIHwgIDIgKy0KIDIg ZmlsZXMgY2hhbmdlZCwgMTIgaW5zZXJ0aW9ucygrKSwgMTIgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvZHJpdmVycy92aWRlby9oZG1pLmMgYi9kcml2ZXJzL3ZpZGVvL2hkbWkuYwppbmRleCBi NWQ0OTEwMTRiMGIuLjUzZTdlZTJjODNmYyAxMDA2NDQKLS0tIGEvZHJpdmVycy92aWRlby9oZG1p LmMKKysrIGIvZHJpdmVycy92aWRlby9oZG1pLmMKQEAgLTQ3MSw3ICs0NzEsNyBAQCBzdGF0aWMg Y29uc3QgY2hhciAqaGRtaV9pbmZvZnJhbWVfdHlwZV9nZXRfbmFtZShlbnVtIGhkbWlfaW5mb2Zy YW1lX3R5cGUgdHlwZSkKIAogc3RhdGljIHZvaWQgaGRtaV9pbmZvZnJhbWVfbG9nX2hlYWRlcihj b25zdCBjaGFyICpsZXZlbCwKIAkJCQkgICAgICBzdHJ1Y3QgZGV2aWNlICpkZXYsCi0JCQkJICAg ICAgc3RydWN0IGhkbWlfYW55X2luZm9mcmFtZSAqZnJhbWUpCisJCQkJICAgICAgY29uc3Qgc3Ry dWN0IGhkbWlfYW55X2luZm9mcmFtZSAqZnJhbWUpCiB7CiAJaGRtaV9sb2coIkhETUkgaW5mb2Zy YW1lOiAlcywgdmVyc2lvbiAldSwgbGVuZ3RoICV1XG4iLAogCQloZG1pX2luZm9mcmFtZV90eXBl X2dldF9uYW1lKGZyYW1lLT50eXBlKSwKQEAgLTY3MywxMCArNjczLDEwIEBAIGhkbWlfY29udGVu dF90eXBlX2dldF9uYW1lKGVudW0gaGRtaV9jb250ZW50X3R5cGUgY29udGVudF90eXBlKQogICov CiBzdGF0aWMgdm9pZCBoZG1pX2F2aV9pbmZvZnJhbWVfbG9nKGNvbnN0IGNoYXIgKmxldmVsLAog CQkJCSAgIHN0cnVjdCBkZXZpY2UgKmRldiwKLQkJCQkgICBzdHJ1Y3QgaGRtaV9hdmlfaW5mb2Zy YW1lICpmcmFtZSkKKwkJCQkgICBjb25zdCBzdHJ1Y3QgaGRtaV9hdmlfaW5mb2ZyYW1lICpmcmFt ZSkKIHsKIAloZG1pX2luZm9mcmFtZV9sb2dfaGVhZGVyKGxldmVsLCBkZXYsCi0JCQkJICAoc3Ry dWN0IGhkbWlfYW55X2luZm9mcmFtZSAqKWZyYW1lKTsKKwkJCQkgIChjb25zdCBzdHJ1Y3QgaGRt aV9hbnlfaW5mb2ZyYW1lICopZnJhbWUpOwogCiAJaGRtaV9sb2coIiAgICBjb2xvcnNwYWNlOiAl c1xuIiwKIAkJCWhkbWlfY29sb3JzcGFjZV9nZXRfbmFtZShmcmFtZS0+Y29sb3JzcGFjZSkpOwpA QCAtNzUwLDEyICs3NTAsMTIgQEAgc3RhdGljIGNvbnN0IGNoYXIgKmhkbWlfc3BkX3NkaV9nZXRf bmFtZShlbnVtIGhkbWlfc3BkX3NkaSBzZGkpCiAgKi8KIHN0YXRpYyB2b2lkIGhkbWlfc3BkX2lu Zm9mcmFtZV9sb2coY29uc3QgY2hhciAqbGV2ZWwsCiAJCQkJICAgc3RydWN0IGRldmljZSAqZGV2 LAotCQkJCSAgIHN0cnVjdCBoZG1pX3NwZF9pbmZvZnJhbWUgKmZyYW1lKQorCQkJCSAgIGNvbnN0 IHN0cnVjdCBoZG1pX3NwZF9pbmZvZnJhbWUgKmZyYW1lKQogewogCXU4IGJ1ZlsxN107CiAKIAlo ZG1pX2luZm9mcmFtZV9sb2dfaGVhZGVyKGxldmVsLCBkZXYsCi0JCQkJICAoc3RydWN0IGhkbWlf YW55X2luZm9mcmFtZSAqKWZyYW1lKTsKKwkJCQkgIChjb25zdCBzdHJ1Y3QgaGRtaV9hbnlfaW5m b2ZyYW1lICopZnJhbWUpOwogCiAJbWVtc2V0KGJ1ZiwgMCwgc2l6ZW9mKGJ1ZikpOwogCkBAIC04 ODYsMTAgKzg4NiwxMCBAQCBoZG1pX2F1ZGlvX2NvZGluZ190eXBlX2V4dF9nZXRfbmFtZShlbnVt IGhkbWlfYXVkaW9fY29kaW5nX3R5cGVfZXh0IGN0eCkKICAqLwogc3RhdGljIHZvaWQgaGRtaV9h dWRpb19pbmZvZnJhbWVfbG9nKGNvbnN0IGNoYXIgKmxldmVsLAogCQkJCSAgICAgc3RydWN0IGRl dmljZSAqZGV2LAotCQkJCSAgICAgc3RydWN0IGhkbWlfYXVkaW9faW5mb2ZyYW1lICpmcmFtZSkK KwkJCQkgICAgIGNvbnN0IHN0cnVjdCBoZG1pX2F1ZGlvX2luZm9mcmFtZSAqZnJhbWUpCiB7CiAJ aGRtaV9pbmZvZnJhbWVfbG9nX2hlYWRlcihsZXZlbCwgZGV2LAotCQkJCSAgKHN0cnVjdCBoZG1p X2FueV9pbmZvZnJhbWUgKilmcmFtZSk7CisJCQkJICAoY29uc3Qgc3RydWN0IGhkbWlfYW55X2lu Zm9mcmFtZSAqKWZyYW1lKTsKIAogCWlmIChmcmFtZS0+Y2hhbm5lbHMpCiAJCWhkbWlfbG9nKCIg ICAgY2hhbm5lbHM6ICV1XG4iLCBmcmFtZS0+Y2hhbm5lbHMgLSAxKTsKQEAgLTk0OSwxMiArOTQ5 LDEyIEBAIGhkbWlfM2Rfc3RydWN0dXJlX2dldF9uYW1lKGVudW0gaGRtaV8zZF9zdHJ1Y3R1cmUg czNkX3N0cnVjdCkKIHN0YXRpYyB2b2lkCiBoZG1pX3ZlbmRvcl9hbnlfaW5mb2ZyYW1lX2xvZyhj b25zdCBjaGFyICpsZXZlbCwKIAkJCSAgICAgIHN0cnVjdCBkZXZpY2UgKmRldiwKLQkJCSAgICAg IHVuaW9uIGhkbWlfdmVuZG9yX2FueV9pbmZvZnJhbWUgKmZyYW1lKQorCQkJICAgICAgY29uc3Qg dW5pb24gaGRtaV92ZW5kb3JfYW55X2luZm9mcmFtZSAqZnJhbWUpCiB7Ci0Jc3RydWN0IGhkbWlf dmVuZG9yX2luZm9mcmFtZSAqaHZmID0gJmZyYW1lLT5oZG1pOworCWNvbnN0IHN0cnVjdCBoZG1p X3ZlbmRvcl9pbmZvZnJhbWUgKmh2ZiA9ICZmcmFtZS0+aGRtaTsKIAogCWhkbWlfaW5mb2ZyYW1l X2xvZ19oZWFkZXIobGV2ZWwsIGRldiwKLQkJCQkgIChzdHJ1Y3QgaGRtaV9hbnlfaW5mb2ZyYW1l ICopZnJhbWUpOworCQkJCSAgKGNvbnN0IHN0cnVjdCBoZG1pX2FueV9pbmZvZnJhbWUgKilmcmFt ZSk7CiAKIAlpZiAoZnJhbWUtPmFueS5vdWkgIT0gSERNSV9JRUVFX09VSSkgewogCQloZG1pX2xv ZygiICAgIG5vdCBhIEhETUkgdmVuZG9yIGluZm9mcmFtZVxuIik7CkBAIC05ODQsNyArOTg0LDcg QEAgaGRtaV92ZW5kb3JfYW55X2luZm9mcmFtZV9sb2coY29uc3QgY2hhciAqbGV2ZWwsCiAgKi8K IHZvaWQgaGRtaV9pbmZvZnJhbWVfbG9nKGNvbnN0IGNoYXIgKmxldmVsLAogCQkJc3RydWN0IGRl dmljZSAqZGV2LAotCQkJdW5pb24gaGRtaV9pbmZvZnJhbWUgKmZyYW1lKQorCQkJY29uc3QgdW5p b24gaGRtaV9pbmZvZnJhbWUgKmZyYW1lKQogewogCXN3aXRjaCAoZnJhbWUtPmFueS50eXBlKSB7 CiAJY2FzZSBIRE1JX0lORk9GUkFNRV9UWVBFX0FWSToKZGlmZiAtLWdpdCBhL2luY2x1ZGUvbGlu dXgvaGRtaS5oIGIvaW5jbHVkZS9saW51eC9oZG1pLmgKaW5kZXggYTU3N2Q0YWUyNTcwLi5iY2Ux YWJiMWZlNTcgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUvbGludXgvaGRtaS5oCisrKyBiL2luY2x1ZGUv bGludXgvaGRtaS5oCkBAIC0zMzUsNiArMzM1LDYgQEAgaGRtaV9pbmZvZnJhbWVfcGFjayh1bmlv biBoZG1pX2luZm9mcmFtZSAqZnJhbWUsIHZvaWQgKmJ1ZmZlciwgc2l6ZV90IHNpemUpOwogaW50 IGhkbWlfaW5mb2ZyYW1lX3VucGFjayh1bmlvbiBoZG1pX2luZm9mcmFtZSAqZnJhbWUsCiAJCQkg IGNvbnN0IHZvaWQgKmJ1ZmZlciwgc2l6ZV90IHNpemUpOwogdm9pZCBoZG1pX2luZm9mcmFtZV9s b2coY29uc3QgY2hhciAqbGV2ZWwsIHN0cnVjdCBkZXZpY2UgKmRldiwKLQkJCXVuaW9uIGhkbWlf aW5mb2ZyYW1lICpmcmFtZSk7CisJCQljb25zdCB1bmlvbiBoZG1pX2luZm9mcmFtZSAqZnJhbWUp OwogCiAjZW5kaWYgLyogX0RSTV9IRE1JX0ggKi8KLS0gCjIuMTYuNAoKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApk cmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mga09.intel.com ([134.134.136.24]:10811 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727171AbeIUAgv (ORCPT ); Thu, 20 Sep 2018 20:36:51 -0400 From: Ville Syrjala To: dri-devel@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org, Thierry Reding , Hans Verkuil , linux-media@vger.kernel.org Subject: [PATCH 03/18] video/hdmi: Constify infoframe passed to the log functions Date: Thu, 20 Sep 2018 21:51:30 +0300 Message-Id: <20180920185145.1912-4-ville.syrjala@linux.intel.com> In-Reply-To: <20180920185145.1912-1-ville.syrjala@linux.intel.com> References: <20180920185145.1912-1-ville.syrjala@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-media-owner@vger.kernel.org List-ID: From: Ville Syrjälä The log functions don't modify the passed in infoframe so make it const. Cc: Thierry Reding Cc: Hans Verkuil Cc: linux-media@vger.kernel.org Signed-off-by: Ville Syrjälä --- drivers/video/hdmi.c | 22 +++++++++++----------- include/linux/hdmi.h | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/video/hdmi.c b/drivers/video/hdmi.c index b5d491014b0b..53e7ee2c83fc 100644 --- a/drivers/video/hdmi.c +++ b/drivers/video/hdmi.c @@ -471,7 +471,7 @@ static const char *hdmi_infoframe_type_get_name(enum hdmi_infoframe_type type) static void hdmi_infoframe_log_header(const char *level, struct device *dev, - struct hdmi_any_infoframe *frame) + const struct hdmi_any_infoframe *frame) { hdmi_log("HDMI infoframe: %s, version %u, length %u\n", hdmi_infoframe_type_get_name(frame->type), @@ -673,10 +673,10 @@ hdmi_content_type_get_name(enum hdmi_content_type content_type) */ static void hdmi_avi_infoframe_log(const char *level, struct device *dev, - struct hdmi_avi_infoframe *frame) + const struct hdmi_avi_infoframe *frame) { hdmi_infoframe_log_header(level, dev, - (struct hdmi_any_infoframe *)frame); + (const struct hdmi_any_infoframe *)frame); hdmi_log(" colorspace: %s\n", hdmi_colorspace_get_name(frame->colorspace)); @@ -750,12 +750,12 @@ static const char *hdmi_spd_sdi_get_name(enum hdmi_spd_sdi sdi) */ static void hdmi_spd_infoframe_log(const char *level, struct device *dev, - struct hdmi_spd_infoframe *frame) + const struct hdmi_spd_infoframe *frame) { u8 buf[17]; hdmi_infoframe_log_header(level, dev, - (struct hdmi_any_infoframe *)frame); + (const struct hdmi_any_infoframe *)frame); memset(buf, 0, sizeof(buf)); @@ -886,10 +886,10 @@ hdmi_audio_coding_type_ext_get_name(enum hdmi_audio_coding_type_ext ctx) */ static void hdmi_audio_infoframe_log(const char *level, struct device *dev, - struct hdmi_audio_infoframe *frame) + const struct hdmi_audio_infoframe *frame) { hdmi_infoframe_log_header(level, dev, - (struct hdmi_any_infoframe *)frame); + (const struct hdmi_any_infoframe *)frame); if (frame->channels) hdmi_log(" channels: %u\n", frame->channels - 1); @@ -949,12 +949,12 @@ hdmi_3d_structure_get_name(enum hdmi_3d_structure s3d_struct) static void hdmi_vendor_any_infoframe_log(const char *level, struct device *dev, - union hdmi_vendor_any_infoframe *frame) + const union hdmi_vendor_any_infoframe *frame) { - struct hdmi_vendor_infoframe *hvf = &frame->hdmi; + const struct hdmi_vendor_infoframe *hvf = &frame->hdmi; hdmi_infoframe_log_header(level, dev, - (struct hdmi_any_infoframe *)frame); + (const struct hdmi_any_infoframe *)frame); if (frame->any.oui != HDMI_IEEE_OUI) { hdmi_log(" not a HDMI vendor infoframe\n"); @@ -984,7 +984,7 @@ hdmi_vendor_any_infoframe_log(const char *level, */ void hdmi_infoframe_log(const char *level, struct device *dev, - union hdmi_infoframe *frame) + const union hdmi_infoframe *frame) { switch (frame->any.type) { case HDMI_INFOFRAME_TYPE_AVI: diff --git a/include/linux/hdmi.h b/include/linux/hdmi.h index a577d4ae2570..bce1abb1fe57 100644 --- a/include/linux/hdmi.h +++ b/include/linux/hdmi.h @@ -335,6 +335,6 @@ hdmi_infoframe_pack(union hdmi_infoframe *frame, void *buffer, size_t size); int hdmi_infoframe_unpack(union hdmi_infoframe *frame, const void *buffer, size_t size); void hdmi_infoframe_log(const char *level, struct device *dev, - union hdmi_infoframe *frame); + const union hdmi_infoframe *frame); #endif /* _DRM_HDMI_H */ -- 2.16.4