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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 490D5C3DA79 for ; Fri, 23 Dec 2022 14:57:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236343AbiLWO5w (ORCPT ); Fri, 23 Dec 2022 09:57:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41888 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229658AbiLWO5v (ORCPT ); Fri, 23 Dec 2022 09:57:51 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 31D451A049; Fri, 23 Dec 2022 06:57:50 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id DA8A8B820E0; Fri, 23 Dec 2022 14:57:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 15B2AC433D2; Fri, 23 Dec 2022 14:57:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1671807467; bh=TQWxidYrlI/SiI8m75A6AtmjyWJHQINM1oWKLdyOJ/I=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=b8SA5eNAO9B7m3C+G6qZruh98lYBFgBE4/PWEEF9gWQtDZdEaBtonXgjh/sGSf4cG xwldJDSx/cFRjgKUo2yZeDVBs6esEgJMnTwN0Xop6tEoUureEGiBjNORebIh7qako9 jN8O6HxIxTx6AeGuWuURI4zHkPZF5rmOGO1rwVJidn+qMYf8sR1aWKOdx+lRTsaRZk 25l96CqWlSia3GFIhhqkCkublAjgQizqo5GpCdb2XKR99mZU2CPZ1c+5Bz/qJnjCpx wP8lV7gxXhB/woGLFTTARxDAxTlaIVCuirdMDlv7F39J2n+uDilkfDnW8gfJLuXBNv jqLTfeHuLSLvw== Date: Fri, 23 Dec 2022 15:10:56 +0000 From: Jonathan Cameron To: Marco Felsch Cc: puranjay12@gmail.com, lars@metafoo.de, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, linux-iio@vger.kernel.org, devicetree@vger.kernel.org, kernel@pengutronix.de Subject: Re: [PATCH v2 3/4] iio: temperature: tmp117: add TI TMP116 support Message-ID: <20221223151056.4f7d4b7e@jic23-huawei> In-Reply-To: <20221221092801.1977499-4-m.felsch@pengutronix.de> References: <20221221092801.1977499-1-m.felsch@pengutronix.de> <20221221092801.1977499-4-m.felsch@pengutronix.de> X-Mailer: Claws Mail 4.1.1 (GTK 3.24.35; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org On Wed, 21 Dec 2022 10:28:00 +0100 Marco Felsch wrote: > The TMP116 is the predecessor of the TMP117. The TMP116 don't support > custom offset calibration data, instead this register is used as generic > EEPROM storage as well. > > Signed-off-by: Marco Felsch A few comments inline. Thanks, Jonathan > --- > v2: > - no changes > > drivers/iio/temperature/tmp117.c | 40 ++++++++++++++++++++++---------- > 1 file changed, 28 insertions(+), 12 deletions(-) > > diff --git a/drivers/iio/temperature/tmp117.c b/drivers/iio/temperature/tmp117.c > index f9b8f2b570f6..468dafa6fa8e 100644 > --- a/drivers/iio/temperature/tmp117.c > +++ b/drivers/iio/temperature/tmp117.c > @@ -31,9 +31,11 @@ > #define TMP117_REG_DEVICE_ID 0xF > > #define TMP117_RESOLUTION_10UC 78125 > -#define TMP117_DEVICE_ID 0x0117 > #define MICRODEGREE_PER_10MILLIDEGREE 10000 > > +#define TMP116_DEVICE_ID 0x1116 > +#define TMP117_DEVICE_ID 0x0117 > + > struct tmp117_data { > struct i2c_client *client; > s16 calibbias; > @@ -105,6 +107,13 @@ static const struct iio_chan_spec tmp117_channels[] = { > .type = IIO_TEMP, > .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | > BIT(IIO_CHAN_INFO_CALIBBIAS) | BIT(IIO_CHAN_INFO_SCALE), > +}; > + > +static const struct iio_chan_spec tmp116_channels[] = { > + { > + .type = IIO_TEMP, > + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | > + BIT(IIO_CHAN_INFO_SCALE), > }, > }; > > @@ -118,27 +127,28 @@ static int tmp117_identify(struct i2c_client *client) > int dev_id; > > dev_id = i2c_smbus_read_word_swapped(client, TMP117_REG_DEVICE_ID); > - if (dev_id < 0) Keep this handling of the smbus read returning an error. Otherwise, you end up replacing the error code with -ENODEV rather than returning what actually happened. if (dev_id < 0) return dev_id; switch (dev_id) { ... > + switch (dev_id) { > + case TMP116_DEVICE_ID: > + case TMP117_DEVICE_ID: > return dev_id; > - if (dev_id != TMP117_DEVICE_ID) { > - dev_err(&client->dev, "TMP117 not found\n"); > + default: > + dev_err(&client->dev, "TMP116/117 not found\n"); > return -ENODEV; > } > - return 0; > } > > static int tmp117_probe(struct i2c_client *client) > { > struct tmp117_data *data; > struct iio_dev *indio_dev; > - int ret; > + int dev_id; > > if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_WORD_DATA)) > return -EOPNOTSUPP; > > - ret = tmp117_identify(client); > - if (ret < 0) > - return ret; > + dev_id = tmp117_identify(client); > + if (dev_id < 0) > + return dev_id; > > indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data)); > if (!indio_dev) > @@ -148,12 +158,18 @@ static int tmp117_probe(struct i2c_client *client) > data->client = client; > data->calibbias = 0; > > - indio_dev->name = "tmp117"; > indio_dev->modes = INDIO_DIRECT_MODE; > indio_dev->info = &tmp117_info; > > - indio_dev->channels = tmp117_channels; > - indio_dev->num_channels = ARRAY_SIZE(tmp117_channels); > + if (dev_id == TMP117_DEVICE_ID) { Probably better to assume we may get more parts in future and use a switch statement here to explicitly match each value. > + indio_dev->channels = tmp117_channels; > + indio_dev->num_channels = ARRAY_SIZE(tmp117_channels); > + indio_dev->name = "tmp117"; > + } else { > + indio_dev->channels = tmp116_channels; > + indio_dev->num_channels = ARRAY_SIZE(tmp116_channels); > + indio_dev->name = "tmp116"; > + } > > return devm_iio_device_register(&client->dev, indio_dev); > }