From 3e33a8408117088c873ebc4b3ca0e1e440c0b697 Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Wed, 28 Aug 2013 10:38:49 +0200 Subject: [PATCH] drm/i915/dsi: s/size_t/int/ MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This fixes a printf warn from gcc: drivers/gpu/drm/i915/intel_dsi_cmd.c: In function ‘dsi_vc_send_long’: drivers/gpu/drm/i915/intel_dsi_cmd.c:181:2: warning: format ‘%x’ expects argument of type ‘unsigned int’, but argument 7 has type ‘size_t’ [-Wformat=] Suggested-by: Chris Wilson Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_dsi_cmd.c | 22 +++++++++++----------- drivers/gpu/drm/i915/intel_dsi_cmd.h | 14 +++++++------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_dsi_cmd.c b/drivers/gpu/drm/i915/intel_dsi_cmd.c index 86577a0fc620..7c40f981d2c7 100644 --- a/drivers/gpu/drm/i915/intel_dsi_cmd.c +++ b/drivers/gpu/drm/i915/intel_dsi_cmd.c @@ -167,7 +167,7 @@ static int dsi_vc_send_short(struct intel_dsi *intel_dsi, int channel, } static int dsi_vc_send_long(struct intel_dsi *intel_dsi, int channel, - u8 data_type, const u8 *data, size_t len) + u8 data_type, const u8 *data, int len) { struct drm_encoder *encoder = &intel_dsi->base.base; struct drm_device *dev = encoder->dev; @@ -175,7 +175,7 @@ static int dsi_vc_send_long(struct intel_dsi *intel_dsi, int channel, struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); enum pipe pipe = intel_crtc->pipe; u32 data_reg; - size_t i, j, n; + int i, j, n; u32 mask; DRM_DEBUG_KMS("channel %d, data_type %d, len %04x\n", @@ -194,7 +194,7 @@ static int dsi_vc_send_long(struct intel_dsi *intel_dsi, int channel, for (i = 0; i < len; i += n) { u32 val = 0; - n = min_t(size_t, len - i, 4); + n = min_t(int, len - i, 4); for (j = 0; j < n; j++) val |= *data++ << 8 * j; @@ -208,7 +208,7 @@ static int dsi_vc_send_long(struct intel_dsi *intel_dsi, int channel, } static int dsi_vc_write_common(struct intel_dsi *intel_dsi, - int channel, const u8 *data, size_t len, + int channel, const u8 *data, int len, enum dsi_type type) { int ret; @@ -240,13 +240,13 @@ static int dsi_vc_write_common(struct intel_dsi *intel_dsi, } int dsi_vc_dcs_write(struct intel_dsi *intel_dsi, int channel, - const u8 *data, size_t len) + const u8 *data, int len) { return dsi_vc_write_common(intel_dsi, channel, data, len, DSI_DCS); } int dsi_vc_generic_write(struct intel_dsi *intel_dsi, int channel, - const u8 *data, size_t len) + const u8 *data, int len) { return dsi_vc_write_common(intel_dsi, channel, data, len, DSI_GENERIC); } @@ -260,7 +260,7 @@ static int dsi_vc_dcs_send_read_request(struct intel_dsi *intel_dsi, static int dsi_vc_generic_send_read_request(struct intel_dsi *intel_dsi, int channel, u8 *reqdata, - size_t reqlen) + int reqlen) { u16 data; u8 data_type; @@ -286,14 +286,14 @@ static int dsi_vc_generic_send_read_request(struct intel_dsi *intel_dsi, } static int dsi_read_data_return(struct intel_dsi *intel_dsi, - u8 *buf, size_t buflen) + u8 *buf, int buflen) { struct drm_encoder *encoder = &intel_dsi->base.base; struct drm_device *dev = encoder->dev; struct drm_i915_private *dev_priv = dev->dev_private; struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); enum pipe pipe = intel_crtc->pipe; - size_t i, len = 0; + int i, len = 0; u32 data_reg, val; if (intel_dsi->hs) { @@ -312,7 +312,7 @@ static int dsi_read_data_return(struct intel_dsi *intel_dsi, } int dsi_vc_dcs_read(struct intel_dsi *intel_dsi, int channel, u8 dcs_cmd, - u8 *buf, size_t buflen) + u8 *buf, int buflen) { struct drm_encoder *encoder = &intel_dsi->base.base; struct drm_device *dev = encoder->dev; @@ -348,7 +348,7 @@ int dsi_vc_dcs_read(struct intel_dsi *intel_dsi, int channel, u8 dcs_cmd, } int dsi_vc_generic_read(struct intel_dsi *intel_dsi, int channel, - u8 *reqdata, size_t reqlen, u8 *buf, size_t buflen) + u8 *reqdata, int reqlen, u8 *buf, int buflen) { struct drm_encoder *encoder = &intel_dsi->base.base; struct drm_device *dev = encoder->dev; diff --git a/drivers/gpu/drm/i915/intel_dsi_cmd.h b/drivers/gpu/drm/i915/intel_dsi_cmd.h index 714a49aaed65..54c8a234a2e0 100644 --- a/drivers/gpu/drm/i915/intel_dsi_cmd.h +++ b/drivers/gpu/drm/i915/intel_dsi_cmd.h @@ -36,16 +36,16 @@ void dsi_hs_mode_enable(struct intel_dsi *intel_dsi, bool enable); int dsi_vc_dcs_write(struct intel_dsi *intel_dsi, int channel, - const u8 *data, size_t len); + const u8 *data, int len); int dsi_vc_generic_write(struct intel_dsi *intel_dsi, int channel, - const u8 *data, size_t len); + const u8 *data, int len); int dsi_vc_dcs_read(struct intel_dsi *intel_dsi, int channel, u8 dcs_cmd, - u8 *buf, size_t buflen); + u8 *buf, int buflen); int dsi_vc_generic_read(struct intel_dsi *intel_dsi, int channel, - u8 *reqdata, size_t reqlen, u8 *buf, size_t buflen); + u8 *reqdata, int reqlen, u8 *buf, int buflen); int dpi_send_cmd(struct intel_dsi *intel_dsi, u32 cmd); @@ -84,21 +84,21 @@ static inline int dsi_vc_generic_write_2(struct intel_dsi *intel_dsi, /* XXX: questionable read helpers */ static inline int dsi_vc_generic_read_0(struct intel_dsi *intel_dsi, - int channel, u8 *buf, size_t buflen) + int channel, u8 *buf, int buflen) { return dsi_vc_generic_read(intel_dsi, channel, NULL, 0, buf, buflen); } static inline int dsi_vc_generic_read_1(struct intel_dsi *intel_dsi, int channel, u8 param, u8 *buf, - size_t buflen) + int buflen) { return dsi_vc_generic_read(intel_dsi, channel, ¶m, 1, buf, buflen); } static inline int dsi_vc_generic_read_2(struct intel_dsi *intel_dsi, int channel, u8 param1, u8 param2, - u8 *buf, size_t buflen) + u8 *buf, int buflen) { u8 req[2] = { param1, param2 }; -- 2.11.0