Skip to content

Commit

Permalink
drm/i915: s/intel_dp_aux_ch/intel_dp_aux_xfer/
Browse files Browse the repository at this point in the history
Rename intel_dp_aux_ch() to intel_dp_aux_xfer() to better convey
what it actually does.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180222181036.15251-6-ville.syrjala@linux.intel.com
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> #irc
  • Loading branch information
Ville Syrjälä committed Mar 2, 2018
1 parent fee0fdd commit f760626
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions drivers/gpu/drm/i915/intel_dp.c
Original file line number Diff line number Diff line change
Expand Up @@ -1085,9 +1085,9 @@ static uint32_t intel_dp_get_aux_send_ctl(struct intel_dp *intel_dp,
}

static int
intel_dp_aux_ch(struct intel_dp *intel_dp,
const uint8_t *send, int send_bytes,
uint8_t *recv, int recv_size, bool aksv_write)
intel_dp_aux_xfer(struct intel_dp *intel_dp,
const uint8_t *send, int send_bytes,
uint8_t *recv, int recv_size, bool aksv_write)
{
struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
struct drm_i915_private *dev_priv =
Expand Down Expand Up @@ -1284,8 +1284,8 @@ intel_dp_aux_transfer(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg)
if (msg->buffer)
memcpy(txbuf + HEADER_SIZE, msg->buffer, msg->size);

ret = intel_dp_aux_ch(intel_dp, txbuf, txsize, rxbuf, rxsize,
false);
ret = intel_dp_aux_xfer(intel_dp, txbuf, txsize,
rxbuf, rxsize, false);
if (ret > 0) {
msg->reply = rxbuf[0] >> 4;

Expand All @@ -1307,8 +1307,8 @@ intel_dp_aux_transfer(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg)
if (WARN_ON(rxsize > 20))
return -E2BIG;

ret = intel_dp_aux_ch(intel_dp, txbuf, txsize, rxbuf, rxsize,
false);
ret = intel_dp_aux_xfer(intel_dp, txbuf, txsize,
rxbuf, rxsize, false);
if (ret > 0) {
msg->reply = rxbuf[0] >> 4;
/*
Expand Down Expand Up @@ -5045,8 +5045,8 @@ int intel_dp_hdcp_write_an_aksv(struct intel_digital_port *intel_dig_port,
txbuf[2] = DP_AUX_HDCP_AKSV & 0xff;
txbuf[3] = DRM_HDCP_KSV_LEN - 1;

ret = intel_dp_aux_ch(intel_dp, txbuf, sizeof(txbuf), rxbuf,
sizeof(rxbuf), true);
ret = intel_dp_aux_xfer(intel_dp, txbuf, sizeof(txbuf),
rxbuf, sizeof(rxbuf), true);
if (ret < 0) {
DRM_ERROR("Write Aksv over DP/AUX failed (%d)\n", ret);
return ret;
Expand Down

0 comments on commit f760626

Please sign in to comment.