Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp1931912imu; Sat, 5 Jan 2019 10:10:22 -0800 (PST) X-Google-Smtp-Source: AFSGD/WPXHlCuqgYf0YG31w4EsYtIVjNRn+NiRBfuH7FOvtiY9sD9PVE7U9p4T0YhGZD/fro63Q3 X-Received: by 2002:a62:fc8a:: with SMTP id e132mr55949485pfh.176.1546711822591; Sat, 05 Jan 2019 10:10:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546711822; cv=none; d=google.com; s=arc-20160816; b=QT7ZDEUDRf8lYGPSNcUGJJ9wVBufSeGQTeH7Zb4Zf2B3oqPKRfHCiyZp70iFSjDpGb 0bQL4m2OUGRQmjpViSUu5sP2HDfJMQWpisKfru+dKEol9qIxY42MTdswk6Vr+lmaNZus RMebyXp+frZJyXriPc+tvyilqPl/ozYpvRU5CtwI1R/aps84g7Uc7HqOT6uMYX2TaIoC duC6KeY4XGtKcnqVzF80sN7xQMNU6lUU3UNp1U7cwJucvwjp1nQR5T6dryFLbCs/FZv9 Yvc/uCMagbzgS9S9s3y0AgVmtRhQdX6ghncLJSt61VfMOo2/a+jkFB9rBRp0AOso9uwZ F11A== 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=h9In7mhrAGs9l1p05drdLtm7UWzXZxyLd04Zp4jQZpQ=; b=fjV2JZ1kWXkqNzIq5qK4my9Nh3uAdNpEOFD1gdx1LJrzOYGpPncDl5UcNG+ZMJ7CCi TOvxilNm2dr2rROqOG+hIXNbGxE+0Vr1MD1E++qfrtRd8ljXwoYKHyuzSRxKNOSxtHaw O9kKAX3FsMK3RhaODTfFpns/Y6GBqtzZ+WVMWDB6yGhZb0PWGM3i0gBs7XdHCPpQ0wHR lXMAGsjeQeD+DKj60HGwcfKB9JMuA5S8t5PGN0rTCGzfjARCWltgZV9XGlwwFu9kHxcr ttm3/R7jcSXUxzXHyTDkGiHBEQzOUA82aY3hXw8bu5sBwA5jIPeGuFhLokR3Op3uCpuZ fTqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="1Eykxu/c"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 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. [209.132.180.67]) by mx.google.com with ESMTP id 3si1011077plv.258.2019.01.05.10.10.04; Sat, 05 Jan 2019 10:10:22 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="1Eykxu/c"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 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 S1726471AbfAERxp (ORCPT + 99 others); Sat, 5 Jan 2019 12:53:45 -0500 Received: from mail.kernel.org ([198.145.29.99]:37784 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726341AbfAERxo (ORCPT ); Sat, 5 Jan 2019 12:53:44 -0500 Received: from archlinux (cpc91196-cmbg18-2-0-cust659.5-4.cable.virginm.net [81.96.234.148]) (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 8752E2190B; Sat, 5 Jan 2019 17:53:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1546710823; bh=fBmnBCilQeUS+a7gGRkDLxYTiIHeVZeqVYECE9gZlYo=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=1Eykxu/cJ1X2bCFVTmlDUyk+SjQOFk7MRqrmSrl5COh735nvIJfplZaIt0xPhK5RW VJQBHtQDtp09dbyorPF4Y9SrPQujYlXQeNvgMN4oliz90U/kJvvF5UMZqfQN9DBep0 PKoY8535YNce97LGqQaF+c3HmjcNOJQCpWCQYouo= Date: Sat, 5 Jan 2019 17:53:38 +0000 From: Jonathan Cameron To: Jeremy Fertic Cc: Lars-Peter Clausen , Michael Hennerich , Hartmut Knaack , Peter Meerwald-Stadler , Greg Kroah-Hartman , linux-iio@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Shreeya Patel Subject: Re: [PATCH v2 2/4] staging: iio: adt7316: fix handling of dac high resolution option Message-ID: <20190105175338.3c458312@archlinux> In-Reply-To: <20181223045743.10716-3-jeremyfertic@gmail.com> References: <20181223045743.10716-1-jeremyfertic@gmail.com> <20181223045743.10716-3-jeremyfertic@gmail.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 Sat, 22 Dec 2018 21:57:41 -0700 Jeremy Fertic wrote: > The adt7316/7 and adt7516/7 have the option to output voltage proportional > to temperature on dac a and/or dac b. The default dac resolution in this > mode is 8 bits with the dac high resolution option enabling 10 bits. None > of these settings affect dacs c and d. Remove the "1 (12 bits)" output from > the show function since that is not an option for this mode. Return > "1 (10 bits)" if the device is one of the above mentioned chips and the dac > high resolution mode is enabled. > > In the store function, the driver currently allows the user to write to the > ADT7316_DA_HIGH_RESOLUTION bit regardless of the device in use. Add a check > to return an error in the case of an adt7318 or adt7519. Remove the else > statement that clears the ADT7316_DA_HIGH_RESOLUTION bit. Instead, clear it > before conditionally enabling it, depending on user input. This matches the > typical pattern in the driver when an attribute is a boolean. > > Fixes: 35f6b6b86ede ("staging: iio: new ADT7316/7/8 and ADT7516/7/9 driver") > Signed-off-by: Jeremy Fertic Applied to the togreg branch of iio.git and pushed out as testing for the autobuilders to play with it. Thanks, Jonathan > --- > drivers/staging/iio/addac/adt7316.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/staging/iio/addac/adt7316.c b/drivers/staging/iio/addac/adt7316.c > index e17c1cb12c94..80cc3420036b 100644 > --- a/drivers/staging/iio/addac/adt7316.c > +++ b/drivers/staging/iio/addac/adt7316.c > @@ -633,9 +633,7 @@ static ssize_t adt7316_show_da_high_resolution(struct device *dev, > struct adt7316_chip_info *chip = iio_priv(dev_info); > > if (chip->config3 & ADT7316_DA_HIGH_RESOLUTION) { > - if (chip->id == ID_ADT7316 || chip->id == ID_ADT7516) > - return sprintf(buf, "1 (12 bits)\n"); > - if (chip->id == ID_ADT7317 || chip->id == ID_ADT7517) > + if (chip->id != ID_ADT7318 && chip->id != ID_ADT7519) > return sprintf(buf, "1 (10 bits)\n"); > } > > @@ -652,10 +650,12 @@ static ssize_t adt7316_store_da_high_resolution(struct device *dev, > u8 config3; > int ret; > > + if (chip->id == ID_ADT7318 || chip->id == ID_ADT7519) > + return -EPERM; > + > + config3 = chip->config3 & (~ADT7316_DA_HIGH_RESOLUTION); > if (buf[0] == '1') > - config3 = chip->config3 | ADT7316_DA_HIGH_RESOLUTION; > - else > - config3 = chip->config3 & (~ADT7316_DA_HIGH_RESOLUTION); > + config3 |= ADT7316_DA_HIGH_RESOLUTION; > > ret = chip->bus.write(chip->bus.client, ADT7316_CONFIG3, config3); > if (ret)