From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S970201AbdEYUIg (ORCPT ); Thu, 25 May 2017 16:08:36 -0400 Received: from mout.web.de ([212.227.15.4]:50746 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964781AbdEYUIb (ORCPT ); Thu, 25 May 2017 16:08:31 -0400 Subject: [PATCH 2/2] regmap: Adjust five checks for null pointers in __regmap_init() From: SF Markus Elfring To: Greg Kroah-Hartman , Mark Brown , kernel-janitors@vger.kernel.org Cc: LKML References: <7d7b8131-5aea-cb33-994f-f410dc7cd615@users.sourceforge.net> Message-ID: <4bca89e5-9d86-4ec9-1105-cc921c50f910@users.sourceforge.net> Date: Thu, 25 May 2017 22:08:25 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.1.1 MIME-Version: 1.0 In-Reply-To: <7d7b8131-5aea-cb33-994f-f410dc7cd615@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:YYq94EybdMUmJ+FgnfONgb8eK0BRyac9uonnYnCyDN5oM6MrPYL c564+SRTUZzK0lwLH7lw5AesxXtnyiIgW+5mnfod74V/CTWgf6jS3c/L4B3a0d/vtTVD625 eGUsqw2PP4LklJ2mwcJTZzs+K4o3eeQw2BBIg6RCEhI9XM4zaKH1K8RlE58qirk6pI5SzIK dQZAWJgU/FmRG+xtpm1Uw== X-UI-Out-Filterresults: notjunk:1;V01:K0:JEJFUCL81d8=:u7BLJKi8F5jGnWUGEM3WOC x3JNj+Z1bRdTpD5Qxoj+kwbnZucO1qjV2Jpr6+RHQEL8zJc8awULQdvXSR2NoAKvx34cd3kq8 BrFhyZ4rJec+bOa3YlB8iH6T1ZBkKCvg7Gff4jL0veUU+iguLsz5Ew8G1Ljc2XxuQri5H7Azy i3Q/3oKWV7lH677QLYNWc72M273peAwp2YMUU4SKvkBqYhYM0WTSE0qQpJWyGvemnZuWKxWn2 Rvmg04TYkdJBfbHhZaKYqO6vArDndElXI2AvqafduNK9dmTKKlf/9As3N3g6zeFbnCnhRAY+x 19uhGQtDaq+V6kgOHkYcwjt3jdk4qe+U75sHDZiIFmn88qqPRsF5geDIWwaAA3yER1thVFue0 piEfV3XBBcV0nOjhLhk8x+k9M0so3seKaojinYrN3Ib/0EARtDPWXvCm6RTsgucoo7qYuBQHm LUr2xdfBzHRWyi9ELw57sS5h/eyZPGdVyg712sUzSyurQQoT3sFqZEcUQpdOYJweyWP6+8mi4 7OkZjUO0sOAnPQcsZPVQGApib8ooI9glmJqf2d2EfCEF8jHz5TmKXzs0U6noud2bHv7qBFA9S 5tgkdS+1ojyeM1yyHxvIGzHQw8B1obi/ruyoQ6+TVoRPtxKkzlxXZYSS1BajjnVm49EkQxrBG kWKJK3f8e08T4Rcb9U2r1hkBmttP6A2s8SYz6eRs4LwCN2p9x/D8nADRTzPedyQBdVDcA4EE7 Uh0T9UtyHzDmfcE4hnONRY1tJgIhHxVXtXED8tPUfA+pQ61SCChL4k60YUseoz1jKqO3s+JOK oH+Opz1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Thu, 25 May 2017 21:52:42 +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/base/regmap/regmap.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c index 096499e1f223..2b1f073b72a6 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c @@ -618,7 +618,7 @@ struct regmap *__regmap_init(struct device *dev, goto err; map = kzalloc(sizeof(*map), GFP_KERNEL); - if (map == NULL) { + if (!map) { ret = -ENOMEM; goto err; } @@ -918,7 +918,7 @@ struct regmap *__regmap_init(struct device *dev, goto err_map; map->work_buf = kzalloc(map->format.buf_size, GFP_KERNEL); - if (map->work_buf == NULL) { + if (!map->work_buf) { ret = -ENOMEM; goto err_map; } @@ -993,7 +993,7 @@ struct regmap *__regmap_init(struct device *dev, } new = kzalloc(sizeof(*new), GFP_KERNEL); - if (new == NULL) { + if (!new) { ret = -ENOMEM; goto err_range; } @@ -1014,10 +1014,10 @@ struct regmap *__regmap_init(struct device *dev, goto err_range; } - if (map->selector_work_buf == NULL) { + if (!map->selector_work_buf) { map->selector_work_buf = kzalloc(map->format.buf_size, GFP_KERNEL); - if (map->selector_work_buf == NULL) { + if (!map->selector_work_buf) { ret = -ENOMEM; goto err_range; } -- 2.13.0