From patchwork Thu Jul 18 13:03:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Gonzalez X-Patchwork-Id: 57608 X-Patchwork-Delegate: sean@mess.org Received: from vger.kernel.org ([209.132.180.67]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ho64T-0003hh-7D; Thu, 18 Jul 2019 13:03:41 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390458AbfGRNDc (ORCPT + 1 other); Thu, 18 Jul 2019 09:03:32 -0400 Received: from ns.iliad.fr ([212.27.33.1]:57986 "EHLO ns.iliad.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727767AbfGRNDc (ORCPT ); Thu, 18 Jul 2019 09:03:32 -0400 Received: from ns.iliad.fr (localhost [127.0.0.1]) by ns.iliad.fr (Postfix) with ESMTP id 8EB7E2070A; Thu, 18 Jul 2019 15:03:30 +0200 (CEST) Received: from [192.168.108.49] (freebox.vlq16.iliad.fr [213.36.7.13]) by ns.iliad.fr (Postfix) with ESMTP id 73348206B8; Thu, 18 Jul 2019 15:03:30 +0200 (CEST) From: Marc Gonzalez Subject: [PATCH v3] media: dvb: Provide 4 devm variants To: Sean Young , Brad Love , Mauro Carvalho Chehab , =?utf-8?q?Jonathan_Neusch=C3=A4?= =?utf-8?q?fer?= Cc: linux-media , LKML , Bjorn Andersson , Guenter Roeck Message-ID: <068836c7-a116-7e6f-cbb2-f2176fbb9a38@free.fr> Date: Thu, 18 Jul 2019 15:03:30 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 Content-Language: en-US X-Virus-Scanned: ClamAV using ClamSMTP ; ns.iliad.fr ; Thu Jul 18 15:03:30 2019 +0200 (CEST) Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Provide devm variants for automatic resource release on device removal. Makes error-handling in probe() simpler, thus less error-prone. Once all resources are devmanaged, remove() is no longer needed. Signed-off-by: Marc Gonzalez --- Changes from v2: x Handle dvb_register_adapter() return code correctly Changes from v1: x Simplify devm_dvb_register_adapter() implementation x Add 3 more devm APIs x Document them in devres.rst --- Documentation/driver-model/devres.rst | 6 ++++++ drivers/media/dvb-core/dmxdev.c | 13 +++++++++++++ drivers/media/dvb-core/dvb_demux.c | 13 +++++++++++++ drivers/media/dvb-core/dvb_frontend.c | 13 +++++++++++++ drivers/media/dvb-core/dvbdev.c | 12 ++++++++++++ include/media/dmxdev.h | 3 +++ include/media/dvb_demux.h | 2 ++ include/media/dvb_frontend.h | 3 +++ include/media/dvbdev.h | 3 +++ 9 files changed, 68 insertions(+) diff --git a/Documentation/driver-model/devres.rst b/Documentation/driver-model/devres.rst index 6af41a6a4bb6..84bdb61f27a3 100644 --- a/Documentation/driver-model/devres.rst +++ b/Documentation/driver-model/devres.rst @@ -268,6 +268,12 @@ DMA DRM devm_drm_dev_init() +DVB + devm_dvb_dmx_init() + devm_dvb_dmxdev_init() + devm_dvb_register_adapter() + devm_dvb_register_frontend() + GPIO devm_gpiod_get() devm_gpiod_get_index() diff --git a/drivers/media/dvb-core/dmxdev.c b/drivers/media/dvb-core/dmxdev.c index f14a872d1268..f38b65d1b430 100644 --- a/drivers/media/dvb-core/dmxdev.c +++ b/drivers/media/dvb-core/dmxdev.c @@ -1444,6 +1444,19 @@ int dvb_dmxdev_init(struct dmxdev *dmxdev, struct dvb_adapter *dvb_adapter) EXPORT_SYMBOL(dvb_dmxdev_init); +static void dmxdev_release(void *dmxdev) +{ + dvb_dmxdev_release(dmxdev); +} + +int devm_dvb_dmxdev_init(struct device *dev, struct dmxdev *dmxdev, + struct dvb_adapter *dvb_adapter) +{ + int rc = dvb_dmxdev_init(dmxdev, dvb_adapter); + return rc ? : devm_add_action_or_reset(dev, dmxdev_release, dmxdev); +} +EXPORT_SYMBOL(devm_dvb_dmxdev_init); + void dvb_dmxdev_release(struct dmxdev *dmxdev) { dmxdev->exit = 1; diff --git a/drivers/media/dvb-core/dvb_demux.c b/drivers/media/dvb-core/dvb_demux.c index 39a2c6ccf31d..55b9675b99c5 100644 --- a/drivers/media/dvb-core/dvb_demux.c +++ b/drivers/media/dvb-core/dvb_demux.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include @@ -1317,6 +1318,18 @@ int dvb_dmx_init(struct dvb_demux *dvbdemux) EXPORT_SYMBOL(dvb_dmx_init); +static void dmx_release(void *dvbdemux) +{ + dvb_dmx_release(dvbdemux); +} + +int devm_dvb_dmx_init(struct device *dev, struct dvb_demux *dvbdemux) +{ + int rc = dvb_dmx_init(dvbdemux); + return rc ? : devm_add_action_or_reset(dev, dmx_release, dvbdemux); +} +EXPORT_SYMBOL(devm_dvb_dmx_init); + void dvb_dmx_release(struct dvb_demux *dvbdemux) { vfree(dvbdemux->cnt_storage); diff --git a/drivers/media/dvb-core/dvb_frontend.c b/drivers/media/dvb-core/dvb_frontend.c index 209186c5cd9b..4a281cd8c064 100644 --- a/drivers/media/dvb-core/dvb_frontend.c +++ b/drivers/media/dvb-core/dvb_frontend.c @@ -3007,6 +3007,19 @@ int dvb_register_frontend(struct dvb_adapter *dvb, } EXPORT_SYMBOL(dvb_register_frontend); +static void unregister_frontend(void *fe) +{ + dvb_unregister_frontend(fe); +} + +int devm_dvb_register_frontend(struct device *dev, + struct dvb_adapter *dvb, struct dvb_frontend *fe) +{ + int rc = dvb_register_frontend(dvb, fe); + return rc ? : devm_add_action_or_reset(dev, unregister_frontend, fe); +} +EXPORT_SYMBOL(devm_dvb_register_frontend); + int dvb_unregister_frontend(struct dvb_frontend *fe) { struct dvb_frontend_private *fepriv = fe->frontend_priv; diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c index a3393cd4e584..0fc8dbf65045 100644 --- a/drivers/media/dvb-core/dvbdev.c +++ b/drivers/media/dvb-core/dvbdev.c @@ -885,6 +885,18 @@ int dvb_register_adapter(struct dvb_adapter *adap, const char *name, } EXPORT_SYMBOL(dvb_register_adapter); +static void unreg_adapter(void *adap) +{ + dvb_unregister_adapter(adap); +} + +int devm_dvb_register_adapter(struct device *dev, struct dvb_adapter *adap, + const char *name, struct module *module, short *adapter_nums) +{ + int rc = dvb_register_adapter(adap, name, module, dev, adapter_nums); + return rc < 0 ? rc : devm_add_action_or_reset(dev, unreg_adapter, adap); +} +EXPORT_SYMBOL(devm_dvb_register_adapter); int dvb_unregister_adapter(struct dvb_adapter *adap) { diff --git a/include/media/dmxdev.h b/include/media/dmxdev.h index baafa3b8aca4..0300d829aeea 100644 --- a/include/media/dmxdev.h +++ b/include/media/dmxdev.h @@ -204,6 +204,9 @@ struct dmxdev { */ int dvb_dmxdev_init(struct dmxdev *dmxdev, struct dvb_adapter *adap); +int devm_dvb_dmxdev_init(struct device *dev, struct dmxdev *dmxdev, + struct dvb_adapter *dvb_adapter); + /** * dvb_dmxdev_release - releases a digital TV demux and unregisters it. * diff --git a/include/media/dvb_demux.h b/include/media/dvb_demux.h index 3b6aeca7a49e..95fe901076d7 100644 --- a/include/media/dvb_demux.h +++ b/include/media/dvb_demux.h @@ -266,6 +266,8 @@ struct dvb_demux { */ int dvb_dmx_init(struct dvb_demux *demux); +int devm_dvb_dmx_init(struct device *dev, struct dvb_demux *demux); + /** * dvb_dmx_release - releases a digital TV demux internal buffers. * diff --git a/include/media/dvb_frontend.h b/include/media/dvb_frontend.h index f05cd7b94a2c..56dbaf3cc7a9 100644 --- a/include/media/dvb_frontend.h +++ b/include/media/dvb_frontend.h @@ -713,6 +713,9 @@ struct dvb_frontend { int dvb_register_frontend(struct dvb_adapter *dvb, struct dvb_frontend *fe); +int devm_dvb_register_frontend(struct device *dev, + struct dvb_adapter *dvb, struct dvb_frontend *fe); + /** * dvb_unregister_frontend() - Unregisters a DVB frontend * diff --git a/include/media/dvbdev.h b/include/media/dvbdev.h index 551325858de3..32f8d1626319 100644 --- a/include/media/dvbdev.h +++ b/include/media/dvbdev.h @@ -202,6 +202,9 @@ int dvb_register_adapter(struct dvb_adapter *adap, const char *name, struct module *module, struct device *device, short *adapter_nums); +int devm_dvb_register_adapter(struct device *dev, struct dvb_adapter *adap, + const char *name, struct module *module, short *adapter_nums); + /** * dvb_unregister_adapter - Unregisters a DVB adapter *