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=-7.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 3809AC48BE7 for ; Sat, 22 Jun 2019 10:13:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 03C04206B7 for ; Sat, 22 Jun 2019 10:13:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561198396; bh=P838qqKIByvC2ij1sQPICo8DwqDcy/iHlmBWgZupFkg=; h=Date:From:To:Cc:Subject:In-Reply-To:References:List-ID:From; b=Ga8OlCsv2e5aSZITpEzuSBRDDOcsC0SohXZPfJA11WyWWdX9p9XF1knzXwKL0dwHd dwIM2dlPvzZrL94Fk+SyhoBqIGECd5ezOKthE9+w7Kq011YZ2NAV8vr2J8KRE/6Ae8 qoszIiIfSheiOFc6FAQExuVNjH9VJUJ/kI/SlmF0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726365AbfFVKNO (ORCPT ); Sat, 22 Jun 2019 06:13:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:60098 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726138AbfFVKNO (ORCPT ); Sat, 22 Jun 2019 06:13:14 -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 64C7D20665; Sat, 22 Jun 2019 10:13:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561198392; bh=P838qqKIByvC2ij1sQPICo8DwqDcy/iHlmBWgZupFkg=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=SCKAaijZO5plNFaQ/v2AZDMWeC4T3XzrvBXn67PQzExDgO1vd9CXztV7XYfvrXfvA 5B6PPKXbi0vngUoWjnrRL7FKRst9z5LaAKSLQvDurr3hWfqhoofeoyPJn//8q8YwJc nY8/JAgdQa6sNZ7WT4JqMUkUYisF56gXK27l/1+Y= Date: Sat, 22 Jun 2019 11:13:08 +0100 From: Jonathan Cameron To: Fabien Lahoudere Cc: kernel@collabora.com, Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald-Stadler , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v3 3/8] iio: common: cros_ec_sensors: move registration to core Message-ID: <20190622111308.524a2c75@archlinux> In-Reply-To: <2edb6d26030dbde1952bc1b25b6ca666233adfac.1560848479.git.fabien.lahoudere@collabora.com> References: <2edb6d26030dbde1952bc1b25b6ca666233adfac.1560848479.git.fabien.lahoudere@collabora.com> X-Mailer: Claws Mail 3.17.3 (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 Tue, 18 Jun 2019 11:06:34 +0200 Fabien Lahoudere wrote: > In order to simplify derivated drivers from cros_ec_sensors_core, > a new core function is created to registered IIO stricture. > > Signed-off-by: Fabien Lahoudere This one looks good to me. I'll pick it up once the minor stuff in other patches is sorted. Thanks, Jonathan > --- > .../common/cros_ec_sensors/cros_ec_sensors.c | 9 +- > .../cros_ec_sensors/cros_ec_sensors_core.c | 97 ++++++++++++------- > drivers/iio/light/cros_ec_light_prox.c | 7 +- > drivers/iio/pressure/cros_ec_baro.c | 7 +- > .../linux/iio/common/cros_ec_sensors_core.h | 16 ++- > 5 files changed, 72 insertions(+), 64 deletions(-) > > diff --git a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c > index 897dc83a3355..c4bee9265246 100644 > --- a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c > +++ b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c > @@ -14,7 +14,7 @@ > #include > #include > #include > -#include > + > #include > #include > #include > @@ -233,12 +233,7 @@ static int cros_ec_sensors_probe(struct platform_device *pdev) > else > state->core.read_ec_sensors_data = cros_ec_sensors_read_cmd; > > - ret = devm_iio_triggered_buffer_setup(dev, indio_dev, NULL, > - cros_ec_sensors_capture, NULL); > - if (ret) > - return ret; > - > - return devm_iio_device_register(dev, indio_dev); > + return cros_ec_sensors_core_register(pdev, indio_dev); > } > > static const struct platform_device_id cros_ec_sensors_ids[] = { > diff --git a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c > index e5181e007dd7..3880849c5cca 100644 > --- a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c > +++ b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c > @@ -12,6 +12,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -95,6 +96,67 @@ int cros_ec_sensors_core_init(struct platform_device *pdev, > } > EXPORT_SYMBOL_GPL(cros_ec_sensors_core_init); > > +/** > + * cros_ec_sensors_capture() - the trigger handler function > + * @irq: the interrupt number. > + * @p: a pointer to the poll function. > + * > + * On a trigger event occurring, if the pollfunc is attached then this > + * handler is called as a threaded interrupt (and hence may sleep). It > + * is responsible for grabbing data from the device and pushing it into > + * the associated buffer. > + * > + * Return: IRQ_HANDLED > + */ > +static irqreturn_t cros_ec_sensors_capture(int irq, void *p) > +{ > + struct iio_poll_func *pf = p; > + struct iio_dev *indio_dev = pf->indio_dev; > + struct cros_ec_sensors_core_state *st = iio_priv(indio_dev); > + int ret; > + > + mutex_lock(&st->cmd_lock); > + > + /* Clear capture data. */ > + memset(st->samples, 0, indio_dev->scan_bytes); > + > + /* Read data based on which channels are enabled in scan mask. */ > + ret = st->read_ec_sensors_data(indio_dev, > + *indio_dev->active_scan_mask, > + (s16 *)st->samples); > + if (ret < 0) > + goto done; > + > + iio_push_to_buffers_with_timestamp(indio_dev, st->samples, > + iio_get_time_ns(indio_dev)); > + > +done: > + /* > + * Tell the core we are done with this trigger and ready for the > + * next one. > + */ > + iio_trigger_notify_done(indio_dev->trig); > + > + mutex_unlock(&st->cmd_lock); > + > + return IRQ_HANDLED; > +} > + > +int cros_ec_sensors_core_register(struct platform_device *pdev, > + struct iio_dev *indio_dev) > +{ > + int ret; > + struct device *dev = &pdev->dev; > + > + ret = devm_iio_triggered_buffer_setup(dev, indio_dev, NULL, > + cros_ec_sensors_capture, NULL); > + if (ret) > + return ret; > + > + return devm_iio_device_register(dev, indio_dev); > +} > +EXPORT_SYMBOL_GPL(cros_ec_sensors_core_register); > + > int cros_ec_motion_send_host_cmd(struct cros_ec_sensors_core_state *state, > u16 opt_length) > { > @@ -380,41 +442,6 @@ int cros_ec_sensors_read_cmd(struct iio_dev *indio_dev, > } > EXPORT_SYMBOL_GPL(cros_ec_sensors_read_cmd); > > -irqreturn_t cros_ec_sensors_capture(int irq, void *p) > -{ > - struct iio_poll_func *pf = p; > - struct iio_dev *indio_dev = pf->indio_dev; > - struct cros_ec_sensors_core_state *st = iio_priv(indio_dev); > - int ret; > - > - mutex_lock(&st->cmd_lock); > - > - /* Clear capture data. */ > - memset(st->samples, 0, indio_dev->scan_bytes); > - > - /* Read data based on which channels are enabled in scan mask. */ > - ret = st->read_ec_sensors_data(indio_dev, > - *(indio_dev->active_scan_mask), > - (s16 *)st->samples); > - if (ret < 0) > - goto done; > - > - iio_push_to_buffers_with_timestamp(indio_dev, st->samples, > - iio_get_time_ns(indio_dev)); > - > -done: > - /* > - * Tell the core we are done with this trigger and ready for the > - * next one. > - */ > - iio_trigger_notify_done(indio_dev->trig); > - > - mutex_unlock(&st->cmd_lock); > - > - return IRQ_HANDLED; > -} > -EXPORT_SYMBOL_GPL(cros_ec_sensors_capture); > - > int cros_ec_sensors_core_read(struct cros_ec_sensors_core_state *st, > struct iio_chan_spec const *chan, > int *val, int *val2, long mask) > diff --git a/drivers/iio/light/cros_ec_light_prox.c b/drivers/iio/light/cros_ec_light_prox.c > index 32ea5afd495f..682dc19c2bf3 100644> --- a/drivers/iio/light/cros_ec_light_prox.c > +++ b/drivers/iio/light/cros_ec_light_prox.c > @@ -215,12 +215,7 @@ static int cros_ec_light_prox_probe(struct platform_device *pdev) > > state->core.read_ec_sensors_data = cros_ec_sensors_read_cmd; > > - ret = devm_iio_triggered_buffer_setup(dev, indio_dev, NULL, > - cros_ec_sensors_capture, NULL); > - if (ret) > - return ret; > - > - return devm_iio_device_register(dev, indio_dev); > + return cros_ec_sensors_core_register(pdev, indio_dev); > } > > static const struct platform_device_id cros_ec_light_prox_ids[] = { > diff --git a/drivers/iio/pressure/cros_ec_baro.c b/drivers/iio/pressure/cros_ec_baro.c > index 8718036d74d2..9d3745bc2fba 100644 > --- a/drivers/iio/pressure/cros_ec_baro.c > +++ b/drivers/iio/pressure/cros_ec_baro.c > @@ -152,12 +152,7 @@ static int cros_ec_baro_probe(struct platform_device *pdev) > > state->core.read_ec_sensors_data = cros_ec_sensors_read_cmd; > > - ret = devm_iio_triggered_buffer_setup(dev, indio_dev, NULL, > - cros_ec_sensors_capture, NULL); > - if (ret) > - return ret; > - > - return devm_iio_device_register(dev, indio_dev); > + return cros_ec_sensors_core_register(pdev, indio_dev); > } > > static const struct platform_device_id cros_ec_baro_ids[] = { > diff --git a/include/linux/iio/common/cros_ec_sensors_core.h b/include/linux/iio/common/cros_ec_sensors_core.h > index 485c649b421f..60f40d253f4a 100644 > --- a/include/linux/iio/common/cros_ec_sensors_core.h > +++ b/include/linux/iio/common/cros_ec_sensors_core.h > @@ -116,18 +116,14 @@ int cros_ec_sensors_core_init(struct platform_device *pdev, > bool physical_device); > > /** > - * cros_ec_sensors_capture() - the trigger handler function > - * @irq: the interrupt number. > - * @p: a pointer to the poll function. > - * > - * On a trigger event occurring, if the pollfunc is attached then this > - * handler is called as a threaded interrupt (and hence may sleep). It > - * is responsible for grabbing data from the device and pushing it into > - * the associated buffer. > + * cros_ec_sensors_core_register() - registration of the core structure > + * @pdev: platform device created for the sensors > + * @indio_dev: iio device structure of the device > * > - * Return: IRQ_HANDLED > + * Return: 0 on success, -errno on failure. > */ > -irqreturn_t cros_ec_sensors_capture(int irq, void *p); > +int cros_ec_sensors_core_register(struct platform_device *pdev, > + struct iio_dev *indio_dev); > > /** > * cros_ec_core_channel_init() - initialize channel