From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755675AbdKBIBr (ORCPT ); Thu, 2 Nov 2017 04:01:47 -0400 Received: from mout.web.de ([212.227.15.3]:52232 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755655AbdKBIBo (ORCPT ); Thu, 2 Nov 2017 04:01:44 -0400 Subject: [PATCH 3/3] regulator/core: Adjust 18 checks for null pointers From: SF Markus Elfring To: kernel-janitors@vger.kernel.org, Liam Girdwood , Mark Brown Cc: LKML References: <471498fb-58af-46d4-2150-614c0f9cdc22@users.sourceforge.net> Message-ID: <27bc701c-f8cb-150b-6b3d-df90eb3702d2@users.sourceforge.net> Date: Thu, 2 Nov 2017 09:01:39 +0100 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: <471498fb-58af-46d4-2150-614c0f9cdc22@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:TPS/S6Ix/ZQ6i+/69mhbcihkl5km32LVog3uWEVPhwT9LsTTL9N WExby3FB6M0RpbiSawonDUpMg1DG+rBXNcg56AjXYxfkpeaiw0HVC0DOTSBRoAnczY+JBcZ PBKXpAfVHQcoz+s5I7UzyLGc7xRBJfocA8eECzn0aTK2f4NABo1lGY0s2aN++myAN5wTZAh JyXqF52FGT0v88Zjw2nQw== X-UI-Out-Filterresults: notjunk:1;V01:K0:qr0fJzMsiJk=:R1cTPoR9sbOMmYM5Ox8n2G 0PaeWMqeGbX+miBMwsGg5fz77NZeECGOpANES/31jDZrCVHYLHbtHh+YDaPkcgbg2Z4pDDJjo rd7yGruK9f3yCwO2QArf9MDtElDD9a3dzh3riZ5Whmu1jNEi9VEqHyDC50BVVwCtMmataBkio vGNH5M95Lbj4e/7+gVSrjnedkNzTVh3B4FfoLz3/2MXp1R7N0AnqpJQEwld12VK4kBYESyJXI AtJpv4SKmU199PdLjJhAbhhWocE7wFhLiMbkohvQBZYjxdvYDyey5I9IHChhxYj+l4s2Vixol kF0OrsGQixQQuaJby2gcTIdbHT1DUMVdxXpAacPsfbMFr0NBrSdhGD7SrhJQ9OKMvdpwLGaZM 4ItyS1KgiFVc//0XCmxh4D0JeeGGyOvexiikNDMSvpCnHyan7bwcAoO6qGXADhU3dfiQwwBmM DSnZ0pp0rhJNwXXtiC+f/tywcuqVGgqsFuFnxPguyONGmaOga/JVeGB8gtA5vZBC/isTW+rga fJWy3UXNpEHRCvIsNZqmJW5xeo8MiquLXbY61mGFCc57PD2g9IDlJB+CMLISJvtMJi6uWAYy9 JcF4ifaLWMFrIANR1MmVFixxE4pud+q++ZY97ImVD8bM582EBvRW+X4YU5E7+QkMqapBY7x7P rqICJTTAbIAKiQvmxX3KKHmni+VeeRQFROJGgCrXvWPEAxXuKGLOlCNB9K1ymRdjBv52s8j3C g7v45MkvJc2tjd4tdQc5h025PuiOfcvIE0GULHZbqC0krWzyrICjCCferEOzobCExdWz5wqfx oIC80RdFVXP4rvxK9NjDylzaVoLlKEuji9BGi8uLvcmka3Gp5c= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Wed, 1 Nov 2017 22:40:55 +0100 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/regulator/core.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 28859c186c9f..4aaf7e40524d 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -1168,7 +1168,7 @@ static int set_supply(struct regulator_dev *rdev, return -ENODEV; rdev->supply = create_regulator(supply_rdev, &rdev->dev, "SUPPLY"); - if (rdev->supply == NULL) { + if (!rdev->supply) { err = -ENOMEM; return err; } @@ -1195,10 +1195,10 @@ static int set_consumer_device_supply(struct regulator_dev *rdev, struct regulator_map *node; int has_dev; - if (supply == NULL) + if (!supply) return -EINVAL; - if (consumer_dev_name != NULL) + if (consumer_dev_name) has_dev = 1; else has_dev = 0; @@ -1224,7 +1224,7 @@ static int set_consumer_device_supply(struct regulator_dev *rdev, } node = kzalloc(sizeof(*node), GFP_KERNEL); - if (node == NULL) + if (!node) return -ENOMEM; node->regulator = rdev; @@ -1232,7 +1232,7 @@ static int set_consumer_device_supply(struct regulator_dev *rdev, if (has_dev) { node->dev_name = kstrdup(consumer_dev_name, GFP_KERNEL); - if (node->dev_name == NULL) { + if (!node->dev_name) { kfree(node); return -ENOMEM; } @@ -1315,7 +1315,7 @@ static struct regulator *create_regulator(struct regulator_dev *rdev, int err, size; regulator = kzalloc(sizeof(*regulator), GFP_KERNEL); - if (regulator == NULL) + if (!regulator) return NULL; mutex_lock(&rdev->mutex); @@ -1332,7 +1332,7 @@ static struct regulator *create_regulator(struct regulator_dev *rdev, goto overflow_err; regulator->supply_name = kstrdup(buf, GFP_KERNEL); - if (regulator->supply_name == NULL) + if (!regulator->supply_name) goto overflow_err; err = sysfs_create_link_nowarn(&rdev->dev.kobj, &dev->kobj, @@ -1344,7 +1344,7 @@ static struct regulator *create_regulator(struct regulator_dev *rdev, } } else { regulator->supply_name = kstrdup_const(supply_name, GFP_KERNEL); - if (regulator->supply_name == NULL) + if (!regulator->supply_name) goto overflow_err; } @@ -1599,7 +1599,7 @@ struct regulator *_regulator_get(struct device *dev, const char *id, return ERR_PTR(-EINVAL); } - if (id == NULL) { + if (!id) { pr_err("get() with no identifier\n"); return ERR_PTR(-EINVAL); } @@ -1671,7 +1671,7 @@ struct regulator *_regulator_get(struct device *dev, const char *id, } regulator = create_regulator(rdev, dev, id); - if (regulator == NULL) { + if (!regulator) { regulator = ERR_PTR(-ENOMEM); put_device(&rdev->dev); module_put(rdev->owner); @@ -1965,7 +1965,7 @@ static int regulator_ena_gpio_request(struct regulator_dev *rdev, return ret; pin = kzalloc(sizeof(*pin), GFP_KERNEL); - if (pin == NULL) { + if (!pin) { gpio_free(config->ena_gpio); return -ENOMEM; } @@ -3982,13 +3982,13 @@ regulator_register(const struct regulator_desc *regulator_desc, struct device *dev; int ret, i; - if (regulator_desc == NULL || cfg == NULL) + if (!regulator_desc || !cfg) return ERR_PTR(-EINVAL); dev = cfg->dev; WARN_ON(!dev); - if (regulator_desc->name == NULL || regulator_desc->ops == NULL) + if (!regulator_desc->name || !regulator_desc->ops) return ERR_PTR(-EINVAL); if (regulator_desc->type != REGULATOR_VOLTAGE && @@ -4012,7 +4012,7 @@ regulator_register(const struct regulator_desc *regulator_desc, } rdev = kzalloc(sizeof(*rdev), GFP_KERNEL); - if (rdev == NULL) + if (!rdev) return ERR_PTR(-ENOMEM); /* @@ -4020,7 +4020,7 @@ regulator_register(const struct regulator_desc *regulator_desc, * parsing init data. */ config = kmemdup(cfg, sizeof(*cfg), GFP_KERNEL); - if (config == NULL) { + if (!config) { kfree(rdev); return ERR_PTR(-ENOMEM); } @@ -4154,7 +4154,7 @@ EXPORT_SYMBOL_GPL(regulator_register); */ void regulator_unregister(struct regulator_dev *rdev) { - if (rdev == NULL) + if (!rdev) return; if (rdev->supply) { -- 2.14.3