From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935058AbdEAQuX (ORCPT ); Mon, 1 May 2017 12:50:23 -0400 Received: from mout.web.de ([212.227.15.4]:58511 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934555AbdEAQtv (ORCPT ); Mon, 1 May 2017 12:49:51 -0400 Subject: [PATCH 4/4] drm/dp: Adjust four checks for null pointers From: SF Markus Elfring To: dri-devel@lists.freedesktop.org, Daniel Vetter , David Airlie , Jani Nikula , Sean Paul Cc: LKML , kernel-janitors@vger.kernel.org References: <1949e36b-5039-a7b6-5774-6ada7eb05ea6@users.sourceforge.net> Message-ID: <311ce726-9941-9040-1368-cdd556f41e73@users.sourceforge.net> Date: Mon, 1 May 2017 18:49:36 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.0.1 MIME-Version: 1.0 In-Reply-To: <1949e36b-5039-a7b6-5774-6ada7eb05ea6@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:1rQcMh8ShMh2dQ97qIDPuzLrqVkk3XLdgAv2OtzQ13aYNcsuiKl nbAybGDylnVh48S00irAd2esH8/8huKes2Fnp17zMy4ExnNqJvRWtRqtYwZumIcTFQ3CaSn /bMeNqs75XNgw04xZcaSMrzlsVwvGcxdA9OXcsGLdCK9tVjB3fehDhUAN0ysJXI2rsOQ3Tg NlnGkhS6uQSZ8RwXwHhuQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:vj5WxjSAeXo=:7mB2DXukQ8pbzYweivjRXb 55cWbnMEcv5+FHjn/pSLz0pkP3AgYnbLiUcsiSAwYUz/uL8Yh8G4lALYFz4QbFq2yaloHnhdp kuKK7IwxBIwrlfgBjoYnWv8/kWeYBuoJ1hxT6oIYIBjAqCRupJoPfd2GE8JfF+5J+b5NvAd16 4HDHQs0jgXFWbNPa2cz3HxeOnUMu8VUX7Nmgg1yqQtYtGrvIZUXDgo8JgDKy5IQ/3StTKt2l8 nsGwY1/exgpfj8AHHXdUu6+0NLsOx0V2rpEsZVy1MsGTh72D+wwJbv/9jzoVB7t0pWbuKM7G0 Oh2OJUs7Gd5yxIihtmxUsK/PoVGucN5VzK6+wTHvWPR4aUbgstblCAXnY3eIsjS/5cdeGIjFo kS6h8JC5CwPFvheCpqQAYV0lSumR71SSq3FhMRG194G0aTycJ2t8T4oMm7XhvNfd2hHC8ChED mTtWUjHJIPLwkBF6OYvrEswUVAazg6XKig6YTGJvfjTA9GsrusieZa7c2BRhjswH6fsIvOGB+ r1sdLVscXUGYa02wo4kuCpkZ4c+JZQxMfF8RSx5HIymagxj8ynxdznux0wF+ZZB7ZtKQjX72w U4tNA+wA3vvg96eF0fbuh00RBCTT42+qyxjFcs6cpL0S3XerL7KbfNrE3qMR1/SeuVwUtbdmD f9PUYwXvRIbT+CrU2Sc6BoKF+PjTFLEQzVJMDSnxTDeoclf8HTTMZIMSIrbvDQa0DjUthprbl eCnNXelKXK+yNqjQ1L19YGSZj6VWMO5BSUwfNYE3TFlmHizUUpqBRdKV9LSmbdelSdgcBVWmI EhPB2hN Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Mon, 1 May 2017 18:22:52 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The script “checkpatch.pl” pointed information out like the following. Comparison to NULL could be written … Thus fix the affected source code places. Signed-off-by: Markus Elfring --- drivers/gpu/drm/drm_dp_mst_topology.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index bcc76f15f1ce..f46bf5101d14 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -1405,13 +1405,12 @@ static int set_hdr_from_dst_qlock(struct drm_dp_sideband_msg_hdr *hdr, DRM_DEBUG_KMS("%s: failed to find slot\n", __func__); return -EAGAIN; } - if (mstb->tx_slots[0] == NULL && mstb->tx_slots[1] == NULL) { + if (!mstb->tx_slots[0] && !mstb->tx_slots[1]) { txmsg->seqno = mstb->last_seqno; mstb->last_seqno ^= 1; - } else if (mstb->tx_slots[0] == NULL) - txmsg->seqno = 0; - else - txmsg->seqno = 1; + } else { + txmsg->seqno = mstb->tx_slots[0] ? 1 : 0; + } mstb->tx_slots[txmsg->seqno] = txmsg; } @@ -2044,7 +2043,7 @@ int drm_dp_mst_topology_mgr_set_mst(struct drm_dp_mst_topology_mgr *mgr, bool ms /* add initial branch device at LCT 1 */ mstb = drm_dp_add_mst_branch_device(1, NULL); - if (mstb == NULL) { + if (!mstb) { ret = -ENOMEM; goto out_unlock; } -- 2.12.2