Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7606265 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: s/intel_dp_aux_ch/intel_dp_aux_xfer/ 



Rename intel_dp_aux_ch() to intel_dp_aux_xfer() to better convey
what it actually does.

Signed-off-by: default avatarVille 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
parent fee0fddc

drivers/gpu/drm/i915/intel_dp.c

+9 −9
Original line number Diff line number Diff line
@@ -1085,7 +1085,7 @@ 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,

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)

{
@@ -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;
@@ -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;

			/*
@@ -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;