From patchwork Tue Oct 24 16:02:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 10025055 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 61ECD60375 for ; Tue, 24 Oct 2017 16:02:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 53DC928A3A for ; Tue, 24 Oct 2017 16:02:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 487F728A3E; Tue, 24 Oct 2017 16:02:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D1DB728A3B for ; Tue, 24 Oct 2017 16:02:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 295B689F4F; Tue, 24 Oct 2017 16:02:36 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mout.web.de (mout.web.de [212.227.17.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id C925389F4F for ; Tue, 24 Oct 2017 16:02:34 +0000 (UTC) Received: from [192.168.1.2] ([92.227.117.134]) by smtp.web.de (mrweb103 [213.165.67.124]) with ESMTPSA (Nemesis) id 0Mg7Dt-1dsOgM3C0z-00NT2S; Tue, 24 Oct 2017 18:02:31 +0200 Subject: [PATCH 2/2] drm/rcar-du: Adjust 14 checks for null pointers From: SF Markus Elfring To: dri-devel@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org, David Airlie , Laurent Pinchart References: <7d5e68c7-2d64-0131-1a08-eeb4e03cc113@users.sourceforge.net> Message-ID: <2dd8c930-77e8-a2ee-6356-fc9c1d21384d@users.sourceforge.net> Date: Tue, 24 Oct 2017 18:02:30 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <7d5e68c7-2d64-0131-1a08-eeb4e03cc113@users.sourceforge.net> Content-Language: en-GB X-Provags-ID: V03:K0:5NGZGp+nb9PN4xVUkRhWkTl2r6GyEp4ytwpRG/GeVyYDtGSgkey s0Az0HP0+Htasp82cyiIAdaxacBC1whw3f4uQcTbJD0LBHD5Vgn8a6UtXLyi8a25hURZmEo 0tllwaUblGdmCh4A7KvxSBIhLNfl4Hv/PLL+CCvWH5fDwx1bIJ0u4NHWIIOICklxNdcQMMi yYspJ7HNS/yTXOdyNHQqg== X-UI-Out-Filterresults: notjunk:1; V01:K0:zsXXbHOipW4=:ikxrty78iNZKvyXKtr66rp tlmWD0jdz0vAWdAAq1KLDZv08OXVqc4XX/nLTYW7LMFV2ACBz43wE8ylaTnLsMvEw+MPHSBbg 5h2qdEdf82rGi7ewHUtepUWCnv99o+dGzBbaWL3PN2Cr1T0L/r/xXeZ0L4R7I7CPVVyCohUI9 MfCDUEo45LalStfIUvjWsA4xm6tduEzkMcl0ec07u7fG26awmYi+HKEeq9g0WcW3/2t3jov8E BIvHdAZh8l7gqtBloErNUq++Au6mZCH8sgWgHqaE90AaWNFcYi+381C1u0GtwpLpErPPr3Iak voRKgfxOpqwadKujLNizaC1kGhNxxV608m6dWl/2IKePdhRzcnPobswIghPp5XIxOFoxHnk3v KLrJHF4xQGDQIJWn+Tqb7dJz3oFOwkYcbmrkcUHMVyJcHhmugdYWc9nJ+3CWwLYc5T7TfVU4Z t4OIw2g63cdYLO/9Ni3ecEvmHSO/FjvliamPhRxGQOHSOm7L0yHVP0s0xaXPX26pl5P3IzODv KVjePh7ERjdM/dmxxbudGpEscXP7CTC1RTycLePi8VOxdbVO5Gr1lclUWX1PB6uMNLqFZ622t Zc7qtRq9wcf3y2d2BVURntSCquxpYVxAaHfhuBRNz95wUean4fEZCN4hazyZnr9BHCweAcv5d +EguOvWN+jb0HfSD8INCUiIxFgajayfYYBQCeDqSR9rMHgn83UYJI0pUKjlbf/ZdK8BX/IAgb jWsJ45lxzMl/GDPZ+lCfdK4ReGfuYz4UpeHmaUk2ATltToDwmqgUbttIgUTWDwFGp+PqDi+zi yfO1fsHuX6WBYX/GnRC14ky+soqIYU8bYCCAXEvE3wSohljR40= Cc: kernel-janitors@vger.kernel.org, LKML X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Markus Elfring Date: Tue, 24 Oct 2017 17:47:37 +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/rcar-du/rcar_du_crtc.c | 2 +- drivers/gpu/drm/rcar-du/rcar_du_drv.c | 2 +- drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 2 +- drivers/gpu/drm/rcar-du/rcar_du_kms.c | 6 +++--- drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c | 2 +- drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c | 2 +- drivers/gpu/drm/rcar-du/rcar_du_plane.c | 6 +++--- drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 6 +++--- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c index 301ea1a8018e..67567af6e348 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c @@ -410,7 +410,7 @@ void rcar_du_crtc_finish_page_flip(struct rcar_du_crtc *rcrtc) rcrtc->event = NULL; spin_unlock_irqrestore(&dev->event_lock, flags); - if (event == NULL) + if (!event) return; spin_lock_irqsave(&dev->event_lock, flags); diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c b/drivers/gpu/drm/rcar-du/rcar_du_drv.c index d2f29e6b1112..cf80476783bf 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c @@ -318,7 +318,7 @@ static int rcar_du_probe(struct platform_device *pdev) /* Allocate and initialize the R-Car device structure. */ rcdu = devm_kzalloc(&pdev->dev, sizeof(*rcdu), GFP_KERNEL); - if (rcdu == NULL) + if (!rcdu) return -ENOMEM; rcdu->dev = &pdev->dev; diff --git a/drivers/gpu/drm/rcar-du/rcar_du_encoder.c b/drivers/gpu/drm/rcar-du/rcar_du_encoder.c index ba8d2804c1d1..8a9f7fa69ecc 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_encoder.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_encoder.c @@ -166,7 +166,7 @@ int rcar_du_encoder_init(struct rcar_du_device *rcdu, int ret; renc = devm_kzalloc(rcdu->dev, sizeof(*renc), GFP_KERNEL); - if (renc == NULL) + if (!renc) return -ENOMEM; renc->output = output; diff --git a/drivers/gpu/drm/rcar-du/rcar_du_kms.c b/drivers/gpu/drm/rcar-du/rcar_du_kms.c index d2c80cc9f8ee..f87c11a3df6c 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_kms.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_kms.c @@ -181,7 +181,7 @@ rcar_du_fb_create(struct drm_device *dev, struct drm_file *file_priv, unsigned int i; format = rcar_du_format_info(mode_cmd->pixel_format); - if (format == NULL) { + if (!format) { dev_dbg(dev->dev, "unsupported pixel format %08x\n", mode_cmd->pixel_format); return ERR_PTR(-EINVAL); @@ -419,7 +419,7 @@ static int rcar_du_properties_init(struct rcar_du_device *rcdu) { rcdu->props.alpha = drm_property_create_range(rcdu->ddev, 0, "alpha", 0, 255); - if (rcdu->props.alpha == NULL) + if (!rcdu->props.alpha) return -ENOMEM; /* @@ -430,7 +430,7 @@ static int rcar_du_properties_init(struct rcar_du_device *rcdu) rcdu->props.colorkey = drm_property_create_range(rcdu->ddev, 0, "colorkey", 0, 0x01ffffff); - if (rcdu->props.colorkey == NULL) + if (!rcdu->props.colorkey) return -ENOMEM; return 0; diff --git a/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c b/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c index b373ad48ef5f..189e71b3d5d4 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c @@ -63,7 +63,7 @@ int rcar_du_lvds_connector_init(struct rcar_du_device *rcdu, int ret; rcon = devm_kzalloc(rcdu->dev, sizeof(*rcon), GFP_KERNEL); - if (rcon == NULL) + if (!rcon) return -ENOMEM; connector = &rcon->connector; diff --git a/drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c b/drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c index 12d22f3db1af..ab2576e5d700 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c @@ -253,7 +253,7 @@ int rcar_du_lvdsenc_init(struct rcar_du_device *rcdu) for (i = 0; i < rcdu->info->num_lvds; ++i) { lvds = devm_kzalloc(&pdev->dev, sizeof(*lvds), GFP_KERNEL); - if (lvds == NULL) + if (!lvds) return -ENOMEM; lvds->dev = rcdu; diff --git a/drivers/gpu/drm/rcar-du/rcar_du_plane.c b/drivers/gpu/drm/rcar-du/rcar_du_plane.c index 61833cc1c699..f48a990214ed 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_plane.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_plane.c @@ -584,7 +584,7 @@ static int rcar_du_plane_atomic_check(struct drm_plane *plane, } rstate->format = rcar_du_format_info(state->fb->format->format); - if (rstate->format == NULL) { + if (!rstate->format) { dev_dbg(rcdu->dev, "%s: unsupported format %08x\n", __func__, state->fb->format->format); return -EINVAL; @@ -637,7 +637,7 @@ rcar_du_plane_atomic_duplicate_state(struct drm_plane *plane) state = to_rcar_plane_state(plane->state); copy = kmemdup(state, sizeof(*state), GFP_KERNEL); - if (copy == NULL) + if (!copy) return NULL; __drm_atomic_helper_plane_duplicate_state(plane, ©->state); @@ -662,7 +662,7 @@ static void rcar_du_plane_reset(struct drm_plane *plane) } state = kzalloc(sizeof(*state), GFP_KERNEL); - if (state == NULL) + if (!state) return; state->hwindex = -1; diff --git a/drivers/gpu/drm/rcar-du/rcar_du_vsp.c b/drivers/gpu/drm/rcar-du/rcar_du_vsp.c index 2c96147bc444..e8e261362d9a 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_vsp.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_vsp.c @@ -283,7 +283,7 @@ static int rcar_du_vsp_plane_atomic_check(struct drm_plane *plane, } rstate->format = rcar_du_format_info(state->fb->format->format); - if (rstate->format == NULL) { + if (!rstate->format) { dev_dbg(rcdu->dev, "%s: unsupported format %08x\n", __func__, state->fb->format->format); return -EINVAL; @@ -323,7 +323,7 @@ rcar_du_vsp_plane_atomic_duplicate_state(struct drm_plane *plane) state = to_rcar_vsp_plane_state(plane->state); copy = kmemdup(state, sizeof(*state), GFP_KERNEL); - if (copy == NULL) + if (!copy) return NULL; __drm_atomic_helper_plane_duplicate_state(plane, ©->state); @@ -348,7 +348,7 @@ static void rcar_du_vsp_plane_reset(struct drm_plane *plane) } state = kzalloc(sizeof(*state), GFP_KERNEL); - if (state == NULL) + if (!state) return; state->alpha = 255;