From patchwork Wed Jul 12 21:41:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaghathiswari Rankappagounder Natarajan X-Patchwork-Id: 9837445 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 527C760393 for ; Wed, 12 Jul 2017 21:41:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3710828647 for ; Wed, 12 Jul 2017 21:41:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2BBCB286B2; Wed, 12 Jul 2017 21:41:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A0C4628647 for ; Wed, 12 Jul 2017 21:41:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754158AbdGLVlk (ORCPT ); Wed, 12 Jul 2017 17:41:40 -0400 Received: from mail-pf0-f180.google.com ([209.85.192.180]:35558 "EHLO mail-pf0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754526AbdGLVl0 (ORCPT ); Wed, 12 Jul 2017 17:41:26 -0400 Received: by mail-pf0-f180.google.com with SMTP id c73so19011073pfk.2 for ; Wed, 12 Jul 2017 14:41:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=G3tnCT4a0RVvv0XUEFPCDGxKMm1+LkS8QqooblJY5EE=; b=MIFImOZho8ON/zC9cpPdg3QK1JmDWliSlW7xlg5mF/u3LtD/pTomsXjuJ3qUsUVpk8 W2fWR2atxkRsX6yveyDZbLzsAxzgQMgEO0DgXRtU6CfPGIJSUlIxvcaf6HYitelTqGcR pL4PGc9T8BgEdHL9mAesPpbGQJHo5umOi7M1PooslBiw0hGfyKaBLds8FnMCHXwoN/5d r5NYgb7TdYQYkwGnfCeNU6X6udxq1OUJrQOdOb0wumx18ZlBiai6F3T51ZWFKyVN3Boz mJNuPXw5kFxkbmdX4okCp2AReu4VV+9jYQAlY7eDpHn8yvPhBJ24H7ButiUC/UMjr6qH td4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=G3tnCT4a0RVvv0XUEFPCDGxKMm1+LkS8QqooblJY5EE=; b=B/gBCY2CWN5abkOyRUN5oZmx3ZYIvQFU8G0lvBeC51kkEA1utyTnCMDroTEVHYROdh raMoq27WBJ6TupksRly+HEPNeueGtuH/I7XLkI54M1/ZvZgplPyB0zCEPC9M6g+aCcCB c4n78xAvJnlMidMubHtTNtacPtKovELn8OOLAFLZb3h39hqNIYpzZ5ApI77BZ7qEmGFo VWmPsQNEg7udkHMRoH4+7jyoSFi3zrVyyNzemNH7AWjMbp2wrKp4vrftsGUkwZUgj+3P mlZ0RMNehkD5fKyfIgta5qLoYAMB9h612T5sTNGuILamDUi0VRmSZNyXrEdxxZSuHPVE 0L6Q== X-Gm-Message-State: AIVw112L3fw8wqybADOz5ibZ3a0q430Q3Mmix0Kod49E3D4ueXxHfJww rcJHgAwPi+QAQBoa X-Received: by 10.84.176.131 with SMTP id v3mr6548055plb.142.1499895685730; Wed, 12 Jul 2017 14:41:25 -0700 (PDT) Received: from jaghu22.svl.corp.google.com ([100.123.242.38]) by smtp.gmail.com with ESMTPSA id y192sm5515859pgd.38.2017.07.12.14.41.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 12 Jul 2017 14:41:25 -0700 (PDT) From: Jaghathiswari Rankappagounder Natarajan To: zbr@ioremap.net, linux-kernel@vger.kernel.org, linux@roeck-us.net, jdelvare@suse.com, linux-hwmon@vger.kernel.org Cc: Jaghathiswari Rankappagounder Natarajan Subject: [PATCH linux v2 2/3] drivers: w1: refactor w1_slave_show to make the temp reading functionality separate Date: Wed, 12 Jul 2017 14:41:17 -0700 Message-Id: <20170712214118.4306-3-jaghu@google.com> X-Mailer: git-send-email 2.13.2.932.g7449e964c-goog In-Reply-To: <20170712214118.4306-1-jaghu@google.com> References: <20170712214118.4306-1-jaghu@google.com> Sender: linux-hwmon-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Inside the w1_slave_show function refactor the code to read the temp into a separate function. Signed-off-by: Jaghathiswari Rankappagounder Natarajan Acked-by: Evgeniy Polyakov --- v2 - no changes drivers/w1/slaves/w1_therm.c | 82 +++++++++++++++++++++++++++----------------- 1 file changed, 51 insertions(+), 31 deletions(-) -- 2.13.2.932.g7449e964c-goog -- To unsubscribe from this list: send the line "unsubscribe linux-hwmon" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c index 82611f197b0a..88f4cc8c3908 100644 --- a/drivers/w1/slaves/w1_therm.c +++ b/drivers/w1/slaves/w1_therm.c @@ -64,6 +64,12 @@ struct w1_therm_family_data { atomic_t refcnt; }; +struct therm_info { + u8 rom[9]; + u8 crc; + u8 verdict; +}; + /* return the address of the refcnt in the family data */ #define THERM_REFCNT(family_data) \ (&((struct w1_therm_family_data *)family_data)->refcnt) @@ -427,33 +433,23 @@ static ssize_t w1_slave_store(struct device *device, return ret ? : size; } -static ssize_t w1_slave_show(struct device *device, - struct device_attribute *attr, char *buf) +static ssize_t read_therm(struct device *device, + struct w1_slave *sl, struct therm_info *info) { - struct w1_slave *sl = dev_to_w1_slave(device); struct w1_master *dev = sl->master; - u8 rom[9], crc, verdict, external_power; - int i, ret, max_trying = 10; - ssize_t c = PAGE_SIZE; - u8 *family_data = sl->family_data; + u8 external_power; + int ret, max_trying = 10; ret = mutex_lock_interruptible(&dev->bus_mutex); if (ret != 0) goto post_unlock; - if (!sl->family_data) { - ret = -ENODEV; - goto pre_unlock; - } - - /* prevent the slave from going away in sleep */ - atomic_inc(THERM_REFCNT(family_data)); - memset(rom, 0, sizeof(rom)); + memset(info->rom, 0, sizeof(info->rom)); while (max_trying--) { - verdict = 0; - crc = 0; + info->verdict = 0; + info->crc = 0; if (!w1_reset_select_slave(sl)) { int count = 0; @@ -496,30 +492,57 @@ static ssize_t w1_slave_show(struct device *device, if (!w1_reset_select_slave(sl)) { w1_write_8(dev, W1_READ_SCRATCHPAD); - count = w1_read_block(dev, rom, 9); + count = w1_read_block(dev, info->rom, 9); if (count != 9) { dev_warn(device, "w1_read_block() " "returned %u instead of 9.\n", count); } - crc = w1_calc_crc8(rom, 8); + info->crc = w1_calc_crc8(info->rom, 8); - if (rom[8] == crc) - verdict = 1; + if (info->rom[8] == info->crc) + info->verdict = 1; } } - if (verdict) + if (info->verdict) break; } +pre_unlock: + mutex_unlock(&dev->bus_mutex); + +post_unlock: + return ret; +} + +static ssize_t w1_slave_show(struct device *device, + struct device_attribute *attr, char *buf) +{ + struct w1_slave *sl = dev_to_w1_slave(device); + u8 *family_data = sl->family_data; + struct therm_info info; + int ret; + ssize_t c = PAGE_SIZE; + int i; + + if (!sl->family_data) + return -ENODEV; + + /* prevent the slave from going away in sleep */ + atomic_inc(THERM_REFCNT(family_data)); + + ret = read_therm(device, sl, &info); + if (ret) + goto dec_refcnt; + for (i = 0; i < 9; ++i) - c -= snprintf(buf + PAGE_SIZE - c, c, "%02x ", rom[i]); + c -= snprintf(buf + PAGE_SIZE - c, c, "%02x ", info.rom[i]); c -= snprintf(buf + PAGE_SIZE - c, c, ": crc=%02x %s\n", - crc, (verdict) ? "YES" : "NO"); - if (verdict) - memcpy(family_data, rom, sizeof(rom)); + info.crc, (info.verdict) ? "YES" : "NO"); + if (info.verdict) + memcpy(family_data, info.rom, sizeof(info.rom)); else dev_warn(device, "Read failed CRC check\n"); @@ -528,13 +551,10 @@ static ssize_t w1_slave_show(struct device *device, ((u8 *)family_data)[i]); c -= snprintf(buf + PAGE_SIZE - c, c, "t=%d\n", - w1_convert_temp(rom, sl->family->fid)); + w1_convert_temp(info.rom, sl->family->fid)); ret = PAGE_SIZE - c; -pre_unlock: - mutex_unlock(&dev->bus_mutex); - -post_unlock: +dec_refcnt: atomic_dec(THERM_REFCNT(family_data)); return ret; }