From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9D3CFC433DF for ; Thu, 20 Aug 2020 18:51:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7B6CF207DE for ; Thu, 20 Aug 2020 18:51:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.b="iwarKzYy" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727957AbgHTSvu (ORCPT ); Thu, 20 Aug 2020 14:51:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59174 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727892AbgHTSvZ (ORCPT ); Thu, 20 Aug 2020 14:51:25 -0400 Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1B816C061388 for ; Thu, 20 Aug 2020 11:51:25 -0700 (PDT) Received: by mail-wm1-x342.google.com with SMTP id p14so2697153wmg.1 for ; Thu, 20 Aug 2020 11:51:25 -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=8Y9xTv9MTk+DYQZI9tVbj30/uWX0D0ZC3rsteP6Q+Zs=; b=iwarKzYyK4MKjJW/4BzhLQmtU+H8hW6h05HtZHyxDAz+nC5pJoxUpbY2HF5XhTIeQu c77ui33ScwYXE81kdCnr3IghIageEAAQRR8YC8AXSqkOgme0P7wQMwl/Yty3iEq/Jd89 rXfJXnQUWdPYdQVZVHDCorDJf9RRjvJ/PtrBvUmO38x8preXWRmgaohWeMvTw6IQcvpQ s1qN9tsrpxY7JGHxeZmz4WmHPh1gZz0JcTJ1PmoRE/O1kYn6abSDLbnhqpgI+lTXE/t+ aY86hNiy8Vh/C/F3cN7gCw49cwwvmOj8Ak8He1yjXlAfchwBtXjw8PDKOgs6B96RtO8i e+jw== 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=8Y9xTv9MTk+DYQZI9tVbj30/uWX0D0ZC3rsteP6Q+Zs=; b=VDWw8b86uBYi7mb13Azk821te8JvneATQ3N+SCwzYzRnGxwXyRYNzmCZd2B9KJTYYy dSrI9fq3Gs4f6OKtswq2HAotShJK3cFxKFMeaBxyUfi4KRcG7LZQiyhe+G6Oqk7tfcvY 4zagBqz73Zw9VKA/aLkItYi+muGqhB/1utKLolFNlgJiazsCYPhocPOCNB7Dm+EJhsb5 azB30tOlKsqDnWzyoDdp/mE1yYlZd2du4TjQ8GRtjWeMg9ijIUpAzLh2H9yPgIjDPKJ5 cxxjBM7/QUXjbDWcw+tbQFH14URp46hgNl01kSYDXTkuHo+jGMSR5o2KWHpY92yOXb8j F58w== X-Gm-Message-State: AOAM5331JTx4LBsXfZinavdrVOlS0YewwFfCk+9dLLFSRTI0vilP1/fR msHNoEneF58yuz37NexlyE0x1g== X-Google-Smtp-Source: ABdhPJyi93EpGUHDhn1RcT/hobwWURvQP6QtBccpZMz7jNGPAcMuH1elqP6hkoFeMAOkZrFBFXKrew== X-Received: by 2002:a1c:2d8d:: with SMTP id t135mr73516wmt.76.1597949483778; Thu, 20 Aug 2020 11:51:23 -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 q2sm5694019wro.8.2020.08.20.11.51.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Aug 2020 11:51:23 -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 Cc: linux-iio@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH v8 2/3] hwmon: pmbus: use more devres helpers Date: Thu, 20 Aug 2020 20:51:09 +0200 Message-Id: <20200820185110.17828-3-brgl@bgdev.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200820185110.17828-1-brgl@bgdev.pl> References: <20200820185110.17828-1-brgl@bgdev.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.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 44535add3a4a..91839979cf6c 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); -- 2.26.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 96331C433E3 for ; Thu, 20 Aug 2020 18:52:54 +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 1F1CB207DE for ; Thu, 20 Aug 2020 18:52:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="AX24vzkq"; 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="iwarKzYy" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1F1CB207DE 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+linux-arm-kernel=archiver.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=Iv6A7XitsW+BCjNIPrBNnb6XzMQYjFhixUaUuPg5VJA=; b=AX24vzkq0XoW75v7pbgLz1g0Q 05sufxeCm+5MjRiK7X1MD0u6kxBEIMA78PCiDzLHAOVoBsilQRThJNoZlJo0e2DK1jOj5pZmMHfkf GfBhfbg9Srz+RnicXIK2sWkBCk23g7//o6qEzu5/kKPP15ph8vqCHIbjaSWfx6r4oDrrhlXyLGqoC iBb2aKxuru7/AoFnobFsETHmNc5RA8RB/S3xEqy8+mKgb9Esw5fCmfOLzKE3a8UEHGARLvQmtMR5j wF1iWNYgPgImYKaScMqfN016JtkcFM+B1KF89zDn49lEfDNykXn99KI01d9fF+SNErogfL7F07/Lj WNTdy3dvw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k8peu-00053F-Vc; Thu, 20 Aug 2020 18:51:33 +0000 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k8pem-00050u-TA for linux-arm-kernel@lists.infradead.org; Thu, 20 Aug 2020 18:51:25 +0000 Received: by mail-wm1-x344.google.com with SMTP id k20so2703294wmi.5 for ; Thu, 20 Aug 2020 11:51:24 -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=8Y9xTv9MTk+DYQZI9tVbj30/uWX0D0ZC3rsteP6Q+Zs=; b=iwarKzYyK4MKjJW/4BzhLQmtU+H8hW6h05HtZHyxDAz+nC5pJoxUpbY2HF5XhTIeQu c77ui33ScwYXE81kdCnr3IghIageEAAQRR8YC8AXSqkOgme0P7wQMwl/Yty3iEq/Jd89 rXfJXnQUWdPYdQVZVHDCorDJf9RRjvJ/PtrBvUmO38x8preXWRmgaohWeMvTw6IQcvpQ s1qN9tsrpxY7JGHxeZmz4WmHPh1gZz0JcTJ1PmoRE/O1kYn6abSDLbnhqpgI+lTXE/t+ aY86hNiy8Vh/C/F3cN7gCw49cwwvmOj8Ak8He1yjXlAfchwBtXjw8PDKOgs6B96RtO8i e+jw== 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=8Y9xTv9MTk+DYQZI9tVbj30/uWX0D0ZC3rsteP6Q+Zs=; b=GMUxkKCcU8DlUwjF0YlmGAJSFItPsLSLOBZrXuJK+cA5W9Nqkb+i8nK5ynT0BTc3pH wg0dF3olAIUx51LaCMXEtyu5QPDJKn30TKrXeGbp73YH6xikAZMPbvaC6l4Imxi4WUR/ 6WPZAdFEVabvvMajQl/d2JCv/5ApBKRMmBfYFUeBg6ErDfz0ApOSGLU1h8XJ5FWI9NEY gHCEV7jCrde3EfuxA/ol+W1ZZadE+NGIi/b45D81Y9hNh9f2LBZVKNfPMqq86RvWNEMi J0B+0XimYHugQCHABL0Qpl3LlaPOafbMhCCpH5U7R34NU7McH5dA+T/amTTlFXVxrqzm NsoQ== X-Gm-Message-State: AOAM532sb5Nk4d9bkFJS63eu5xE29QM+gOeQ0NiI6an5nuhiGe8UrO57 0ZCw9DKopNgxWo6SicaZQQxlNEKF5YGjtw== X-Google-Smtp-Source: ABdhPJyi93EpGUHDhn1RcT/hobwWURvQP6QtBccpZMz7jNGPAcMuH1elqP6hkoFeMAOkZrFBFXKrew== X-Received: by 2002:a1c:2d8d:: with SMTP id t135mr73516wmt.76.1597949483778; Thu, 20 Aug 2020 11:51:23 -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 q2sm5694019wro.8.2020.08.20.11.51.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Aug 2020 11:51:23 -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 v8 2/3] hwmon: pmbus: use more devres helpers Date: Thu, 20 Aug 2020 20:51:09 +0200 Message-Id: <20200820185110.17828-3-brgl@bgdev.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200820185110.17828-1-brgl@bgdev.pl> References: <20200820185110.17828-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200820_145125_023034_AD1EF575 X-CRM114-Status: GOOD ( 16.52 ) 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.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 44535add3a4a..91839979cf6c 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); -- 2.26.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel