Received: by 2002:a25:868d:0:0:0:0:0 with SMTP id z13csp952830ybk; Sun, 10 May 2020 01:39:18 -0700 (PDT) X-Google-Smtp-Source: APiQypKH55lFzQkTbBgbRZj2NsuLcx6fSyCLP1GtWJv2eH/J/mT4uk6YekfdFH7eAqsP+/z2TPTH X-Received: by 2002:a17:906:27d1:: with SMTP id k17mr8440456ejc.134.1589099958138; Sun, 10 May 2020 01:39:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1589099958; cv=none; d=google.com; s=arc-20160816; b=c0tZbieyiK40zm6qZ+gTK2n8Uv3OARUhg+NSmjdajXdAMFUBSeEp+4TprcgQc/ngTS Hp7/6jyR2M1WvE2Es/ZjAASUJyK3aMB644SI8x2fNPnGPrPs2g1ZOgC8LJ/nNGW8V+AV jbU3M8F4GDVC6SWhFscSOInDxeR3E5KPStbWYUEvahd+d1bFn5sIO0yDSzmxHRlgZ9l6 rTJOv+jic8/lRU2DrHJ7luMtjr1v/5X+85vDxG6HWxJTaBSAsp2PO1v62Pb8IwfDG59K 9nn6IobsoopXPPJiCZlL9tkfk/JeRO4Th/9nwdny5zZtvM4L0pmeSPn2Hq//jrVO97dH GYsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:subject:cc:to:from:date :dkim-signature; bh=hh1C4RmHeN0UJJO2QO2E5tdb6CaUmfnMzblv5LNJME4=; b=eNnxM3XQzW4coL21WgNrg/56HbwI7fN4Ci5G+qID2/nU8OeU0+dmEfYY7agDvzbHvP njNmYnYs6UOVDu/7AWE9kk2lJgUxUU2a5i0RGNInurKfnAJk3I6RoS1ix3FnIdWhenCv 1qerC9e6P8Wr0RNmtDwc+Spt7OmbKsGxaIX/ud0tS3Iq9r6HmbyauaJwIRWX6dd+Y79U Kg06r0aU/Rqh7IJ/JD+2Vqo/phEz6lO5/kBrLac6CK5EV9P7LycGMS2Tum/Rq1v8wOdq 0zzU19127kiAknqtsSlaUfsHHtGQOqOgVMm//LsMjPGhMRUkTEYFRfJtKU+/gKvKtYDK VGKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=JejB5R3q; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id o17si4132884edv.44.2020.05.10.01.38.54; Sun, 10 May 2020 01:39:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=JejB5R3q; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728963AbgEJIhC (ORCPT + 99 others); Sun, 10 May 2020 04:37:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:43134 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726630AbgEJIhC (ORCPT ); Sun, 10 May 2020 04:37:02 -0400 Received: from archlinux (cpc149474-cmbg20-2-0-cust94.5-4.cable.virginm.net [82.4.196.95]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A6AF120820; Sun, 10 May 2020 08:36:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589099819; bh=PVoIOP+3iZEBk9LHvUjV0+vhWP+mGDlJmJ99VSuYamA=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=JejB5R3qm4Ec5Lg0Nf5SOyPPlxjTpsAYjxkCZ0JNeNdpAfVc/xGno9zzj/JnsbXCg fVS6WI/AIz+MgtJ+BJFMXMBcuir96eL9hLQn+vzqkkAL82sAOohtO4knu7TndR/EZW ItbeGDoKYKIv2NMwpDzGeUq7fxpKba9y4w2iD9Sw= Date: Sun, 10 May 2020 09:36:55 +0100 From: Jonathan Cameron To: Srinivas Pandruvada Cc: Alexandru Ardelean , linux-iio@vger.kernel.org, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] iio: hid-sensors: move triggered buffer setup into hid_sensor_setup_trigger Message-ID: <20200510093655.4b94836c@archlinux> In-Reply-To: References: <20200424043418.3579-1-alexandru.ardelean@analog.com> X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, 09 May 2020 03:49:31 -0700 Srinivas Pandruvada wrote: > On Fri, 2020-04-24 at 07:34 +0300, Alexandru Ardelean wrote: > > The main intent here is to get rid of the iio_buffer_set_attrs() > > helper, or > > at least rework it's usage a bit. > > The problem with that helper is that it needs a pointer to the > > buffer, > > which makes supporting multiple buffers per IIO device a bit more > > cumbersome. > > > > The hid_sensor_setup_trigger() is pretty much used in the same way: > > - iio_triggered_buffer_setup() gets called before > > - then hid_sensor_setup_trigger() and hid_sensor_setup_batch_mode() > > gets > > called which may attach some fifo attributes > > > > This change merges the 2 together under the > > hid_sensor_setup_trigger() > > function. Only the &iio_pollfunc_store_time is passed to all devices, > > so > > it's not even required to pass it explicitly outside of the common > > hid_sensor_setup_trigger() function. > > > > Moving the devm_iio_triggered_buffer_setup/cleanup() calls into the > > common > > place code can help the rework of the buffer code, since it is in one > > place. > > > > One detail of the change is that there are 2 drivers that use > > devm_iio_triggered_buffer_setup(). That function gets implicitly > > replaced with iio_triggered_buffer_setup()/cleanup(), but since all > > drivers > > call both hid_sensor_setup_trigger9) & hid_sensor_remove_trigger() > > trigger, > > the iio_triggered_buffer_cleanup() piggy backs on the > > hid_sensor_remove_trigger() call, which should cover the cleanup. > > > > Signed-off-by: Alexandru Ardelean > Acked-by: Srinivas Pandruvada Applied. Thanks, Jonathan > > > --- > > drivers/iio/accel/hid-sensor-accel-3d.c | 18 ++++---------- > > ---- > > .../common/hid-sensors/hid-sensor-trigger.c | 18 +++++++++++++++- > > -- > > .../common/hid-sensors/hid-sensor-trigger.h | 3 ++- > > drivers/iio/gyro/hid-sensor-gyro-3d.c | 18 ++++---------- > > ---- > > drivers/iio/humidity/hid-sensor-humidity.c | 12 +++--------- > > drivers/iio/light/hid-sensor-als.c | 18 ++++---------- > > ---- > > drivers/iio/light/hid-sensor-prox.c | 18 ++++---------- > > ---- > > drivers/iio/magnetometer/hid-sensor-magn-3d.c | 18 ++++---------- > > ---- > > drivers/iio/orientation/hid-sensor-incl-3d.c | 18 ++++---------- > > ---- > > drivers/iio/orientation/hid-sensor-rotation.c | 18 ++++---------- > > ---- > > drivers/iio/pressure/hid-sensor-press.c | 18 ++++---------- > > ---- > > .../iio/temperature/hid-sensor-temperature.c | 12 +++--------- > > 12 files changed, 55 insertions(+), 134 deletions(-) > > > > diff --git a/drivers/iio/accel/hid-sensor-accel-3d.c > > b/drivers/iio/accel/hid-sensor-accel-3d.c > > index 0d9e2def2b25..0ec0533448bc 100644 > > --- a/drivers/iio/accel/hid-sensor-accel-3d.c > > +++ b/drivers/iio/accel/hid-sensor-accel-3d.c > > @@ -14,8 +14,6 @@ > > #include > > #include > > #include > > -#include > > -#include > > #include "../common/hid-sensors/hid-sensor-trigger.h" > > > > enum accel_3d_channel { > > @@ -391,18 +389,13 @@ static int hid_accel_3d_probe(struct > > platform_device *pdev) > > indio_dev->name = name; > > indio_dev->modes = INDIO_DIRECT_MODE; > > > > - ret = iio_triggered_buffer_setup(indio_dev, > > &iio_pollfunc_store_time, > > - NULL, NULL); > > - if (ret) { > > - dev_err(&pdev->dev, "failed to initialize trigger > > buffer\n"); > > - goto error_free_dev_mem; > > - } > > atomic_set(&accel_state->common_attributes.data_ready, 0); > > + > > ret = hid_sensor_setup_trigger(indio_dev, name, > > &accel_state- > > >common_attributes); > > if (ret < 0) { > > dev_err(&pdev->dev, "trigger setup failed\n"); > > - goto error_unreg_buffer_funcs; > > + goto error_free_dev_mem; > > } > > > > ret = iio_device_register(indio_dev); > > @@ -426,9 +419,7 @@ static int hid_accel_3d_probe(struct > > platform_device *pdev) > > error_iio_unreg: > > iio_device_unregister(indio_dev); > > error_remove_trigger: > > - hid_sensor_remove_trigger(&accel_state->common_attributes); > > -error_unreg_buffer_funcs: > > - iio_triggered_buffer_cleanup(indio_dev); > > + hid_sensor_remove_trigger(indio_dev, &accel_state- > > >common_attributes); > > error_free_dev_mem: > > kfree(indio_dev->channels); > > return ret; > > @@ -443,8 +434,7 @@ static int hid_accel_3d_remove(struct > > platform_device *pdev) > > > > sensor_hub_remove_callback(hsdev, hsdev->usage); > > iio_device_unregister(indio_dev); > > - hid_sensor_remove_trigger(&accel_state->common_attributes); > > - iio_triggered_buffer_cleanup(indio_dev); > > + hid_sensor_remove_trigger(indio_dev, &accel_state- > > >common_attributes); > > kfree(indio_dev->channels); > > > > return 0; > > diff --git a/drivers/iio/common/hid-sensors/hid-sensor-trigger.c > > b/drivers/iio/common/hid-sensors/hid-sensor-trigger.c > > index 906d87780419..ff375790b7e8 100644 > > --- a/drivers/iio/common/hid-sensors/hid-sensor-trigger.c > > +++ b/drivers/iio/common/hid-sensors/hid-sensor-trigger.c > > @@ -13,6 +13,8 @@ > > #include > > #include > > #include > > +#include > > +#include > > #include > > #include > > #include "hid-sensor-trigger.h" > > @@ -222,7 +224,8 @@ static int > > hid_sensor_data_rdy_trigger_set_state(struct iio_trigger *trig, > > return hid_sensor_power_state(iio_trigger_get_drvdata(trig), > > state); > > } > > > > -void hid_sensor_remove_trigger(struct hid_sensor_common *attrb) > > +void hid_sensor_remove_trigger(struct iio_dev *indio_dev, > > + struct hid_sensor_common *attrb) > > { > > if (atomic_read(&attrb->runtime_pm_enable)) > > pm_runtime_disable(&attrb->pdev->dev); > > @@ -233,6 +236,7 @@ void hid_sensor_remove_trigger(struct > > hid_sensor_common *attrb) > > cancel_work_sync(&attrb->work); > > iio_trigger_unregister(attrb->trigger); > > iio_trigger_free(attrb->trigger); > > + iio_triggered_buffer_cleanup(indio_dev); > > } > > EXPORT_SYMBOL(hid_sensor_remove_trigger); > > > > @@ -246,11 +250,18 @@ int hid_sensor_setup_trigger(struct iio_dev > > *indio_dev, const char *name, > > int ret; > > struct iio_trigger *trig; > > > > + ret = iio_triggered_buffer_setup(indio_dev, > > &iio_pollfunc_store_time, > > + NULL, NULL); > > + if (ret) { > > + dev_err(&indio_dev->dev, "Triggered Buffer Setup > > Failed\n"); > > + return ret; > > + } > > + > > trig = iio_trigger_alloc("%s-dev%d", name, indio_dev->id); > > if (trig == NULL) { > > dev_err(&indio_dev->dev, "Trigger Allocate Failed\n"); > > ret = -ENOMEM; > > - goto error_ret; > > + goto error_triggered_buffer_cleanup; > > } > > > > trig->dev.parent = indio_dev->dev.parent; > > @@ -284,7 +295,8 @@ int hid_sensor_setup_trigger(struct iio_dev > > *indio_dev, const char *name, > > iio_trigger_unregister(trig); > > error_free_trig: > > iio_trigger_free(trig); > > -error_ret: > > +error_triggered_buffer_cleanup: > > + iio_triggered_buffer_cleanup(indio_dev); > > return ret; > > } > > EXPORT_SYMBOL(hid_sensor_setup_trigger); > > diff --git a/drivers/iio/common/hid-sensors/hid-sensor-trigger.h > > b/drivers/iio/common/hid-sensors/hid-sensor-trigger.h > > index f47b940ff170..bb45cc89e551 100644 > > --- a/drivers/iio/common/hid-sensors/hid-sensor-trigger.h > > +++ b/drivers/iio/common/hid-sensors/hid-sensor-trigger.h > > @@ -13,7 +13,8 @@ extern const struct dev_pm_ops hid_sensor_pm_ops; > > > > int hid_sensor_setup_trigger(struct iio_dev *indio_dev, const char > > *name, > > struct hid_sensor_common *attrb); > > -void hid_sensor_remove_trigger(struct hid_sensor_common *attrb); > > +void hid_sensor_remove_trigger(struct iio_dev *indio_dev, > > + struct hid_sensor_common *attrb); > > int hid_sensor_power_state(struct hid_sensor_common *st, bool > > state); > > > > #endif > > diff --git a/drivers/iio/gyro/hid-sensor-gyro-3d.c > > b/drivers/iio/gyro/hid-sensor-gyro-3d.c > > index 08cacbbf31e6..7f382aae1dfd 100644 > > --- a/drivers/iio/gyro/hid-sensor-gyro-3d.c > > +++ b/drivers/iio/gyro/hid-sensor-gyro-3d.c > > @@ -14,8 +14,6 @@ > > #include > > #include > > #include > > -#include > > -#include > > #include "../common/hid-sensors/hid-sensor-trigger.h" > > > > enum gyro_3d_channel { > > @@ -326,18 +324,13 @@ static int hid_gyro_3d_probe(struct > > platform_device *pdev) > > indio_dev->name = name; > > indio_dev->modes = INDIO_DIRECT_MODE; > > > > - ret = iio_triggered_buffer_setup(indio_dev, > > &iio_pollfunc_store_time, > > - NULL, NULL); > > - if (ret) { > > - dev_err(&pdev->dev, "failed to initialize trigger > > buffer\n"); > > - goto error_free_dev_mem; > > - } > > atomic_set(&gyro_state->common_attributes.data_ready, 0); > > + > > ret = hid_sensor_setup_trigger(indio_dev, name, > > &gyro_state- > > >common_attributes); > > if (ret < 0) { > > dev_err(&pdev->dev, "trigger setup failed\n"); > > - goto error_unreg_buffer_funcs; > > + goto error_free_dev_mem; > > } > > > > ret = iio_device_register(indio_dev); > > @@ -361,9 +354,7 @@ static int hid_gyro_3d_probe(struct > > platform_device *pdev) > > error_iio_unreg: > > iio_device_unregister(indio_dev); > > error_remove_trigger: > > - hid_sensor_remove_trigger(&gyro_state->common_attributes); > > -error_unreg_buffer_funcs: > > - iio_triggered_buffer_cleanup(indio_dev); > > + hid_sensor_remove_trigger(indio_dev, &gyro_state- > > >common_attributes); > > error_free_dev_mem: > > kfree(indio_dev->channels); > > return ret; > > @@ -378,8 +369,7 @@ static int hid_gyro_3d_remove(struct > > platform_device *pdev) > > > > sensor_hub_remove_callback(hsdev, HID_USAGE_SENSOR_GYRO_3D); > > iio_device_unregister(indio_dev); > > - hid_sensor_remove_trigger(&gyro_state->common_attributes); > > - iio_triggered_buffer_cleanup(indio_dev); > > + hid_sensor_remove_trigger(indio_dev, &gyro_state- > > >common_attributes); > > kfree(indio_dev->channels); > > > > return 0; > > diff --git a/drivers/iio/humidity/hid-sensor-humidity.c > > b/drivers/iio/humidity/hid-sensor-humidity.c > > index c99b54b0568d..d2318c4aab0f 100644 > > --- a/drivers/iio/humidity/hid-sensor-humidity.c > > +++ b/drivers/iio/humidity/hid-sensor-humidity.c > > @@ -7,8 +7,6 @@ > > #include > > #include > > #include > > -#include > > -#include > > #include > > #include > > > > @@ -233,12 +231,8 @@ static int hid_humidity_probe(struct > > platform_device *pdev) > > indio_dev->name = name; > > indio_dev->modes = INDIO_DIRECT_MODE; > > > > - ret = devm_iio_triggered_buffer_setup(&pdev->dev, indio_dev, > > - &iio_pollfunc_store_time, NULL, > > NULL); > > - if (ret) > > - return ret; > > - > > atomic_set(&humid_st->common_attributes.data_ready, 0); > > + > > ret = hid_sensor_setup_trigger(indio_dev, name, > > &humid_st->common_attributes); > > if (ret) > > @@ -261,7 +255,7 @@ static int hid_humidity_probe(struct > > platform_device *pdev) > > error_remove_callback: > > sensor_hub_remove_callback(hsdev, HID_USAGE_SENSOR_HUMIDITY); > > error_remove_trigger: > > - hid_sensor_remove_trigger(&humid_st->common_attributes); > > + hid_sensor_remove_trigger(indio_dev, &humid_st- > > >common_attributes); > > return ret; > > } > > > > @@ -274,7 +268,7 @@ static int hid_humidity_remove(struct > > platform_device *pdev) > > > > iio_device_unregister(indio_dev); > > sensor_hub_remove_callback(hsdev, HID_USAGE_SENSOR_HUMIDITY); > > - hid_sensor_remove_trigger(&humid_st->common_attributes); > > + hid_sensor_remove_trigger(indio_dev, &humid_st- > > >common_attributes); > > > > return 0; > > } > > diff --git a/drivers/iio/light/hid-sensor-als.c > > b/drivers/iio/light/hid-sensor-als.c > > index b6cd299517d1..81fa2a422797 100644 > > --- a/drivers/iio/light/hid-sensor-als.c > > +++ b/drivers/iio/light/hid-sensor-als.c > > @@ -14,8 +14,6 @@ > > #include > > #include > > #include > > -#include > > -#include > > #include "../common/hid-sensors/hid-sensor-trigger.h" > > > > enum { > > @@ -308,18 +306,13 @@ static int hid_als_probe(struct platform_device > > *pdev) > > indio_dev->name = name; > > indio_dev->modes = INDIO_DIRECT_MODE; > > > > - ret = iio_triggered_buffer_setup(indio_dev, > > &iio_pollfunc_store_time, > > - NULL, NULL); > > - if (ret) { > > - dev_err(&pdev->dev, "failed to initialize trigger > > buffer\n"); > > - goto error_free_dev_mem; > > - } > > atomic_set(&als_state->common_attributes.data_ready, 0); > > + > > ret = hid_sensor_setup_trigger(indio_dev, name, > > &als_state->common_attributes); > > if (ret < 0) { > > dev_err(&pdev->dev, "trigger setup failed\n"); > > - goto error_unreg_buffer_funcs; > > + goto error_free_dev_mem; > > } > > > > ret = iio_device_register(indio_dev); > > @@ -343,9 +336,7 @@ static int hid_als_probe(struct platform_device > > *pdev) > > error_iio_unreg: > > iio_device_unregister(indio_dev); > > error_remove_trigger: > > - hid_sensor_remove_trigger(&als_state->common_attributes); > > -error_unreg_buffer_funcs: > > - iio_triggered_buffer_cleanup(indio_dev); > > + hid_sensor_remove_trigger(indio_dev, &als_state- > > >common_attributes); > > error_free_dev_mem: > > kfree(indio_dev->channels); > > return ret; > > @@ -360,8 +351,7 @@ static int hid_als_remove(struct platform_device > > *pdev) > > > > sensor_hub_remove_callback(hsdev, HID_USAGE_SENSOR_ALS); > > iio_device_unregister(indio_dev); > > - hid_sensor_remove_trigger(&als_state->common_attributes); > > - iio_triggered_buffer_cleanup(indio_dev); > > + hid_sensor_remove_trigger(indio_dev, &als_state- > > >common_attributes); > > kfree(indio_dev->channels); > > > > return 0; > > diff --git a/drivers/iio/light/hid-sensor-prox.c > > b/drivers/iio/light/hid-sensor-prox.c > > index 7e1030af9ba3..e9c04df07344 100644 > > --- a/drivers/iio/light/hid-sensor-prox.c > > +++ b/drivers/iio/light/hid-sensor-prox.c > > @@ -14,8 +14,6 @@ > > #include > > #include > > #include > > -#include > > -#include > > #include "../common/hid-sensors/hid-sensor-trigger.h" > > > > #define CHANNEL_SCAN_INDEX_PRESENCE 0 > > @@ -286,18 +284,13 @@ static int hid_prox_probe(struct > > platform_device *pdev) > > indio_dev->name = name; > > indio_dev->modes = INDIO_DIRECT_MODE; > > > > - ret = iio_triggered_buffer_setup(indio_dev, > > &iio_pollfunc_store_time, > > - NULL, NULL); > > - if (ret) { > > - dev_err(&pdev->dev, "failed to initialize trigger > > buffer\n"); > > - goto error_free_dev_mem; > > - } > > atomic_set(&prox_state->common_attributes.data_ready, 0); > > + > > ret = hid_sensor_setup_trigger(indio_dev, name, > > &prox_state->common_attributes); > > if (ret) { > > dev_err(&pdev->dev, "trigger setup failed\n"); > > - goto error_unreg_buffer_funcs; > > + goto error_free_dev_mem; > > } > > > > ret = iio_device_register(indio_dev); > > @@ -321,9 +314,7 @@ static int hid_prox_probe(struct platform_device > > *pdev) > > error_iio_unreg: > > iio_device_unregister(indio_dev); > > error_remove_trigger: > > - hid_sensor_remove_trigger(&prox_state->common_attributes); > > -error_unreg_buffer_funcs: > > - iio_triggered_buffer_cleanup(indio_dev); > > + hid_sensor_remove_trigger(indio_dev, &prox_state- > > >common_attributes); > > error_free_dev_mem: > > kfree(indio_dev->channels); > > return ret; > > @@ -338,8 +329,7 @@ static int hid_prox_remove(struct platform_device > > *pdev) > > > > sensor_hub_remove_callback(hsdev, HID_USAGE_SENSOR_PROX); > > iio_device_unregister(indio_dev); > > - hid_sensor_remove_trigger(&prox_state->common_attributes); > > - iio_triggered_buffer_cleanup(indio_dev); > > + hid_sensor_remove_trigger(indio_dev, &prox_state- > > >common_attributes); > > kfree(indio_dev->channels); > > > > return 0; > > diff --git a/drivers/iio/magnetometer/hid-sensor-magn-3d.c > > b/drivers/iio/magnetometer/hid-sensor-magn-3d.c > > index 25e60b233e08..0c09daf87794 100644 > > --- a/drivers/iio/magnetometer/hid-sensor-magn-3d.c > > +++ b/drivers/iio/magnetometer/hid-sensor-magn-3d.c > > @@ -14,8 +14,6 @@ > > #include > > #include > > #include > > -#include > > -#include > > #include "../common/hid-sensors/hid-sensor-trigger.h" > > > > enum magn_3d_channel { > > @@ -519,18 +517,13 @@ static int hid_magn_3d_probe(struct > > platform_device *pdev) > > indio_dev->name = name; > > indio_dev->modes = INDIO_DIRECT_MODE; > > > > - ret = iio_triggered_buffer_setup(indio_dev, > > &iio_pollfunc_store_time, > > - NULL, NULL); > > - if (ret) { > > - dev_err(&pdev->dev, "failed to initialize trigger > > buffer\n"); > > - return ret; > > - } > > atomic_set(&magn_state->magn_flux_attributes.data_ready, 0); > > + > > ret = hid_sensor_setup_trigger(indio_dev, name, > > &magn_state- > > >magn_flux_attributes); > > if (ret < 0) { > > dev_err(&pdev->dev, "trigger setup failed\n"); > > - goto error_unreg_buffer_funcs; > > + return ret; > > } > > > > ret = iio_device_register(indio_dev); > > @@ -554,9 +547,7 @@ static int hid_magn_3d_probe(struct > > platform_device *pdev) > > error_iio_unreg: > > iio_device_unregister(indio_dev); > > error_remove_trigger: > > - hid_sensor_remove_trigger(&magn_state->magn_flux_attributes); > > -error_unreg_buffer_funcs: > > - iio_triggered_buffer_cleanup(indio_dev); > > + hid_sensor_remove_trigger(indio_dev, &magn_state- > > >magn_flux_attributes); > > return ret; > > } > > > > @@ -569,8 +560,7 @@ static int hid_magn_3d_remove(struct > > platform_device *pdev) > > > > sensor_hub_remove_callback(hsdev, HID_USAGE_SENSOR_COMPASS_3D); > > iio_device_unregister(indio_dev); > > - hid_sensor_remove_trigger(&magn_state->magn_flux_attributes); > > - iio_triggered_buffer_cleanup(indio_dev); > > + hid_sensor_remove_trigger(indio_dev, &magn_state- > > >magn_flux_attributes); > > > > return 0; > > } > > diff --git a/drivers/iio/orientation/hid-sensor-incl-3d.c > > b/drivers/iio/orientation/hid-sensor-incl-3d.c > > index 00af68764cda..6aac8bea233a 100644 > > --- a/drivers/iio/orientation/hid-sensor-incl-3d.c > > +++ b/drivers/iio/orientation/hid-sensor-incl-3d.c > > @@ -15,8 +15,6 @@ > > #include > > #include > > #include > > -#include > > -#include > > #include "../common/hid-sensors/hid-sensor-trigger.h" > > > > enum incl_3d_channel { > > @@ -346,18 +344,13 @@ static int hid_incl_3d_probe(struct > > platform_device *pdev) > > indio_dev->name = name; > > indio_dev->modes = INDIO_DIRECT_MODE; > > > > - ret = iio_triggered_buffer_setup(indio_dev, > > &iio_pollfunc_store_time, > > - NULL, NULL); > > - if (ret) { > > - dev_err(&pdev->dev, "failed to initialize trigger > > buffer\n"); > > - goto error_free_dev_mem; > > - } > > atomic_set(&incl_state->common_attributes.data_ready, 0); > > + > > ret = hid_sensor_setup_trigger(indio_dev, name, > > &incl_state- > > >common_attributes); > > if (ret) { > > dev_err(&pdev->dev, "trigger setup failed\n"); > > - goto error_unreg_buffer_funcs; > > + goto error_free_dev_mem; > > } > > > > ret = iio_device_register(indio_dev); > > @@ -382,9 +375,7 @@ static int hid_incl_3d_probe(struct > > platform_device *pdev) > > error_iio_unreg: > > iio_device_unregister(indio_dev); > > error_remove_trigger: > > - hid_sensor_remove_trigger(&incl_state->common_attributes); > > -error_unreg_buffer_funcs: > > - iio_triggered_buffer_cleanup(indio_dev); > > + hid_sensor_remove_trigger(indio_dev, &incl_state- > > >common_attributes); > > error_free_dev_mem: > > kfree(indio_dev->channels); > > return ret; > > @@ -399,8 +390,7 @@ static int hid_incl_3d_remove(struct > > platform_device *pdev) > > > > sensor_hub_remove_callback(hsdev, > > HID_USAGE_SENSOR_INCLINOMETER_3D); > > iio_device_unregister(indio_dev); > > - hid_sensor_remove_trigger(&incl_state->common_attributes); > > - iio_triggered_buffer_cleanup(indio_dev); > > + hid_sensor_remove_trigger(indio_dev, &incl_state- > > >common_attributes); > > kfree(indio_dev->channels); > > > > return 0; > > diff --git a/drivers/iio/orientation/hid-sensor-rotation.c > > b/drivers/iio/orientation/hid-sensor-rotation.c > > index 64ae7d04a200..b99f41240e3e 100644 > > --- a/drivers/iio/orientation/hid-sensor-rotation.c > > +++ b/drivers/iio/orientation/hid-sensor-rotation.c > > @@ -14,8 +14,6 @@ > > #include > > #include > > #include > > -#include > > -#include > > #include "../common/hid-sensors/hid-sensor-trigger.h" > > > > struct dev_rot_state { > > @@ -288,18 +286,13 @@ static int hid_dev_rot_probe(struct > > platform_device *pdev) > > indio_dev->name = name; > > indio_dev->modes = INDIO_DIRECT_MODE; > > > > - ret = iio_triggered_buffer_setup(indio_dev, > > &iio_pollfunc_store_time, > > - NULL, NULL); > > - if (ret) { > > - dev_err(&pdev->dev, "failed to initialize trigger > > buffer\n"); > > - return ret; > > - } > > atomic_set(&rot_state->common_attributes.data_ready, 0); > > + > > ret = hid_sensor_setup_trigger(indio_dev, name, > > &rot_state->common_attributes); > > if (ret) { > > dev_err(&pdev->dev, "trigger setup failed\n"); > > - goto error_unreg_buffer_funcs; > > + return ret; > > } > > > > ret = iio_device_register(indio_dev); > > @@ -323,9 +316,7 @@ static int hid_dev_rot_probe(struct > > platform_device *pdev) > > error_iio_unreg: > > iio_device_unregister(indio_dev); > > error_remove_trigger: > > - hid_sensor_remove_trigger(&rot_state->common_attributes); > > -error_unreg_buffer_funcs: > > - iio_triggered_buffer_cleanup(indio_dev); > > + hid_sensor_remove_trigger(indio_dev, &rot_state- > > >common_attributes); > > return ret; > > } > > > > @@ -338,8 +329,7 @@ static int hid_dev_rot_remove(struct > > platform_device *pdev) > > > > sensor_hub_remove_callback(hsdev, hsdev->usage); > > iio_device_unregister(indio_dev); > > - hid_sensor_remove_trigger(&rot_state->common_attributes); > > - iio_triggered_buffer_cleanup(indio_dev); > > + hid_sensor_remove_trigger(indio_dev, &rot_state- > > >common_attributes); > > > > return 0; > > } > > diff --git a/drivers/iio/pressure/hid-sensor-press.c > > b/drivers/iio/pressure/hid-sensor-press.c > > index 953235052155..5e6663f757ae 100644 > > --- a/drivers/iio/pressure/hid-sensor-press.c > > +++ b/drivers/iio/pressure/hid-sensor-press.c > > @@ -14,8 +14,6 @@ > > #include > > #include > > #include > > -#include > > -#include > > #include "../common/hid-sensors/hid-sensor-trigger.h" > > > > #define CHANNEL_SCAN_INDEX_PRESSURE 0 > > @@ -290,18 +288,13 @@ static int hid_press_probe(struct > > platform_device *pdev) > > indio_dev->name = name; > > indio_dev->modes = INDIO_DIRECT_MODE; > > > > - ret = iio_triggered_buffer_setup(indio_dev, > > &iio_pollfunc_store_time, > > - NULL, NULL); > > - if (ret) { > > - dev_err(&pdev->dev, "failed to initialize trigger > > buffer\n"); > > - goto error_free_dev_mem; > > - } > > atomic_set(&press_state->common_attributes.data_ready, 0); > > + > > ret = hid_sensor_setup_trigger(indio_dev, name, > > &press_state->common_attributes); > > if (ret) { > > dev_err(&pdev->dev, "trigger setup failed\n"); > > - goto error_unreg_buffer_funcs; > > + goto error_free_dev_mem; > > } > > > > ret = iio_device_register(indio_dev); > > @@ -325,9 +318,7 @@ static int hid_press_probe(struct platform_device > > *pdev) > > error_iio_unreg: > > iio_device_unregister(indio_dev); > > error_remove_trigger: > > - hid_sensor_remove_trigger(&press_state->common_attributes); > > -error_unreg_buffer_funcs: > > - iio_triggered_buffer_cleanup(indio_dev); > > + hid_sensor_remove_trigger(indio_dev, &press_state- > > >common_attributes); > > error_free_dev_mem: > > kfree(indio_dev->channels); > > return ret; > > @@ -342,8 +333,7 @@ static int hid_press_remove(struct > > platform_device *pdev) > > > > sensor_hub_remove_callback(hsdev, HID_USAGE_SENSOR_PRESSURE); > > iio_device_unregister(indio_dev); > > - hid_sensor_remove_trigger(&press_state->common_attributes); > > - iio_triggered_buffer_cleanup(indio_dev); > > + hid_sensor_remove_trigger(indio_dev, &press_state- > > >common_attributes); > > kfree(indio_dev->channels); > > > > return 0; > > diff --git a/drivers/iio/temperature/hid-sensor-temperature.c > > b/drivers/iio/temperature/hid-sensor-temperature.c > > index eda55b9c1e9b..8d1f434f109d 100644 > > --- a/drivers/iio/temperature/hid-sensor-temperature.c > > +++ b/drivers/iio/temperature/hid-sensor-temperature.c > > @@ -7,8 +7,6 @@ > > #include > > #include > > #include > > -#include > > -#include > > #include > > #include > > > > @@ -230,12 +228,8 @@ static int hid_temperature_probe(struct > > platform_device *pdev) > > indio_dev->name = name; > > indio_dev->modes = INDIO_DIRECT_MODE; > > > > - ret = devm_iio_triggered_buffer_setup(&pdev->dev, indio_dev, > > - &iio_pollfunc_store_time, NULL, > > NULL); > > - if (ret) > > - return ret; > > - > > atomic_set(&temp_st->common_attributes.data_ready, 0); > > + > > ret = hid_sensor_setup_trigger(indio_dev, name, > > &temp_st->common_attributes); > > if (ret) > > @@ -258,7 +252,7 @@ static int hid_temperature_probe(struct > > platform_device *pdev) > > error_remove_callback: > > sensor_hub_remove_callback(hsdev, > > HID_USAGE_SENSOR_TEMPERATURE); > > error_remove_trigger: > > - hid_sensor_remove_trigger(&temp_st->common_attributes); > > + hid_sensor_remove_trigger(indio_dev, &temp_st- > > >common_attributes); > > return ret; > > } > > > > @@ -270,7 +264,7 @@ static int hid_temperature_remove(struct > > platform_device *pdev) > > struct temperature_state *temp_st = iio_priv(indio_dev); > > > > sensor_hub_remove_callback(hsdev, > > HID_USAGE_SENSOR_TEMPERATURE); > > - hid_sensor_remove_trigger(&temp_st->common_attributes); > > + hid_sensor_remove_trigger(indio_dev, &temp_st- > > >common_attributes); > > > > return 0; > > } >