From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH] drm/dp_mst: Fix W=1 warnings Date: Thu, 28 Nov 2019 12:03:32 +0200 Message-ID: <877e3knwqz.fsf@intel.com> References: <20191112123938.2346-1-benjamin.gaignard@st.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: In-Reply-To: <20191112123938.2346-1-benjamin.gaignard@st.com> Sender: linux-kernel-owner@vger.kernel.org To: maarten.lankhorst@linux.intel.com, mripard@kernel.org, sean@poorly.run, airlied@linux.ie, daniel@ffwll.ch Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Benjamin Gaignard List-Id: dri-devel@lists.freedesktop.org On Tue, 12 Nov 2019, Benjamin Gaignard wrote: > Fix the warnings that show up with W=1. > They are all about unused but set variables. > > Signed-off-by: Benjamin Gaignard > --- > drivers/gpu/drm/drm_dp_mst_topology.c | 50 +++++++++++++---------------------- > 1 file changed, 19 insertions(+), 31 deletions(-) > > diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c > index b854a422a523..6ff554be8000 100644 > --- a/drivers/gpu/drm/drm_dp_mst_topology.c > +++ b/drivers/gpu/drm/drm_dp_mst_topology.c > @@ -672,7 +672,6 @@ static bool drm_dp_sideband_msg_build(struct drm_dp_sideband_msg_rx *msg, > u8 *replybuf, u8 replybuflen, bool hdr) > { > int ret; > - u8 crc4; > > if (hdr) { > u8 hdrlen; > @@ -714,8 +713,6 @@ static bool drm_dp_sideband_msg_build(struct drm_dp_sideband_msg_rx *msg, > } > > if (msg->curchunk_idx >= msg->curchunk_len) { > - /* do CRC */ > - crc4 = drm_dp_msg_data_crc4(msg->chunk, msg->curchunk_len - 1); Someone who knows this code really needs to check if we should be using crc4 instead of just throwing this away as unused. > /* copy chunk into bigger msg */ > memcpy(&msg->msg[msg->curlen], msg->chunk, msg->curchunk_len - 1); > msg->curlen += msg->curchunk_len - 1; > @@ -1744,14 +1741,13 @@ static u8 drm_dp_calculate_rad(struct drm_dp_mst_port *port, > */ > static bool drm_dp_port_setup_pdt(struct drm_dp_mst_port *port) The function changed in c485e2c97dae ("drm/dp_mst: Refactor pdt setup/teardown, add more locking"). > { > - int ret; > u8 rad[6], lct; > bool send_link = false; > switch (port->pdt) { > case DP_PEER_DEVICE_DP_LEGACY_CONV: > case DP_PEER_DEVICE_SST_SINK: > /* add i2c over sideband */ > - ret = drm_dp_mst_register_i2c_bus(&port->aux); > + drm_dp_mst_register_i2c_bus(&port->aux); > break; > case DP_PEER_DEVICE_MST_BRANCHING: > lct = drm_dp_calculate_rad(port, rad); > @@ -1821,21 +1817,18 @@ ssize_t drm_dp_mst_dpcd_write(struct drm_dp_aux *aux, > > static void drm_dp_check_mstb_guid(struct drm_dp_mst_branch *mstb, u8 *guid) > { > - int ret; > - > memcpy(mstb->guid, guid, 16); > > if (!drm_dp_validate_guid(mstb->mgr, mstb->guid)) { > if (mstb->port_parent) { > - ret = drm_dp_send_dpcd_write( > + drm_dp_send_dpcd_write( > mstb->mgr, > mstb->port_parent, > DP_GUID, > 16, > mstb->guid); Indentation could be fixed while at it. > } else { > - > - ret = drm_dp_dpcd_write( > + drm_dp_dpcd_write( > mstb->mgr->aux, > DP_GUID, > mstb->guid, > @@ -2427,14 +2420,14 @@ static void drm_dp_send_link_address(struct drm_dp_mst_topology_mgr *mgr, > { > struct drm_dp_sideband_msg_tx *txmsg; > struct drm_dp_link_address_ack_reply *reply; > - int i, len, ret; > + int i, ret; > > txmsg = kzalloc(sizeof(*txmsg), GFP_KERNEL); > if (!txmsg) > return; > > txmsg->dst = mstb; > - len = build_link_address(txmsg); > + build_link_address(txmsg); Maybe you should make the function void while at it? > > mstb->link_address_sent = true; > drm_dp_queue_down_tx(mgr, txmsg); > @@ -2476,7 +2469,6 @@ drm_dp_send_enum_path_resources(struct drm_dp_mst_topology_mgr *mgr, > { > struct drm_dp_enum_path_resources_ack_reply *path_res; > struct drm_dp_sideband_msg_tx *txmsg; > - int len; > int ret; > > txmsg = kzalloc(sizeof(*txmsg), GFP_KERNEL); > @@ -2484,7 +2476,7 @@ drm_dp_send_enum_path_resources(struct drm_dp_mst_topology_mgr *mgr, > return -ENOMEM; > > txmsg->dst = mstb; > - len = build_enum_path_resources(txmsg, port->port_num); > + build_enum_path_resources(txmsg, port->port_num); Maybe you should make the function void while at it? > drm_dp_queue_down_tx(mgr, txmsg); > > @@ -2567,7 +2559,7 @@ static int drm_dp_payload_send_msg(struct drm_dp_mst_topology_mgr *mgr, > { > struct drm_dp_sideband_msg_tx *txmsg; > struct drm_dp_mst_branch *mstb; > - int len, ret, port_num; > + int ret, port_num; > u8 sinks[DRM_DP_MAX_SDP_STREAMS]; > int i; > > @@ -2592,9 +2584,9 @@ static int drm_dp_payload_send_msg(struct drm_dp_mst_topology_mgr *mgr, > sinks[i] = i; > > txmsg->dst = mstb; > - len = build_allocate_payload(txmsg, port_num, > - id, > - pbn, port->num_sdp_streams, sinks); > + build_allocate_payload(txmsg, port_num, > + id, > + pbn, port->num_sdp_streams, sinks); Maybe you should make the function void while at it? > > drm_dp_queue_down_tx(mgr, txmsg); > > @@ -2623,7 +2615,7 @@ int drm_dp_send_power_updown_phy(struct drm_dp_mst_topology_mgr *mgr, > struct drm_dp_mst_port *port, bool power_up) > { > struct drm_dp_sideband_msg_tx *txmsg; > - int len, ret; > + int ret; > > port = drm_dp_mst_topology_get_port_validated(mgr, port); > if (!port) > @@ -2636,7 +2628,7 @@ int drm_dp_send_power_updown_phy(struct drm_dp_mst_topology_mgr *mgr, > } > > txmsg->dst = port->parent; > - len = build_power_updown_phy(txmsg, port->port_num, power_up); > + build_power_updown_phy(txmsg, port->port_num, power_up); Maybe you should make the function void while at it? > drm_dp_queue_down_tx(mgr, txmsg); > > ret = drm_dp_mst_wait_tx_reply(port->parent, txmsg); > @@ -2856,7 +2848,6 @@ static int drm_dp_send_dpcd_read(struct drm_dp_mst_topology_mgr *mgr, > struct drm_dp_mst_port *port, > int offset, int size, u8 *bytes) > { > - int len; > int ret = 0; > struct drm_dp_sideband_msg_tx *txmsg; > struct drm_dp_mst_branch *mstb; > @@ -2871,7 +2862,7 @@ static int drm_dp_send_dpcd_read(struct drm_dp_mst_topology_mgr *mgr, > goto fail_put; > } > > - len = build_dpcd_read(txmsg, port->port_num, offset, size); > + build_dpcd_read(txmsg, port->port_num, offset, size); Maybe you should make the function void while at it? > txmsg->dst = port->parent; > > drm_dp_queue_down_tx(mgr, txmsg); > @@ -2909,7 +2900,6 @@ static int drm_dp_send_dpcd_write(struct drm_dp_mst_topology_mgr *mgr, > struct drm_dp_mst_port *port, > int offset, int size, u8 *bytes) > { > - int len; > int ret; > struct drm_dp_sideband_msg_tx *txmsg; > struct drm_dp_mst_branch *mstb; > @@ -2924,7 +2914,7 @@ static int drm_dp_send_dpcd_write(struct drm_dp_mst_topology_mgr *mgr, > goto fail_put; > } > > - len = build_dpcd_write(txmsg, port->port_num, offset, size, bytes); > + build_dpcd_write(txmsg, port->port_num, offset, size, bytes); Maybe you should make the function void while at it? > txmsg->dst = mstb; > > drm_dp_queue_down_tx(mgr, txmsg); > @@ -3147,7 +3137,7 @@ static bool drm_dp_get_one_sb_msg(struct drm_dp_mst_topology_mgr *mgr, bool up) > { > int len; > u8 replyblock[32]; > - int replylen, origlen, curreply; > + int replylen, curreply; > int ret; > struct drm_dp_sideband_msg_rx *msg; > int basereg = up ? DP_SIDEBAND_MSG_UP_REQ_BASE : DP_SIDEBAND_MSG_DOWN_REP_BASE; > @@ -3167,7 +3157,6 @@ static bool drm_dp_get_one_sb_msg(struct drm_dp_mst_topology_mgr *mgr, bool up) > } > replylen = msg->curchunk_len + msg->curchunk_hdrlen; > > - origlen = replylen; > replylen -= len; > curreply = len; > while (replylen > 0) { > @@ -3959,17 +3948,16 @@ void drm_dp_mst_dump_topology(struct seq_file *m, > mutex_lock(&mgr->lock); > if (mgr->mst_primary) { > u8 buf[DP_PAYLOAD_TABLE_SIZE]; > - int ret; > > - ret = drm_dp_dpcd_read(mgr->aux, DP_DPCD_REV, buf, DP_RECEIVER_CAP_SIZE); > + drm_dp_dpcd_read(mgr->aux, DP_DPCD_REV, buf, DP_RECEIVER_CAP_SIZE); > seq_printf(m, "dpcd: %*ph\n", DP_RECEIVER_CAP_SIZE, buf); > - ret = drm_dp_dpcd_read(mgr->aux, DP_FAUX_CAP, buf, 2); > + drm_dp_dpcd_read(mgr->aux, DP_FAUX_CAP, buf, 2); > seq_printf(m, "faux/mst: %*ph\n", 2, buf); > - ret = drm_dp_dpcd_read(mgr->aux, DP_MSTM_CTRL, buf, 1); > + drm_dp_dpcd_read(mgr->aux, DP_MSTM_CTRL, buf, 1); > seq_printf(m, "mst ctrl: %*ph\n", 1, buf); > > /* dump the standard OUI branch header */ > - ret = drm_dp_dpcd_read(mgr->aux, DP_BRANCH_OUI, buf, DP_BRANCH_OUI_HEADER_SIZE); > + drm_dp_dpcd_read(mgr->aux, DP_BRANCH_OUI, buf, DP_BRANCH_OUI_HEADER_SIZE); > seq_printf(m, "branch oui: %*phN devid: ", 3, buf); > for (i = 0x3; i < 0x8 && buf[i]; i++) > seq_printf(m, "%c", buf[i]); -- Jani Nikula, Intel Open Source Graphics Center From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D0EB6C432C0 for ; Thu, 28 Nov 2019 10:03:40 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AA8D42178F for ; Thu, 28 Nov 2019 10:03:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AA8D42178F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E8A606E03E; Thu, 28 Nov 2019 10:03:39 +0000 (UTC) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id CBCB46E03E for ; Thu, 28 Nov 2019 10:03:38 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 Nov 2019 02:03:38 -0800 X-IronPort-AV: E=Sophos;i="5.69,253,1571727600"; d="scan'208";a="203389544" Received: from jnikula-mobl3.fi.intel.com (HELO localhost) ([10.237.66.161]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 Nov 2019 02:03:34 -0800 From: Jani Nikula To: Benjamin Gaignard , maarten.lankhorst@linux.intel.com, mripard@kernel.org, sean@poorly.run, airlied@linux.ie, daniel@ffwll.ch Subject: Re: [PATCH] drm/dp_mst: Fix W=1 warnings In-Reply-To: <20191112123938.2346-1-benjamin.gaignard@st.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20191112123938.2346-1-benjamin.gaignard@st.com> Date: Thu, 28 Nov 2019 12:03:32 +0200 Message-ID: <877e3knwqz.fsf@intel.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Benjamin Gaignard Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Message-ID: <20191128100332.Nu2ULtJbbiGrsG89tTlVXYKFTAkj-z9OBw52LaXZ5nw@z> T24gVHVlLCAxMiBOb3YgMjAxOSwgQmVuamFtaW4gR2FpZ25hcmQgPGJlbmphbWluLmdhaWduYXJk QHN0LmNvbT4gd3JvdGU6Cj4gRml4IHRoZSB3YXJuaW5ncyB0aGF0IHNob3cgdXAgd2l0aCBXPTEu Cj4gVGhleSBhcmUgYWxsIGFib3V0IHVudXNlZCBidXQgc2V0IHZhcmlhYmxlcy4KPgo+IFNpZ25l ZC1vZmYtYnk6IEJlbmphbWluIEdhaWduYXJkIDxiZW5qYW1pbi5nYWlnbmFyZEBzdC5jb20+Cj4g LS0tCj4gIGRyaXZlcnMvZ3B1L2RybS9kcm1fZHBfbXN0X3RvcG9sb2d5LmMgfCA1MCArKysrKysr KysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQo+ICAxIGZpbGUgY2hhbmdlZCwgMTkgaW5zZXJ0 aW9ucygrKSwgMzEgZGVsZXRpb25zKC0pCj4KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2RybV9kcF9tc3RfdG9wb2xvZ3kuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fZHBfbXN0X3RvcG9s b2d5LmMKPiBpbmRleCBiODU0YTQyMmE1MjMuLjZmZjU1NGJlODAwMCAxMDA2NDQKPiAtLS0gYS9k cml2ZXJzL2dwdS9kcm0vZHJtX2RwX21zdF90b3BvbG9neS5jCj4gKysrIGIvZHJpdmVycy9ncHUv ZHJtL2RybV9kcF9tc3RfdG9wb2xvZ3kuYwo+IEBAIC02NzIsNyArNjcyLDYgQEAgc3RhdGljIGJv b2wgZHJtX2RwX3NpZGViYW5kX21zZ19idWlsZChzdHJ1Y3QgZHJtX2RwX3NpZGViYW5kX21zZ19y eCAqbXNnLAo+ICAJCQkJICAgICAgdTggKnJlcGx5YnVmLCB1OCByZXBseWJ1ZmxlbiwgYm9vbCBo ZHIpCj4gIHsKPiAgCWludCByZXQ7Cj4gLQl1OCBjcmM0Owo+ICAKPiAgCWlmIChoZHIpIHsKPiAg CQl1OCBoZHJsZW47Cj4gQEAgLTcxNCw4ICs3MTMsNiBAQCBzdGF0aWMgYm9vbCBkcm1fZHBfc2lk ZWJhbmRfbXNnX2J1aWxkKHN0cnVjdCBkcm1fZHBfc2lkZWJhbmRfbXNnX3J4ICptc2csCj4gIAl9 Cj4gIAo+ICAJaWYgKG1zZy0+Y3VyY2h1bmtfaWR4ID49IG1zZy0+Y3VyY2h1bmtfbGVuKSB7Cj4g LQkJLyogZG8gQ1JDICovCj4gLQkJY3JjNCA9IGRybV9kcF9tc2dfZGF0YV9jcmM0KG1zZy0+Y2h1 bmssIG1zZy0+Y3VyY2h1bmtfbGVuIC0gMSk7CgpTb21lb25lIHdobyBrbm93cyB0aGlzIGNvZGUg cmVhbGx5IG5lZWRzIHRvIGNoZWNrIGlmIHdlIHNob3VsZCBiZSB1c2luZwpjcmM0IGluc3RlYWQg b2YganVzdCB0aHJvd2luZyB0aGlzIGF3YXkgYXMgdW51c2VkLgoKPiAgCQkvKiBjb3B5IGNodW5r IGludG8gYmlnZ2VyIG1zZyAqLwo+ICAJCW1lbWNweSgmbXNnLT5tc2dbbXNnLT5jdXJsZW5dLCBt c2ctPmNodW5rLCBtc2ctPmN1cmNodW5rX2xlbiAtIDEpOwo+ICAJCW1zZy0+Y3VybGVuICs9IG1z Zy0+Y3VyY2h1bmtfbGVuIC0gMTsKPiBAQCAtMTc0NCwxNCArMTc0MSwxMyBAQCBzdGF0aWMgdTgg ZHJtX2RwX2NhbGN1bGF0ZV9yYWQoc3RydWN0IGRybV9kcF9tc3RfcG9ydCAqcG9ydCwKPiAgICov Cj4gIHN0YXRpYyBib29sIGRybV9kcF9wb3J0X3NldHVwX3BkdChzdHJ1Y3QgZHJtX2RwX21zdF9w b3J0ICpwb3J0KQoKVGhlIGZ1bmN0aW9uIGNoYW5nZWQgaW4gYzQ4NWUyYzk3ZGFlICgiZHJtL2Rw X21zdDogUmVmYWN0b3IgcGR0CnNldHVwL3RlYXJkb3duLCBhZGQgbW9yZSBsb2NraW5nIikuCgo+ ICB7Cj4gLQlpbnQgcmV0Owo+ICAJdTggcmFkWzZdLCBsY3Q7Cj4gIAlib29sIHNlbmRfbGluayA9 IGZhbHNlOwo+ICAJc3dpdGNoIChwb3J0LT5wZHQpIHsKPiAgCWNhc2UgRFBfUEVFUl9ERVZJQ0Vf RFBfTEVHQUNZX0NPTlY6Cj4gIAljYXNlIERQX1BFRVJfREVWSUNFX1NTVF9TSU5LOgo+ICAJCS8q IGFkZCBpMmMgb3ZlciBzaWRlYmFuZCAqLwo+IC0JCXJldCA9IGRybV9kcF9tc3RfcmVnaXN0ZXJf aTJjX2J1cygmcG9ydC0+YXV4KTsKPiArCQlkcm1fZHBfbXN0X3JlZ2lzdGVyX2kyY19idXMoJnBv cnQtPmF1eCk7Cj4gIAkJYnJlYWs7Cj4gIAljYXNlIERQX1BFRVJfREVWSUNFX01TVF9CUkFOQ0hJ Tkc6Cj4gIAkJbGN0ID0gZHJtX2RwX2NhbGN1bGF0ZV9yYWQocG9ydCwgcmFkKTsKPiBAQCAtMTgy MSwyMSArMTgxNywxOCBAQCBzc2l6ZV90IGRybV9kcF9tc3RfZHBjZF93cml0ZShzdHJ1Y3QgZHJt X2RwX2F1eCAqYXV4LAo+ICAKPiAgc3RhdGljIHZvaWQgZHJtX2RwX2NoZWNrX21zdGJfZ3VpZChz dHJ1Y3QgZHJtX2RwX21zdF9icmFuY2ggKm1zdGIsIHU4ICpndWlkKQo+ICB7Cj4gLQlpbnQgcmV0 Owo+IC0KPiAgCW1lbWNweShtc3RiLT5ndWlkLCBndWlkLCAxNik7Cj4gIAo+ICAJaWYgKCFkcm1f ZHBfdmFsaWRhdGVfZ3VpZChtc3RiLT5tZ3IsIG1zdGItPmd1aWQpKSB7Cj4gIAkJaWYgKG1zdGIt PnBvcnRfcGFyZW50KSB7Cj4gLQkJCXJldCA9IGRybV9kcF9zZW5kX2RwY2Rfd3JpdGUoCj4gKwkJ CWRybV9kcF9zZW5kX2RwY2Rfd3JpdGUoCj4gIAkJCQkJbXN0Yi0+bWdyLAo+ICAJCQkJCW1zdGIt PnBvcnRfcGFyZW50LAo+ICAJCQkJCURQX0dVSUQsCj4gIAkJCQkJMTYsCj4gIAkJCQkJbXN0Yi0+ Z3VpZCk7CgpJbmRlbnRhdGlvbiBjb3VsZCBiZSBmaXhlZCB3aGlsZSBhdCBpdC4KCj4gIAkJfSBl bHNlIHsKPiAtCj4gLQkJCXJldCA9IGRybV9kcF9kcGNkX3dyaXRlKAo+ICsJCQlkcm1fZHBfZHBj ZF93cml0ZSgKPiAgCQkJCQltc3RiLT5tZ3ItPmF1eCwKPiAgCQkJCQlEUF9HVUlELAo+ICAJCQkJ CW1zdGItPmd1aWQsCj4gQEAgLTI0MjcsMTQgKzI0MjAsMTQgQEAgc3RhdGljIHZvaWQgZHJtX2Rw X3NlbmRfbGlua19hZGRyZXNzKHN0cnVjdCBkcm1fZHBfbXN0X3RvcG9sb2d5X21nciAqbWdyLAo+ ICB7Cj4gIAlzdHJ1Y3QgZHJtX2RwX3NpZGViYW5kX21zZ190eCAqdHhtc2c7Cj4gIAlzdHJ1Y3Qg ZHJtX2RwX2xpbmtfYWRkcmVzc19hY2tfcmVwbHkgKnJlcGx5Owo+IC0JaW50IGksIGxlbiwgcmV0 Owo+ICsJaW50IGksIHJldDsKPiAgCj4gIAl0eG1zZyA9IGt6YWxsb2Moc2l6ZW9mKCp0eG1zZyks IEdGUF9LRVJORUwpOwo+ICAJaWYgKCF0eG1zZykKPiAgCQlyZXR1cm47Cj4gIAo+ICAJdHhtc2ct PmRzdCA9IG1zdGI7Cj4gLQlsZW4gPSBidWlsZF9saW5rX2FkZHJlc3ModHhtc2cpOwo+ICsJYnVp bGRfbGlua19hZGRyZXNzKHR4bXNnKTsKCk1heWJlIHlvdSBzaG91bGQgbWFrZSB0aGUgZnVuY3Rp b24gdm9pZCB3aGlsZSBhdCBpdD8KCj4gIAo+ICAJbXN0Yi0+bGlua19hZGRyZXNzX3NlbnQgPSB0 cnVlOwo+ICAJZHJtX2RwX3F1ZXVlX2Rvd25fdHgobWdyLCB0eG1zZyk7Cj4gQEAgLTI0NzYsNyAr MjQ2OSw2IEBAIGRybV9kcF9zZW5kX2VudW1fcGF0aF9yZXNvdXJjZXMoc3RydWN0IGRybV9kcF9t c3RfdG9wb2xvZ3lfbWdyICptZ3IsCj4gIHsKPiAgCXN0cnVjdCBkcm1fZHBfZW51bV9wYXRoX3Jl c291cmNlc19hY2tfcmVwbHkgKnBhdGhfcmVzOwo+ICAJc3RydWN0IGRybV9kcF9zaWRlYmFuZF9t c2dfdHggKnR4bXNnOwo+IC0JaW50IGxlbjsKPiAgCWludCByZXQ7Cj4gIAo+ICAJdHhtc2cgPSBr emFsbG9jKHNpemVvZigqdHhtc2cpLCBHRlBfS0VSTkVMKTsKPiBAQCAtMjQ4NCw3ICsyNDc2LDcg QEAgZHJtX2RwX3NlbmRfZW51bV9wYXRoX3Jlc291cmNlcyhzdHJ1Y3QgZHJtX2RwX21zdF90b3Bv bG9neV9tZ3IgKm1nciwKPiAgCQlyZXR1cm4gLUVOT01FTTsKPiAgCj4gIAl0eG1zZy0+ZHN0ID0g bXN0YjsKPiAtCWxlbiA9IGJ1aWxkX2VudW1fcGF0aF9yZXNvdXJjZXModHhtc2csIHBvcnQtPnBv cnRfbnVtKTsKPiArCWJ1aWxkX2VudW1fcGF0aF9yZXNvdXJjZXModHhtc2csIHBvcnQtPnBvcnRf bnVtKTsKCk1heWJlIHlvdSBzaG91bGQgbWFrZSB0aGUgZnVuY3Rpb24gdm9pZCB3aGlsZSBhdCBp dD8KCj4gIAlkcm1fZHBfcXVldWVfZG93bl90eChtZ3IsIHR4bXNnKTsKPiAgCj4gQEAgLTI1Njcs NyArMjU1OSw3IEBAIHN0YXRpYyBpbnQgZHJtX2RwX3BheWxvYWRfc2VuZF9tc2coc3RydWN0IGRy bV9kcF9tc3RfdG9wb2xvZ3lfbWdyICptZ3IsCj4gIHsKPiAgCXN0cnVjdCBkcm1fZHBfc2lkZWJh bmRfbXNnX3R4ICp0eG1zZzsKPiAgCXN0cnVjdCBkcm1fZHBfbXN0X2JyYW5jaCAqbXN0YjsKPiAt CWludCBsZW4sIHJldCwgcG9ydF9udW07Cj4gKwlpbnQgcmV0LCBwb3J0X251bTsKPiAgCXU4IHNp bmtzW0RSTV9EUF9NQVhfU0RQX1NUUkVBTVNdOwo+ICAJaW50IGk7Cj4gIAo+IEBAIC0yNTkyLDkg KzI1ODQsOSBAQCBzdGF0aWMgaW50IGRybV9kcF9wYXlsb2FkX3NlbmRfbXNnKHN0cnVjdCBkcm1f ZHBfbXN0X3RvcG9sb2d5X21nciAqbWdyLAo+ICAJCXNpbmtzW2ldID0gaTsKPiAgCj4gIAl0eG1z Zy0+ZHN0ID0gbXN0YjsKPiAtCWxlbiA9IGJ1aWxkX2FsbG9jYXRlX3BheWxvYWQodHhtc2csIHBv cnRfbnVtLAo+IC0JCQkJICAgICBpZCwKPiAtCQkJCSAgICAgcGJuLCBwb3J0LT5udW1fc2RwX3N0 cmVhbXMsIHNpbmtzKTsKPiArCWJ1aWxkX2FsbG9jYXRlX3BheWxvYWQodHhtc2csIHBvcnRfbnVt LAo+ICsJCQkgICAgICAgaWQsCj4gKwkJCSAgICAgICBwYm4sIHBvcnQtPm51bV9zZHBfc3RyZWFt cywgc2lua3MpOwoKTWF5YmUgeW91IHNob3VsZCBtYWtlIHRoZSBmdW5jdGlvbiB2b2lkIHdoaWxl IGF0IGl0PwoKPiAgCj4gIAlkcm1fZHBfcXVldWVfZG93bl90eChtZ3IsIHR4bXNnKTsKPiAgCj4g QEAgLTI2MjMsNyArMjYxNSw3IEBAIGludCBkcm1fZHBfc2VuZF9wb3dlcl91cGRvd25fcGh5KHN0 cnVjdCBkcm1fZHBfbXN0X3RvcG9sb2d5X21nciAqbWdyLAo+ICAJCQkJIHN0cnVjdCBkcm1fZHBf bXN0X3BvcnQgKnBvcnQsIGJvb2wgcG93ZXJfdXApCj4gIHsKPiAgCXN0cnVjdCBkcm1fZHBfc2lk ZWJhbmRfbXNnX3R4ICp0eG1zZzsKPiAtCWludCBsZW4sIHJldDsKPiArCWludCByZXQ7Cj4gIAo+ ICAJcG9ydCA9IGRybV9kcF9tc3RfdG9wb2xvZ3lfZ2V0X3BvcnRfdmFsaWRhdGVkKG1nciwgcG9y dCk7Cj4gIAlpZiAoIXBvcnQpCj4gQEAgLTI2MzYsNyArMjYyOCw3IEBAIGludCBkcm1fZHBfc2Vu ZF9wb3dlcl91cGRvd25fcGh5KHN0cnVjdCBkcm1fZHBfbXN0X3RvcG9sb2d5X21nciAqbWdyLAo+ ICAJfQo+ICAKPiAgCXR4bXNnLT5kc3QgPSBwb3J0LT5wYXJlbnQ7Cj4gLQlsZW4gPSBidWlsZF9w b3dlcl91cGRvd25fcGh5KHR4bXNnLCBwb3J0LT5wb3J0X251bSwgcG93ZXJfdXApOwo+ICsJYnVp bGRfcG93ZXJfdXBkb3duX3BoeSh0eG1zZywgcG9ydC0+cG9ydF9udW0sIHBvd2VyX3VwKTsKCk1h eWJlIHlvdSBzaG91bGQgbWFrZSB0aGUgZnVuY3Rpb24gdm9pZCB3aGlsZSBhdCBpdD8KCj4gIAlk cm1fZHBfcXVldWVfZG93bl90eChtZ3IsIHR4bXNnKTsKPiAgCj4gIAlyZXQgPSBkcm1fZHBfbXN0 X3dhaXRfdHhfcmVwbHkocG9ydC0+cGFyZW50LCB0eG1zZyk7Cj4gQEAgLTI4NTYsNyArMjg0OCw2 IEBAIHN0YXRpYyBpbnQgZHJtX2RwX3NlbmRfZHBjZF9yZWFkKHN0cnVjdCBkcm1fZHBfbXN0X3Rv cG9sb2d5X21nciAqbWdyLAo+ICAJCQkJIHN0cnVjdCBkcm1fZHBfbXN0X3BvcnQgKnBvcnQsCj4g IAkJCQkgaW50IG9mZnNldCwgaW50IHNpemUsIHU4ICpieXRlcykKPiAgewo+IC0JaW50IGxlbjsK PiAgCWludCByZXQgPSAwOwo+ICAJc3RydWN0IGRybV9kcF9zaWRlYmFuZF9tc2dfdHggKnR4bXNn Owo+ICAJc3RydWN0IGRybV9kcF9tc3RfYnJhbmNoICptc3RiOwo+IEBAIC0yODcxLDcgKzI4NjIs NyBAQCBzdGF0aWMgaW50IGRybV9kcF9zZW5kX2RwY2RfcmVhZChzdHJ1Y3QgZHJtX2RwX21zdF90 b3BvbG9neV9tZ3IgKm1nciwKPiAgCQlnb3RvIGZhaWxfcHV0Owo+ICAJfQo+ICAKPiAtCWxlbiA9 IGJ1aWxkX2RwY2RfcmVhZCh0eG1zZywgcG9ydC0+cG9ydF9udW0sIG9mZnNldCwgc2l6ZSk7Cj4g KwlidWlsZF9kcGNkX3JlYWQodHhtc2csIHBvcnQtPnBvcnRfbnVtLCBvZmZzZXQsIHNpemUpOwoK TWF5YmUgeW91IHNob3VsZCBtYWtlIHRoZSBmdW5jdGlvbiB2b2lkIHdoaWxlIGF0IGl0PwoKPiAg CXR4bXNnLT5kc3QgPSBwb3J0LT5wYXJlbnQ7Cj4gIAo+ICAJZHJtX2RwX3F1ZXVlX2Rvd25fdHgo bWdyLCB0eG1zZyk7Cj4gQEAgLTI5MDksNyArMjkwMCw2IEBAIHN0YXRpYyBpbnQgZHJtX2RwX3Nl bmRfZHBjZF93cml0ZShzdHJ1Y3QgZHJtX2RwX21zdF90b3BvbG9neV9tZ3IgKm1nciwKPiAgCQkJ CSAgc3RydWN0IGRybV9kcF9tc3RfcG9ydCAqcG9ydCwKPiAgCQkJCSAgaW50IG9mZnNldCwgaW50 IHNpemUsIHU4ICpieXRlcykKPiAgewo+IC0JaW50IGxlbjsKPiAgCWludCByZXQ7Cj4gIAlzdHJ1 Y3QgZHJtX2RwX3NpZGViYW5kX21zZ190eCAqdHhtc2c7Cj4gIAlzdHJ1Y3QgZHJtX2RwX21zdF9i cmFuY2ggKm1zdGI7Cj4gQEAgLTI5MjQsNyArMjkxNCw3IEBAIHN0YXRpYyBpbnQgZHJtX2RwX3Nl bmRfZHBjZF93cml0ZShzdHJ1Y3QgZHJtX2RwX21zdF90b3BvbG9neV9tZ3IgKm1nciwKPiAgCQln b3RvIGZhaWxfcHV0Owo+ICAJfQo+ICAKPiAtCWxlbiA9IGJ1aWxkX2RwY2Rfd3JpdGUodHhtc2cs IHBvcnQtPnBvcnRfbnVtLCBvZmZzZXQsIHNpemUsIGJ5dGVzKTsKPiArCWJ1aWxkX2RwY2Rfd3Jp dGUodHhtc2csIHBvcnQtPnBvcnRfbnVtLCBvZmZzZXQsIHNpemUsIGJ5dGVzKTsKCk1heWJlIHlv dSBzaG91bGQgbWFrZSB0aGUgZnVuY3Rpb24gdm9pZCB3aGlsZSBhdCBpdD8KCj4gIAl0eG1zZy0+ ZHN0ID0gbXN0YjsKPiAgCj4gIAlkcm1fZHBfcXVldWVfZG93bl90eChtZ3IsIHR4bXNnKTsKPiBA QCAtMzE0Nyw3ICszMTM3LDcgQEAgc3RhdGljIGJvb2wgZHJtX2RwX2dldF9vbmVfc2JfbXNnKHN0 cnVjdCBkcm1fZHBfbXN0X3RvcG9sb2d5X21nciAqbWdyLCBib29sIHVwKQo+ICB7Cj4gIAlpbnQg bGVuOwo+ICAJdTggcmVwbHlibG9ja1szMl07Cj4gLQlpbnQgcmVwbHlsZW4sIG9yaWdsZW4sIGN1 cnJlcGx5Owo+ICsJaW50IHJlcGx5bGVuLCBjdXJyZXBseTsKPiAgCWludCByZXQ7Cj4gIAlzdHJ1 Y3QgZHJtX2RwX3NpZGViYW5kX21zZ19yeCAqbXNnOwo+ICAJaW50IGJhc2VyZWcgPSB1cCA/IERQ X1NJREVCQU5EX01TR19VUF9SRVFfQkFTRSA6IERQX1NJREVCQU5EX01TR19ET1dOX1JFUF9CQVNF Owo+IEBAIC0zMTY3LDcgKzMxNTcsNiBAQCBzdGF0aWMgYm9vbCBkcm1fZHBfZ2V0X29uZV9zYl9t c2coc3RydWN0IGRybV9kcF9tc3RfdG9wb2xvZ3lfbWdyICptZ3IsIGJvb2wgdXApCj4gIAl9Cj4g IAlyZXBseWxlbiA9IG1zZy0+Y3VyY2h1bmtfbGVuICsgbXNnLT5jdXJjaHVua19oZHJsZW47Cj4g IAo+IC0Jb3JpZ2xlbiA9IHJlcGx5bGVuOwo+ICAJcmVwbHlsZW4gLT0gbGVuOwo+ICAJY3VycmVw bHkgPSBsZW47Cj4gIAl3aGlsZSAocmVwbHlsZW4gPiAwKSB7Cj4gQEAgLTM5NTksMTcgKzM5NDgs MTYgQEAgdm9pZCBkcm1fZHBfbXN0X2R1bXBfdG9wb2xvZ3koc3RydWN0IHNlcV9maWxlICptLAo+ ICAJbXV0ZXhfbG9jaygmbWdyLT5sb2NrKTsKPiAgCWlmIChtZ3ItPm1zdF9wcmltYXJ5KSB7Cj4g IAkJdTggYnVmW0RQX1BBWUxPQURfVEFCTEVfU0laRV07Cj4gLQkJaW50IHJldDsKPiAgCj4gLQkJ cmV0ID0gZHJtX2RwX2RwY2RfcmVhZChtZ3ItPmF1eCwgRFBfRFBDRF9SRVYsIGJ1ZiwgRFBfUkVD RUlWRVJfQ0FQX1NJWkUpOwo+ICsJCWRybV9kcF9kcGNkX3JlYWQobWdyLT5hdXgsIERQX0RQQ0Rf UkVWLCBidWYsIERQX1JFQ0VJVkVSX0NBUF9TSVpFKTsKPiAgCQlzZXFfcHJpbnRmKG0sICJkcGNk OiAlKnBoXG4iLCBEUF9SRUNFSVZFUl9DQVBfU0laRSwgYnVmKTsKPiAtCQlyZXQgPSBkcm1fZHBf ZHBjZF9yZWFkKG1nci0+YXV4LCBEUF9GQVVYX0NBUCwgYnVmLCAyKTsKPiArCQlkcm1fZHBfZHBj ZF9yZWFkKG1nci0+YXV4LCBEUF9GQVVYX0NBUCwgYnVmLCAyKTsKPiAgCQlzZXFfcHJpbnRmKG0s ICJmYXV4L21zdDogJSpwaFxuIiwgMiwgYnVmKTsKPiAtCQlyZXQgPSBkcm1fZHBfZHBjZF9yZWFk KG1nci0+YXV4LCBEUF9NU1RNX0NUUkwsIGJ1ZiwgMSk7Cj4gKwkJZHJtX2RwX2RwY2RfcmVhZCht Z3ItPmF1eCwgRFBfTVNUTV9DVFJMLCBidWYsIDEpOwo+ICAJCXNlcV9wcmludGYobSwgIm1zdCBj dHJsOiAlKnBoXG4iLCAxLCBidWYpOwo+ICAKPiAgCQkvKiBkdW1wIHRoZSBzdGFuZGFyZCBPVUkg YnJhbmNoIGhlYWRlciAqLwo+IC0JCXJldCA9IGRybV9kcF9kcGNkX3JlYWQobWdyLT5hdXgsIERQ X0JSQU5DSF9PVUksIGJ1ZiwgRFBfQlJBTkNIX09VSV9IRUFERVJfU0laRSk7Cj4gKwkJZHJtX2Rw X2RwY2RfcmVhZChtZ3ItPmF1eCwgRFBfQlJBTkNIX09VSSwgYnVmLCBEUF9CUkFOQ0hfT1VJX0hF QURFUl9TSVpFKTsKPiAgCQlzZXFfcHJpbnRmKG0sICJicmFuY2ggb3VpOiAlKnBoTiBkZXZpZDog IiwgMywgYnVmKTsKPiAgCQlmb3IgKGkgPSAweDM7IGkgPCAweDggJiYgYnVmW2ldOyBpKyspCj4g IAkJCXNlcV9wcmludGYobSwgIiVjIiwgYnVmW2ldKTsKCi0tIApKYW5pIE5pa3VsYSwgSW50ZWwg T3BlbiBTb3VyY2UgR3JhcGhpY3MgQ2VudGVyCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2RyaS1kZXZlbA== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 16F75C432C0 for ; Thu, 28 Nov 2019 10:03:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DC5EC217BA for ; Thu, 28 Nov 2019 10:03:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726648AbfK1KDk (ORCPT ); Thu, 28 Nov 2019 05:03:40 -0500 Received: from mga03.intel.com ([134.134.136.65]:9956 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726133AbfK1KDk (ORCPT ); Thu, 28 Nov 2019 05:03:40 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 Nov 2019 02:03:38 -0800 X-IronPort-AV: E=Sophos;i="5.69,253,1571727600"; d="scan'208";a="203389544" Received: from jnikula-mobl3.fi.intel.com (HELO localhost) ([10.237.66.161]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 Nov 2019 02:03:34 -0800 From: Jani Nikula To: Benjamin Gaignard , maarten.lankhorst@linux.intel.com, mripard@kernel.org, sean@poorly.run, airlied@linux.ie, daniel@ffwll.ch Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Benjamin Gaignard Subject: Re: [PATCH] drm/dp_mst: Fix W=1 warnings In-Reply-To: <20191112123938.2346-1-benjamin.gaignard@st.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20191112123938.2346-1-benjamin.gaignard@st.com> Date: Thu, 28 Nov 2019 12:03:32 +0200 Message-ID: <877e3knwqz.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 12 Nov 2019, Benjamin Gaignard wrote: > Fix the warnings that show up with W=1. > They are all about unused but set variables. > > Signed-off-by: Benjamin Gaignard > --- > drivers/gpu/drm/drm_dp_mst_topology.c | 50 +++++++++++++---------------------- > 1 file changed, 19 insertions(+), 31 deletions(-) > > diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c > index b854a422a523..6ff554be8000 100644 > --- a/drivers/gpu/drm/drm_dp_mst_topology.c > +++ b/drivers/gpu/drm/drm_dp_mst_topology.c > @@ -672,7 +672,6 @@ static bool drm_dp_sideband_msg_build(struct drm_dp_sideband_msg_rx *msg, > u8 *replybuf, u8 replybuflen, bool hdr) > { > int ret; > - u8 crc4; > > if (hdr) { > u8 hdrlen; > @@ -714,8 +713,6 @@ static bool drm_dp_sideband_msg_build(struct drm_dp_sideband_msg_rx *msg, > } > > if (msg->curchunk_idx >= msg->curchunk_len) { > - /* do CRC */ > - crc4 = drm_dp_msg_data_crc4(msg->chunk, msg->curchunk_len - 1); Someone who knows this code really needs to check if we should be using crc4 instead of just throwing this away as unused. > /* copy chunk into bigger msg */ > memcpy(&msg->msg[msg->curlen], msg->chunk, msg->curchunk_len - 1); > msg->curlen += msg->curchunk_len - 1; > @@ -1744,14 +1741,13 @@ static u8 drm_dp_calculate_rad(struct drm_dp_mst_port *port, > */ > static bool drm_dp_port_setup_pdt(struct drm_dp_mst_port *port) The function changed in c485e2c97dae ("drm/dp_mst: Refactor pdt setup/teardown, add more locking"). > { > - int ret; > u8 rad[6], lct; > bool send_link = false; > switch (port->pdt) { > case DP_PEER_DEVICE_DP_LEGACY_CONV: > case DP_PEER_DEVICE_SST_SINK: > /* add i2c over sideband */ > - ret = drm_dp_mst_register_i2c_bus(&port->aux); > + drm_dp_mst_register_i2c_bus(&port->aux); > break; > case DP_PEER_DEVICE_MST_BRANCHING: > lct = drm_dp_calculate_rad(port, rad); > @@ -1821,21 +1817,18 @@ ssize_t drm_dp_mst_dpcd_write(struct drm_dp_aux *aux, > > static void drm_dp_check_mstb_guid(struct drm_dp_mst_branch *mstb, u8 *guid) > { > - int ret; > - > memcpy(mstb->guid, guid, 16); > > if (!drm_dp_validate_guid(mstb->mgr, mstb->guid)) { > if (mstb->port_parent) { > - ret = drm_dp_send_dpcd_write( > + drm_dp_send_dpcd_write( > mstb->mgr, > mstb->port_parent, > DP_GUID, > 16, > mstb->guid); Indentation could be fixed while at it. > } else { > - > - ret = drm_dp_dpcd_write( > + drm_dp_dpcd_write( > mstb->mgr->aux, > DP_GUID, > mstb->guid, > @@ -2427,14 +2420,14 @@ static void drm_dp_send_link_address(struct drm_dp_mst_topology_mgr *mgr, > { > struct drm_dp_sideband_msg_tx *txmsg; > struct drm_dp_link_address_ack_reply *reply; > - int i, len, ret; > + int i, ret; > > txmsg = kzalloc(sizeof(*txmsg), GFP_KERNEL); > if (!txmsg) > return; > > txmsg->dst = mstb; > - len = build_link_address(txmsg); > + build_link_address(txmsg); Maybe you should make the function void while at it? > > mstb->link_address_sent = true; > drm_dp_queue_down_tx(mgr, txmsg); > @@ -2476,7 +2469,6 @@ drm_dp_send_enum_path_resources(struct drm_dp_mst_topology_mgr *mgr, > { > struct drm_dp_enum_path_resources_ack_reply *path_res; > struct drm_dp_sideband_msg_tx *txmsg; > - int len; > int ret; > > txmsg = kzalloc(sizeof(*txmsg), GFP_KERNEL); > @@ -2484,7 +2476,7 @@ drm_dp_send_enum_path_resources(struct drm_dp_mst_topology_mgr *mgr, > return -ENOMEM; > > txmsg->dst = mstb; > - len = build_enum_path_resources(txmsg, port->port_num); > + build_enum_path_resources(txmsg, port->port_num); Maybe you should make the function void while at it? > drm_dp_queue_down_tx(mgr, txmsg); > > @@ -2567,7 +2559,7 @@ static int drm_dp_payload_send_msg(struct drm_dp_mst_topology_mgr *mgr, > { > struct drm_dp_sideband_msg_tx *txmsg; > struct drm_dp_mst_branch *mstb; > - int len, ret, port_num; > + int ret, port_num; > u8 sinks[DRM_DP_MAX_SDP_STREAMS]; > int i; > > @@ -2592,9 +2584,9 @@ static int drm_dp_payload_send_msg(struct drm_dp_mst_topology_mgr *mgr, > sinks[i] = i; > > txmsg->dst = mstb; > - len = build_allocate_payload(txmsg, port_num, > - id, > - pbn, port->num_sdp_streams, sinks); > + build_allocate_payload(txmsg, port_num, > + id, > + pbn, port->num_sdp_streams, sinks); Maybe you should make the function void while at it? > > drm_dp_queue_down_tx(mgr, txmsg); > > @@ -2623,7 +2615,7 @@ int drm_dp_send_power_updown_phy(struct drm_dp_mst_topology_mgr *mgr, > struct drm_dp_mst_port *port, bool power_up) > { > struct drm_dp_sideband_msg_tx *txmsg; > - int len, ret; > + int ret; > > port = drm_dp_mst_topology_get_port_validated(mgr, port); > if (!port) > @@ -2636,7 +2628,7 @@ int drm_dp_send_power_updown_phy(struct drm_dp_mst_topology_mgr *mgr, > } > > txmsg->dst = port->parent; > - len = build_power_updown_phy(txmsg, port->port_num, power_up); > + build_power_updown_phy(txmsg, port->port_num, power_up); Maybe you should make the function void while at it? > drm_dp_queue_down_tx(mgr, txmsg); > > ret = drm_dp_mst_wait_tx_reply(port->parent, txmsg); > @@ -2856,7 +2848,6 @@ static int drm_dp_send_dpcd_read(struct drm_dp_mst_topology_mgr *mgr, > struct drm_dp_mst_port *port, > int offset, int size, u8 *bytes) > { > - int len; > int ret = 0; > struct drm_dp_sideband_msg_tx *txmsg; > struct drm_dp_mst_branch *mstb; > @@ -2871,7 +2862,7 @@ static int drm_dp_send_dpcd_read(struct drm_dp_mst_topology_mgr *mgr, > goto fail_put; > } > > - len = build_dpcd_read(txmsg, port->port_num, offset, size); > + build_dpcd_read(txmsg, port->port_num, offset, size); Maybe you should make the function void while at it? > txmsg->dst = port->parent; > > drm_dp_queue_down_tx(mgr, txmsg); > @@ -2909,7 +2900,6 @@ static int drm_dp_send_dpcd_write(struct drm_dp_mst_topology_mgr *mgr, > struct drm_dp_mst_port *port, > int offset, int size, u8 *bytes) > { > - int len; > int ret; > struct drm_dp_sideband_msg_tx *txmsg; > struct drm_dp_mst_branch *mstb; > @@ -2924,7 +2914,7 @@ static int drm_dp_send_dpcd_write(struct drm_dp_mst_topology_mgr *mgr, > goto fail_put; > } > > - len = build_dpcd_write(txmsg, port->port_num, offset, size, bytes); > + build_dpcd_write(txmsg, port->port_num, offset, size, bytes); Maybe you should make the function void while at it? > txmsg->dst = mstb; > > drm_dp_queue_down_tx(mgr, txmsg); > @@ -3147,7 +3137,7 @@ static bool drm_dp_get_one_sb_msg(struct drm_dp_mst_topology_mgr *mgr, bool up) > { > int len; > u8 replyblock[32]; > - int replylen, origlen, curreply; > + int replylen, curreply; > int ret; > struct drm_dp_sideband_msg_rx *msg; > int basereg = up ? DP_SIDEBAND_MSG_UP_REQ_BASE : DP_SIDEBAND_MSG_DOWN_REP_BASE; > @@ -3167,7 +3157,6 @@ static bool drm_dp_get_one_sb_msg(struct drm_dp_mst_topology_mgr *mgr, bool up) > } > replylen = msg->curchunk_len + msg->curchunk_hdrlen; > > - origlen = replylen; > replylen -= len; > curreply = len; > while (replylen > 0) { > @@ -3959,17 +3948,16 @@ void drm_dp_mst_dump_topology(struct seq_file *m, > mutex_lock(&mgr->lock); > if (mgr->mst_primary) { > u8 buf[DP_PAYLOAD_TABLE_SIZE]; > - int ret; > > - ret = drm_dp_dpcd_read(mgr->aux, DP_DPCD_REV, buf, DP_RECEIVER_CAP_SIZE); > + drm_dp_dpcd_read(mgr->aux, DP_DPCD_REV, buf, DP_RECEIVER_CAP_SIZE); > seq_printf(m, "dpcd: %*ph\n", DP_RECEIVER_CAP_SIZE, buf); > - ret = drm_dp_dpcd_read(mgr->aux, DP_FAUX_CAP, buf, 2); > + drm_dp_dpcd_read(mgr->aux, DP_FAUX_CAP, buf, 2); > seq_printf(m, "faux/mst: %*ph\n", 2, buf); > - ret = drm_dp_dpcd_read(mgr->aux, DP_MSTM_CTRL, buf, 1); > + drm_dp_dpcd_read(mgr->aux, DP_MSTM_CTRL, buf, 1); > seq_printf(m, "mst ctrl: %*ph\n", 1, buf); > > /* dump the standard OUI branch header */ > - ret = drm_dp_dpcd_read(mgr->aux, DP_BRANCH_OUI, buf, DP_BRANCH_OUI_HEADER_SIZE); > + drm_dp_dpcd_read(mgr->aux, DP_BRANCH_OUI, buf, DP_BRANCH_OUI_HEADER_SIZE); > seq_printf(m, "branch oui: %*phN devid: ", 3, buf); > for (i = 0x3; i < 0x8 && buf[i]; i++) > seq_printf(m, "%c", buf[i]); -- Jani Nikula, Intel Open Source Graphics Center