From patchwork Mon Mar 22 07:36:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Vaittinen, Matti" X-Patchwork-Id: 12154003 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=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham 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 D0405C433C1 for ; Mon, 22 Mar 2021 07:37:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7FF766196F for ; Mon, 22 Mar 2021 07:37:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229548AbhCVHhE (ORCPT ); Mon, 22 Mar 2021 03:37:04 -0400 Received: from mail-lj1-f175.google.com ([209.85.208.175]:41730 "EHLO mail-lj1-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229455AbhCVHgf (ORCPT ); Mon, 22 Mar 2021 03:36:35 -0400 Received: by mail-lj1-f175.google.com with SMTP id f26so19797761ljp.8; Mon, 22 Mar 2021 00:36:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=BsY7YkuLSTkyifbDrF2JneCtTyzv1UBxYFrackx4xR8=; b=IhOnuVsAx+u19l0irWWmAI242FipU3nv1FIXSMOypMKnliHLr8Zj4smAy901S4u0D8 ULPP3KiHLL8oeCX2Jlwb9ztpO6ECPHMFqCZfkntMD+/+fadd/ogdWh64SiJWnX0Mc7KF 6ZAo0Fc3RsE9xzvsr9fwX6NlkyP6KV72Fj87KzPj0E+E7jWOt5hOkqbcLNgoOgV6JvYq d/eOtZpOCsXqq3R7hVSNOtgXnPj1rGdCRxUjBQUPhM42gcbBC47BiDGqNjnD0BldMWAQ uXLeHJlwdvB5+ho8isWuiy+Nc1yO/cQOBTCeGN5kouXGs911nip+yeCsgVSimqoZd1nf C1kQ== X-Gm-Message-State: AOAM532Es5MBKEOGXv6d7Xw7mjqCypvjDeueFT1TDPgxiuvpRMRaxef9 jEgUlJ0er5Se21qVQkW51vk= X-Google-Smtp-Source: ABdhPJxZxKHSrUcrA+MxAaS9GKwnd6qja3nJ+fWL6807Hq21OSBs4TyQ9jeAqiqK9DZHnbgngykUjw== X-Received: by 2002:a2e:3015:: with SMTP id w21mr8897322ljw.120.1616398593654; Mon, 22 Mar 2021 00:36:33 -0700 (PDT) Received: from localhost.localdomain (mobile-access-5673b7-246.dhcp.inet.fi. [86.115.183.246]) by smtp.gmail.com with ESMTPSA id d27sm394446lfv.226.2021.03.22.00.36.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Mar 2021 00:36:33 -0700 (PDT) Date: Mon, 22 Mar 2021 09:36:27 +0200 From: Matti Vaittinen To: Matti Vaittinen , Matti Vaittinen Cc: MyungJoo Ham , Chanwoo Choi , Andy Gross , Bjorn Andersson , Jean Delvare , Guenter Roeck , Hans de Goede , Mark Gross , Sebastian Reichel , Chen-Yu Tsai , Liam Girdwood , Mark Brown , Wim Van Sebroeck , Matti Vaittinen , gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-hwmon@vger.kernel.org, platform-driver-x86@vger.kernel.org, linux-pm@vger.kernel.org, linux-watchdog@vger.kernel.org Subject: [RFC RESEND PATCH v2 1/8] workqueue: Add resource managed version of delayed work init Message-ID: <51769ea4668198deb798fe47fcfb5f5288d61586.1616395565.git.matti.vaittinen@fi.rohmeurope.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org A few drivers which need a delayed work-queue must cancel work at driver detach. Some of those implement remove() solely for this purpose. Help drivers to avoid unnecessary remove and error-branch implementation by adding managed verision of delayed work initialization. This will also help drivers to avoid mixing manual and devm based unwinding when other resources are handled by devm. Signed-off-by: Matti Vaittinen --- include/linux/devm-helpers.h | 53 ++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 include/linux/devm-helpers.h diff --git a/include/linux/devm-helpers.h b/include/linux/devm-helpers.h new file mode 100644 index 000000000000..f64e0c9f3763 --- /dev/null +++ b/include/linux/devm-helpers.h @@ -0,0 +1,53 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef __LINUX_DEVM_HELPERS_H +#define __LINUX_DEVM_HELPERS_H + +/* + * Functions which do automatically cancel operations or release resources upon + * driver detach. + * + * These should be helpful to avoid mixing the manual and devm-based resource + * management which can be source of annoying, rarely occurring, + * hard-to-reproduce bugs. + * + * Please take into account that devm based cancellation may be performed some + * time after the remove() is ran. + * + * Thus mixing devm and manual resource management can easily cause problems + * when unwinding operations with dependencies. IRQ scheduling a work in a queue + * is typical example where IRQs are often devm-managed and WQs are manually + * cleaned at remove(). If IRQs are not manually freed at remove() (and this is + * often the case when we use devm for IRQs) we have a period of time after + * remove() - and before devm managed IRQs are freed - where new IRQ may fire + * and schedule a work item which won't be cancelled because remove() was + * already ran. + */ + +#include +#include + +static inline void devm_delayed_work_drop(void *res) +{ + cancel_delayed_work_sync(res); +} + +/** + * devm_delayed_work_autocancel - Resource-managed work allocation + * @dev: Device which lifetime work is bound to + * @pdata: work to be cancelled when driver is detached + * + * Initialize work which is automatically cancelled when driver is detached. + * A few drivers need delayed work which must be cancelled before driver + * is detached to avoid accessing removed resources. + * devm_delayed_work_autocancel() can be used to omit the explicit + * cancelleation when driver is detached. + */ +static inline int devm_delayed_work_autocancel(struct device *dev, + struct delayed_work *w, + work_func_t worker) +{ + INIT_DELAYED_WORK(w, worker); + return devm_add_action(dev, devm_delayed_work_drop, w); +} + +#endif From patchwork Mon Mar 22 07:36:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Vaittinen, Matti" X-Patchwork-Id: 12154005 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=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 B6AC8C433E4 for ; Mon, 22 Mar 2021 07:37:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 926DD61980 for ; Mon, 22 Mar 2021 07:37:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229746AbhCVHhF (ORCPT ); Mon, 22 Mar 2021 03:37:05 -0400 Received: from mail-lj1-f181.google.com ([209.85.208.181]:46921 "EHLO mail-lj1-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229482AbhCVHgx (ORCPT ); Mon, 22 Mar 2021 03:36:53 -0400 Received: by mail-lj1-f181.google.com with SMTP id u20so19763908lja.13; Mon, 22 Mar 2021 00:36:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=SQ3PaiTY3yrXW128oXOTKmB9MRClkfJjAeG90z4F670=; b=HBfRZmWwGzE3Uuh4EhcxibbYPEiRTOfeocrFoRvFOU8lA2sGMZP2yFBQnOwF4dndef f16p4n7L4HpTZY8o50PEuyranAKd6E0Z+MXucWaJirxNnTZYHOt9btbpCQaUI5XZYCIs xcvtSCZcJGn5I/fTHpfGn3mTs8JNL2aIcNfUTDIuOf/FIDQ6rTPPioQCmLEV8/jAmYrZ GmqiZZXUn/x+cBjyLEft8DPe65TlZBTSsk/hSWCJAkqpt6/aGIh0NguFcUH30mQzjspC 86OXwHzRIo+G3xqUw5+kxzekIJ01mWWOok7mFl/QsyXpAAoZnIvOeqK7FJQnAonRMQN/ l1VQ== X-Gm-Message-State: AOAM532vxCPhjHCAbnNbIAQoCQ/uHiHl+9x5RxQfu2s+37OOftAr+nXt qf5VIOoqXyawgT6F0U855OU= X-Google-Smtp-Source: ABdhPJzWYjRawOPGm//U/R7ppWGtgRokdpLoSf2xViSu58s6hovmWp8M40iLaLfFZP996aPBqt93VQ== X-Received: by 2002:a05:651c:105a:: with SMTP id x26mr9078307ljm.111.1616398611316; Mon, 22 Mar 2021 00:36:51 -0700 (PDT) Received: from localhost.localdomain (mobile-access-5673b7-246.dhcp.inet.fi. [86.115.183.246]) by smtp.gmail.com with ESMTPSA id i2sm1475632lfl.308.2021.03.22.00.36.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Mar 2021 00:36:50 -0700 (PDT) Date: Mon, 22 Mar 2021 09:36:43 +0200 From: Matti Vaittinen To: Matti Vaittinen , Matti Vaittinen Cc: MyungJoo Ham , Chanwoo Choi , Andy Gross , Bjorn Andersson , Jean Delvare , Guenter Roeck , Hans de Goede , Mark Gross , Sebastian Reichel , Chen-Yu Tsai , Liam Girdwood , Mark Brown , Wim Van Sebroeck , Matti Vaittinen , gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-hwmon@vger.kernel.org, platform-driver-x86@vger.kernel.org, linux-pm@vger.kernel.org, linux-watchdog@vger.kernel.org Subject: [RFC RESEND PATCH v2 2/8] MAINTAINERS: Add entry for devm helpers Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Devm helper header containing small inline helpers was added. Hans promised to maintain it. Add Hans as maintainer and myself as designated reviewer. Signed-off-by: Matti Vaittinen --- MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 9e876927c60d..fa5ac3164678 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5169,6 +5169,12 @@ M: Torben Mathiasen S: Maintained W: http://lanana.org/docs/device-list/index.html +DEVICE RESOURCE MANAGEMENT HELPERS +M: Hans de Goede +R: Matti Vaittinen +S: Maintained +F: include/linux/devm-helpers.h + DEVICE-MAPPER (LVM) M: Alasdair Kergon M: Mike Snitzer From patchwork Mon Mar 22 07:37:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Vaittinen, Matti" X-Patchwork-Id: 12154007 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=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham 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 672CEC433C1 for ; Mon, 22 Mar 2021 07:38:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3548461987 for ; Mon, 22 Mar 2021 07:38:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229760AbhCVHiJ (ORCPT ); Mon, 22 Mar 2021 03:38:09 -0400 Received: from mail-lf1-f41.google.com ([209.85.167.41]:33437 "EHLO mail-lf1-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229547AbhCVHh7 (ORCPT ); Mon, 22 Mar 2021 03:37:59 -0400 Received: by mail-lf1-f41.google.com with SMTP id o126so10171151lfa.0; Mon, 22 Mar 2021 00:37:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=i2ApixlcNFSgRNZV2WrpD59k7rwUtHU4Z7fUd0IoG8M=; b=qWsUxrY3o7krXnvq55OGssU5+bLHnpTqsdquhl90kqipYG+TYm3xcRT/UOKlkaif3R mbbStvCSdvTvvUmbgJp3yeyb/tlPi3FSQzKZbOXzNTtlFECLFHnbcDhgulRk6sqJnt6O eP1Vm1/nv9Xj7oqpd7nqKnnfXEdiGziz6woo5w4/Bf307zE3We720daiPyYkyKHiuhY3 2G/ggNQv/G8diJSz/HFGP5AKso1YNP8Qpr+287kdDGEDxkgYpoUzfcpLyZKNfDV4BhOB sxyJIJoQsoCTDYAAW3PXgwdwOIIJXgDro/nv5vY1gmV95yej1lxStgJJNUNUuc459FfT uZ6A== X-Gm-Message-State: AOAM532ijIU9PJbo9/CO0BPqF4w7Z4QHXtkU1rmptO4bY72cvLEYuUsq iBrhkASXjJGCT/OWpc8yfuE= X-Google-Smtp-Source: ABdhPJzApLm0JbCOqMTNehAhwTf1dZvIX3B5xKJKulcGqSUwPOpu4hzUszULoPsJRzTw4amzzyLo0Q== X-Received: by 2002:a19:e0d:: with SMTP id 13mr8154990lfo.549.1616398677247; Mon, 22 Mar 2021 00:37:57 -0700 (PDT) Received: from localhost.localdomain (mobile-access-5673b7-246.dhcp.inet.fi. [86.115.183.246]) by smtp.gmail.com with ESMTPSA id z16sm1329974lfu.158.2021.03.22.00.37.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Mar 2021 00:37:56 -0700 (PDT) Date: Mon, 22 Mar 2021 09:37:51 +0200 From: Matti Vaittinen To: Matti Vaittinen , Matti Vaittinen Cc: Hans de Goede , Sebastian Reichel , Chen-Yu Tsai , Matti Vaittinen , gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org Subject: [RFC RESEND PATCH v2 6/8] power: supply: Clean-up few drivers by using managed work init Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Few drivers implement remove call-back only for ensuring a delayed work gets cancelled prior driver removal. Clean-up these by switching to use devm_delayed_work_autocancel() instead. This change is compile-tested only. All testing is appreciated. Signed-off-by: Matti Vaittinen Acked-by: Sebastian Reichel --- drivers/power/supply/axp20x_usb_power.c | 15 +++++---------- drivers/power/supply/bq24735-charger.c | 18 ++++++------------ drivers/power/supply/ltc2941-battery-gauge.c | 20 +++++++------------- drivers/power/supply/sbs-battery.c | 16 +++++----------- 4 files changed, 23 insertions(+), 46 deletions(-) diff --git a/drivers/power/supply/axp20x_usb_power.c b/drivers/power/supply/axp20x_usb_power.c index 8933ae26c3d6..4259709e3491 100644 --- a/drivers/power/supply/axp20x_usb_power.c +++ b/drivers/power/supply/axp20x_usb_power.c @@ -8,6 +8,7 @@ #include #include +#include #include #include #include @@ -646,21 +647,16 @@ static int axp20x_usb_power_probe(struct platform_device *pdev) } } + ret = devm_delayed_work_autocancel(&pdev->dev, &power->vbus_detect, + axp20x_usb_power_poll_vbus); + if (ret) + return ret; if (axp20x_usb_vbus_needs_polling(power)) queue_delayed_work(system_power_efficient_wq, &power->vbus_detect, 0); return 0; } -static int axp20x_usb_power_remove(struct platform_device *pdev) -{ - struct axp20x_usb_power *power = platform_get_drvdata(pdev); - - cancel_delayed_work_sync(&power->vbus_detect); - - return 0; -} - static const struct of_device_id axp20x_usb_power_match[] = { { .compatible = "x-powers,axp202-usb-power-supply", @@ -680,7 +676,6 @@ MODULE_DEVICE_TABLE(of, axp20x_usb_power_match); static struct platform_driver axp20x_usb_power_driver = { .probe = axp20x_usb_power_probe, - .remove = axp20x_usb_power_remove, .driver = { .name = DRVNAME, .of_match_table = axp20x_usb_power_match, diff --git a/drivers/power/supply/bq24735-charger.c b/drivers/power/supply/bq24735-charger.c index ab2f4bf8f603..b5d619db79f6 100644 --- a/drivers/power/supply/bq24735-charger.c +++ b/drivers/power/supply/bq24735-charger.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include #include #include #include @@ -473,7 +474,11 @@ static int bq24735_charger_probe(struct i2c_client *client, if (!charger->poll_interval) return 0; - INIT_DELAYED_WORK(&charger->poll, bq24735_poll); + ret = devm_delayed_work_autocancel(&client->dev, &charger->poll, + bq24735_poll); + if (ret) + return ret; + schedule_delayed_work(&charger->poll, msecs_to_jiffies(charger->poll_interval)); } @@ -481,16 +486,6 @@ static int bq24735_charger_probe(struct i2c_client *client, return 0; } -static int bq24735_charger_remove(struct i2c_client *client) -{ - struct bq24735 *charger = i2c_get_clientdata(client); - - if (charger->poll_interval) - cancel_delayed_work_sync(&charger->poll); - - return 0; -} - static const struct i2c_device_id bq24735_charger_id[] = { { "bq24735-charger", 0 }, {} @@ -509,7 +504,6 @@ static struct i2c_driver bq24735_charger_driver = { .of_match_table = bq24735_match_ids, }, .probe = bq24735_charger_probe, - .remove = bq24735_charger_remove, .id_table = bq24735_charger_id, }; diff --git a/drivers/power/supply/ltc2941-battery-gauge.c b/drivers/power/supply/ltc2941-battery-gauge.c index 10cd617516ec..09f3e78af4e0 100644 --- a/drivers/power/supply/ltc2941-battery-gauge.c +++ b/drivers/power/supply/ltc2941-battery-gauge.c @@ -8,6 +8,7 @@ * Author: Auryn Verwegen * Author: Mike Looijmans */ +#include #include #include #include @@ -445,15 +446,6 @@ static enum power_supply_property ltc294x_properties[] = { POWER_SUPPLY_PROP_CURRENT_NOW, }; -static int ltc294x_i2c_remove(struct i2c_client *client) -{ - struct ltc294x_info *info = i2c_get_clientdata(client); - - cancel_delayed_work_sync(&info->work); - power_supply_unregister(info->supply); - return 0; -} - static int ltc294x_i2c_probe(struct i2c_client *client, const struct i2c_device_id *id) { @@ -547,7 +539,10 @@ static int ltc294x_i2c_probe(struct i2c_client *client, psy_cfg.drv_data = info; - INIT_DELAYED_WORK(&info->work, ltc294x_work); + ret = devm_delayed_work_autocancel(&client->dev, &info->work, + ltc294x_work); + if (ret) + return ret; ret = ltc294x_reset(info, prescaler_exp); if (ret < 0) { @@ -555,8 +550,8 @@ static int ltc294x_i2c_probe(struct i2c_client *client, return ret; } - info->supply = power_supply_register(&client->dev, &info->supply_desc, - &psy_cfg); + info->supply = devm_power_supply_register(&client->dev, + &info->supply_desc, &psy_cfg); if (IS_ERR(info->supply)) { dev_err(&client->dev, "failed to register ltc2941\n"); return PTR_ERR(info->supply); @@ -655,7 +650,6 @@ static struct i2c_driver ltc294x_driver = { .pm = LTC294X_PM_OPS, }, .probe = ltc294x_i2c_probe, - .remove = ltc294x_i2c_remove, .shutdown = ltc294x_i2c_shutdown, .id_table = ltc294x_i2c_id, }; diff --git a/drivers/power/supply/sbs-battery.c b/drivers/power/supply/sbs-battery.c index b6a538ebb378..70ea404b2a36 100644 --- a/drivers/power/supply/sbs-battery.c +++ b/drivers/power/supply/sbs-battery.c @@ -7,6 +7,7 @@ #include #include +#include #include #include #include @@ -1165,7 +1166,10 @@ static int sbs_probe(struct i2c_client *client) } } - INIT_DELAYED_WORK(&chip->work, sbs_delayed_work); + rc = devm_delayed_work_autocancel(&client->dev, &chip->work, + sbs_delayed_work); + if (rc) + return rc; chip->power_supply = devm_power_supply_register(&client->dev, sbs_desc, &psy_cfg); @@ -1185,15 +1189,6 @@ static int sbs_probe(struct i2c_client *client) return rc; } -static int sbs_remove(struct i2c_client *client) -{ - struct sbs_info *chip = i2c_get_clientdata(client); - - cancel_delayed_work_sync(&chip->work); - - return 0; -} - #if defined CONFIG_PM_SLEEP static int sbs_suspend(struct device *dev) @@ -1248,7 +1243,6 @@ MODULE_DEVICE_TABLE(of, sbs_dt_ids); static struct i2c_driver sbs_battery_driver = { .probe_new = sbs_probe, - .remove = sbs_remove, .alert = sbs_alert, .id_table = sbs_id, .driver = {