From patchwork Mon Jul 13 14:59:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 11660015 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C397913A4 for ; Mon, 13 Jul 2020 15:01:19 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9A3B420578 for ; Mon, 13 Jul 2020 15:01:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Rmi0N6mc"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.b="UT49nUv5" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9A3B420578 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=KhvT93qaIAMdPkRa70isLG2bmkeLcnxkBMZEvOtkPts=; b=Rmi0N6mco8ba3aJBrmSERrlKs jJ1Ei1X3ntPOvGRHW1IXkGz1MoI83LY8ceLbZLexJUxrTpkz0HORwYj/bNzTz5dXKNMzDyZrRtZqx b0GJrJsz6/oZdvdGdap4UN5raMk1XP0BXe3dTStY1AMqcLnIzj1lSElAQ/TSICrx9h8jXRqUh8PX3 cvVG9VsRzzf7wJTJ8mwZ4UTzuKvhENf8IFbj8a/raa8Y7F5URwu5flmaHcq85TqmUhX/QNKPOh06l lC8R1jdqHHpJmR6ghNT2V9aLcXe01e6Q84okBQLEqg09oTC+2m8yMVZ3FrOfq8cOfFX7fu3Xp+DWN ZGPS392zQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1juzvu-00087F-5j; Mon, 13 Jul 2020 14:59:54 +0000 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1juzvp-00085D-CZ for linux-arm-kernel@lists.infradead.org; Mon, 13 Jul 2020 14:59:50 +0000 Received: by mail-wr1-x441.google.com with SMTP id o11so16938073wrv.9 for ; Mon, 13 Jul 2020 07:59:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AR4pD/vZwN2JP47WtR5Vfk5V/YokTCEDqho1kec2JCE=; b=UT49nUv50rfkVE34LzYzCUN0MzEtJUk/hHQU7Yoiq4SYrI6OS+HIXgj7MMtYTMb/UW lS6D1Fbx2CsDabTrAve2C9SMY5SqBjKgGL0mG4UiV95E668adMxp9MERWVlBwE3HCFGd dPhLl5e75N2rR7AfxpjORZq5CPLsWT7MpAbqfHuv/F5Az3caWZcGEnq2L4Jn1qHSbcbL MtXQbsSK8a2AfYO7e64tGBeFzo0u6PylqUUDBCj8jqNVLpltCH2M0Da7LSK33uguM0V9 BH93Iujz9fKJFr8Xiq9/3a1yce/8iPU4rMTgXS1BQFq/sYsFsEWC5BJh65pv385yedp0 OBqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AR4pD/vZwN2JP47WtR5Vfk5V/YokTCEDqho1kec2JCE=; b=Uy5VOUPU1cropTOut6wgQN7tTJ4DTTYjhb4aNuUK2Zhcv1BKu62uGRMLJ9yG4rFHrC vf+xGWd50MMY7xyYhZI59ctPe5/tNhWWlDnb2rkkM3LsbVrRIvwrwwSdxkmgL6WgpgPt BmcyoBkkXUrTncwAjmtyKL/Ssn8X03Om+07e5gMUmnRyPaTDg1gHLBJLQ1Em/a/bFeRB NWIjdf4SMCH0K+OlmOhJ8qZ+nAj4KSFRvV0TxSh+h38c+cMiN1RWGQKku5lDqxbsrqQw /ONZQxL6T6dER0AXf+mi7jbWKKjiw8iLosK8uHekgrdBchfnPX2rqV0PZlJmLGFpkICn kYIg== X-Gm-Message-State: AOAM532wCvvtjdGxe+tnuvz6NNdWbZqfqYpShXd79lIpU2BQYhM9lBYJ TLwrA00RZcyXe7qYJ/zBrLE8mQ== X-Google-Smtp-Source: ABdhPJzxLWXdgm9jFVVW4np6605Vs5gN0IJc/FptyfVS18DJKRb00triNmLMkoUaIVNauvJ8+1nbXA== X-Received: by 2002:adf:8b5a:: with SMTP id v26mr79075013wra.165.1594652388415; Mon, 13 Jul 2020 07:59:48 -0700 (PDT) Received: from debian-brgl.home (lfbn-nic-1-68-20.w2-15.abo.wanadoo.fr. [2.15.159.20]) by smtp.gmail.com with ESMTPSA id u20sm21991145wmm.15.2020.07.13.07.59.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 07:59:47 -0700 (PDT) From: Bartosz Golaszewski To: Jonathan Cameron , Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald-Stadler , Michal Simek , Greg Kroah-Hartman , Guenter Roeck , Andy Shevchenko Subject: [PATCH v4 2/3] hwmon: pmbus: use more devres helpers Date: Mon, 13 Jul 2020 16:59:33 +0200 Message-Id: <20200713145934.18243-3-brgl@bgdev.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200713145934.18243-1-brgl@bgdev.pl> References: <20200713145934.18243-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200713_105949_469385_EDCDF461 X-CRM114-Status: GOOD ( 14.57 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:441 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-iio@vger.kernel.org, Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Bartosz Golaszewski Shrink pmbus code by using devm_hwmon_device_register_with_groups() and devm_krealloc() instead of their non-managed variants. Signed-off-by: Bartosz Golaszewski Acked-by: Guenter Roeck --- drivers/hwmon/pmbus/pmbus_core.c | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c index 44535add3a4a1..91839979cf6c1 100644 --- a/drivers/hwmon/pmbus/pmbus_core.c +++ b/drivers/hwmon/pmbus/pmbus_core.c @@ -1018,9 +1018,9 @@ static int pmbus_add_attribute(struct pmbus_data *data, struct attribute *attr) { if (data->num_attributes >= data->max_attributes - 1) { int new_max_attrs = data->max_attributes + PMBUS_ATTR_ALLOC_SIZE; - void *new_attrs = krealloc(data->group.attrs, - new_max_attrs * sizeof(void *), - GFP_KERNEL); + void *new_attrs = devm_krealloc(data->dev, data->group.attrs, + new_max_attrs * sizeof(void *), + GFP_KERNEL); if (!new_attrs) return -ENOMEM; data->group.attrs = new_attrs; @@ -2534,7 +2534,7 @@ int pmbus_do_probe(struct i2c_client *client, const struct i2c_device_id *id, ret = pmbus_find_attributes(client, data); if (ret) - goto out_kfree; + return ret; /* * If there are no attributes, something is wrong. @@ -2542,35 +2542,27 @@ int pmbus_do_probe(struct i2c_client *client, const struct i2c_device_id *id, */ if (!data->num_attributes) { dev_err(dev, "No attributes found\n"); - ret = -ENODEV; - goto out_kfree; + return -ENODEV; } data->groups[0] = &data->group; memcpy(data->groups + 1, info->groups, sizeof(void *) * groups_num); - data->hwmon_dev = hwmon_device_register_with_groups(dev, client->name, - data, data->groups); + data->hwmon_dev = devm_hwmon_device_register_with_groups(dev, + client->name, data, data->groups); if (IS_ERR(data->hwmon_dev)) { - ret = PTR_ERR(data->hwmon_dev); dev_err(dev, "Failed to register hwmon device\n"); - goto out_kfree; + return PTR_ERR(data->hwmon_dev); } ret = pmbus_regulator_register(data); if (ret) - goto out_unregister; + return ret; ret = pmbus_init_debugfs(client, data); if (ret) dev_warn(dev, "Failed to register debugfs\n"); return 0; - -out_unregister: - hwmon_device_unregister(data->hwmon_dev); -out_kfree: - kfree(data->group.attrs); - return ret; } EXPORT_SYMBOL_GPL(pmbus_do_probe); @@ -2580,8 +2572,6 @@ int pmbus_do_remove(struct i2c_client *client) debugfs_remove_recursive(data->debugfs); - hwmon_device_unregister(data->hwmon_dev); - kfree(data->group.attrs); return 0; } EXPORT_SYMBOL_GPL(pmbus_do_remove);