From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752639AbdHJNFa (ORCPT ); Thu, 10 Aug 2017 09:05:30 -0400 Received: from mout.web.de ([217.72.192.78]:62181 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752037AbdHJNF2 (ORCPT ); Thu, 10 Aug 2017 09:05:28 -0400 Subject: [PATCH 5/5] ASoC: dapm: Adjust seven checks for null pointers From: SF Markus Elfring To: alsa-devel@alsa-project.org, Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: LKML , kernel-janitors@vger.kernel.org References: Message-ID: <32343b0d-447a-6b1a-ff11-506d14a82d15@users.sourceforge.net> Date: Thu, 10 Aug 2017 15:05:07 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:XHFeVyYnSpcsfR4Ew2FVv3oRQtxEXXiF3/hZqJF0QkmEcN90sId zFxk75S1XC1UPv6lHw0wFxpMODrXBcjb0WdwsWe1pWT1dmO6vFHgRhVd1Cse0kklD1fx5aT XBg5WP0jqe5wUgLq2yhwra1MpHFrFe1CaxfBn5/BdrnOeTkPEQceJxtBOqUPuLYK6+rKANr I0ZN6vuOo2L34S9ZLB8XQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:lUBA0k9wP+M=:KgpdgbS1o2oSgiqGhnQrlt z4doPd6reiuBYqtUIXhQI4GkxkGNdL3KzmDfVM3Y4XekqXZXx6j6f7Bd/pDrL/vkksElURExQ vLd7408jf7PDjyC27XtY42wVLUCiNEuTWz0WcYtUg/oPtE2xCfULsIyq5BOCr2hyeXjVaw0y/ vCtxkVJyJD4fD1iOrNUJEqu0iUFLxPtOvYmOR4BXqdzRTBQAdeLB2RhLpvOZWlJLl+Y5SnP+q wiewLUPOkpyjnB+owgGIb7kdewHnuIfHK+taeZLKe1RdVqkhLgIbas1/cMGRrNM9GYzh3Aaiz DL2d4vL+ycl45KW2otHEWgSWa4sUlLdvAYT/9GDs68AVXfhTakKDsO+E4eOYHMuzs2hqcx8Er 9yLNlvhEqAU5Z1cCr+JxMDybdrmkYMB7ZjD6EfKTUJmy103u4zbPkAEkq4KmgE7Hk80/AhqK9 m9VYt8tZoeji8c6avJ218B5LvZujCzMOohV6TUdmkk/Yzbpb8ghXDYx0OIPGDBvYdz/Yds+zF I7F0Jftr2a1WhJ0mqBXk0BvaN1l+ourzIoitKPo959xLtx2M5yi40k7XZS3kxom84oZSFjzv8 Eq3QTrNxT09Lk9Xxb2QdCDO9NBu+a8wu7oOrhASGX65EOjlEze555BsXEaI4aJ0uOZ2+eRCEC CBexYNv4WwFAuoj7+nQk5L0TRicyiOV8sKI65Bx6V1Ob2xfStWc9ssaZKBYdTDIoL7N5F6GIR DyldnLxl1Zfdyy9ksoi/aDkZVAKpii6zHuP9Mw0TkPf3vmvYMrjoJY04mHFRy7mXCYNKuNj1q gYCVjYvJwoJ5Z2QqZ8AvULei74LgfLUMbtRg5OYHDsaYUmNbRk= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Thu, 10 Aug 2017 14:41:30 +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 affected source code places. Signed-off-by: Markus Elfring --- sound/soc/soc-dapm.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 4eea84d821c4..5a85b8773289 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -146,7 +146,7 @@ static void pop_dbg(struct device *dev, u32 pop_time, const char *fmt, ...) return; buf = kmalloc(PAGE_SIZE, GFP_KERNEL); - if (buf == NULL) + if (!buf) return; va_start(args, fmt); @@ -883,7 +883,7 @@ static int dapm_create_or_share_kcontrol(struct snd_soc_dapm_widget *w, long_name = kasprintf(GFP_KERNEL, "%s %s", w->name + prefix_len, w->kcontrol_news[kci].name); - if (long_name == NULL) + if (!long_name) return -ENOMEM; name = long_name; @@ -1086,7 +1086,7 @@ static int dapm_widget_list_create(struct snd_soc_dapm_widget_list **list, size++; *list = kzalloc(sizeof(**list) + size * sizeof(*w), GFP_KERNEL); - if (*list == NULL) + if (!*list) return -ENOMEM; list_for_each_entry(w, widgets, work_list) @@ -2668,7 +2668,7 @@ static int snd_soc_dapm_add_path(struct snd_soc_dapm_context *dapm, path->is_supply = 1; /* connect static paths */ - if (control == NULL) { + if (!control) { path->connect = 1; } else { switch (wsource->id) { @@ -2777,12 +2777,12 @@ static int snd_soc_dapm_add_route(struct snd_soc_dapm_context *dapm, if (!wsource) wsource = wtsource; - if (wsource == NULL) { + if (!wsource) { dev_err(dapm->dev, "ASoC: no source widget found for %s\n", route->source); return -ENODEV; } - if (wsink == NULL) { + if (!wsink) { dev_err(dapm->dev, "ASoC: no sink widget found for %s\n", route->sink); return -ENODEV; @@ -3489,7 +3489,7 @@ snd_soc_dapm_new_control_unlocked(struct snd_soc_dapm_context *dapm, w->name = kasprintf(GFP_KERNEL, "%s %s", prefix, widget->name); else w->name = kstrdup_const(widget->name, GFP_KERNEL); - if (w->name == NULL) { + if (!w->name) { kfree(w); return NULL; } -- 2.14.0