From patchwork Fri May 3 06:21:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 241202 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-ve0-x239.google.com (mail-ve0-x239.google.com [IPv6:2607:f8b0:400c:c01::239]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 5F53A2C00AF for ; Fri, 3 May 2013 16:35:30 +1000 (EST) Received: by mail-ve0-f185.google.com with SMTP id pb11sf364094veb.12 for ; Thu, 02 May 2013 23:35:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20120806; h=x-received:mime-version:x-beenthere:x-received:received-spf :x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-original-sender:x-original-authentication-results :reply-to:precedence:mailing-list:list-id:x-google-group-id :list-post:list-help:list-archive:sender:list-subscribe :list-unsubscribe:content-type; bh=xzB4YmR8BqEpSZJT2XEGEtqLx+3uwSQR41IO5IlN66o=; b=cu01PUQyfQhpxiBlR2Wgo1la7GgTLxCcBtuB3MmvNEkClO/e/QrymMudN6fGpeM/H/ 30rufn3RZ9iKy4bsUEvxiolzJn293UVjVUwAaYnpcCqjOctNYVp70KugcumXO5E2WUL1 M+GtmlcYhVXMoXRC3VPRvnae3pKFrafvLBtQmNfLqLUWnUeprRZsGvp5nwU4Bql6JHYs OBcGC1vuSJ0yDJ7rRY/WdGMaLaZoEbmVVBpHcdVEFF2rvtRhuPQxyzYgVKaubJjOJ94q 6+3GF5WJH8bWKYw3IeVkLoffqH32R2/3JuZp+b/qZTZO9xUXpnxpW6PRx7y0/jkdtuoy 6goQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:mime-version:x-beenthere:x-received:received-spf :x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state:x-original-sender :x-original-authentication-results:reply-to:precedence:mailing-list :list-id:x-google-group-id:list-post:list-help:list-archive:sender :list-subscribe:list-unsubscribe:content-type; bh=xzB4YmR8BqEpSZJT2XEGEtqLx+3uwSQR41IO5IlN66o=; b=J2R60krSQxKu1N7G8Br8M5wwzVxqmD2nO9lECWTq8WhVaaRWGg1YKBQTeGEXa14FFD j03vNqDs4tMO8H3ZISHg7HPI9bZWEdrMqdXOkxz7hiPwWl3HzVRZnpeMBoioZ9HHzPPu xl7IXfFJhJ0msCfw0rCjsGDDjqXQ1eR+U7LfhPgOZKlDIptVcgvMxuymJMlDleewYKCo 44n44Yu1D49hG1ZOAzO+NTwPTo+rSQ5SHqiXm3h5/dgZ/e24/U+xq4B8sC3jkLK4r3lA 04Qxm6itKfkDwrzMa7IlVYp6SRH89ESV5cvFVjiI1YJoNFPfWBd15M8gcwHWLLRn3Sou q8nQ== X-Received: by 10.50.178.210 with SMTP id da18mr2638287igc.2.1367562927477; Thu, 02 May 2013 23:35:27 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: rtc-linux@googlegroups.com Received: by 10.50.195.129 with SMTP id ie1ls252985igc.35.gmail; Thu, 02 May 2013 23:35:27 -0700 (PDT) X-Received: by 10.68.137.71 with SMTP id qg7mr3870827pbb.5.1367562927154; Thu, 02 May 2013 23:35:27 -0700 (PDT) Received: from mail-pd0-f170.google.com (mail-pd0-f170.google.com [209.85.192.170]) by gmr-mx.google.com with ESMTPS id fn10si1786249pab.1.2013.05.02.23.35.27 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 02 May 2013 23:35:27 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.192.170 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) client-ip=209.85.192.170; Received: by mail-pd0-f170.google.com with SMTP id 10so759760pdi.15 for ; Thu, 02 May 2013 23:35:27 -0700 (PDT) X-Received: by 10.66.163.165 with SMTP id yj5mr13279239pab.30.1367562927067; Thu, 02 May 2013 23:35:27 -0700 (PDT) Received: from linaro.sisodomain.com ([115.113.119.130]) by mx.google.com with ESMTPSA id kr7sm11485494pab.23.2013.05.02.23.35.24 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 02 May 2013 23:35:26 -0700 (PDT) From: Sachin Kamat To: rtc-linux@googlegroups.com Cc: a.zummo@towertech.it, akpm@linux-foundation.org, sachin.kamat@linaro.org Subject: [rtc-linux] [PATCH 26/26] drivers/rtc/rtc-x1205.c: Fix checkpatch issues Date: Fri, 3 May 2013 11:51:16 +0530 Message-Id: <1367562076-25713-27-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1367562076-25713-1-git-send-email-sachin.kamat@linaro.org> References: <1367562076-25713-1-git-send-email-sachin.kamat@linaro.org> X-Gm-Message-State: ALoCoQnAQ2/s5ZUhPXR2UKOKCeqcGTRCvKNvCXtjpeRR4H06QvSULR5cAEFtcJInWx/68bTet/y3 X-Original-Sender: sachin.kamat@linaro.org X-Original-Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 209.85.192.170 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) smtp.mail=sachin.kamat@linaro.org Reply-To: rtc-linux@googlegroups.com Precedence: list Mailing-list: list rtc-linux@googlegroups.com; contact rtc-linux+owners@googlegroups.com List-ID: X-Google-Group-Id: 712029733259 List-Post: , List-Help: , List-Archive: Sender: rtc-linux@googlegroups.com List-Subscribe: , List-Unsubscribe: , Fixes the following types of issues: ERROR: do not use assignment in if condition ERROR: open brace '{' following struct go on the same line ERROR: else should follow close brace '}' WARNING: please, no space before tabs Signed-off-by: Sachin Kamat --- drivers/rtc/rtc-x1205.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/drivers/rtc/rtc-x1205.c b/drivers/rtc/rtc-x1205.c index fa9b067..365dc65 100644 --- a/drivers/rtc/rtc-x1205.c +++ b/drivers/rtc/rtc-x1205.c @@ -4,7 +4,7 @@ * Copyright 2005 Alessandro Zummo * * please send all reports to: - * Karen Spearel + * Karen Spearel * Alessandro Zummo * * based on a lot of other RTC drivers. @@ -215,12 +215,14 @@ static int x1205_set_datetime(struct i2c_client *client, struct rtc_time *tm, buf[i] |= 0x80; /* this sequence is required to unlock the chip */ - if ((xfer = i2c_master_send(client, wel, 3)) != 3) { + xfer = i2c_master_send(client, wel, 3); + if (xfer != 3) { dev_err(&client->dev, "%s: wel - %d\n", __func__, xfer); return -EIO; } - if ((xfer = i2c_master_send(client, rwel, 3)) != 3) { + xfer = i2c_master_send(client, rwel, 3); + if (xfer != 3) { dev_err(&client->dev, "%s: rwel - %d\n", __func__, xfer); return -EIO; } @@ -269,7 +271,8 @@ static int x1205_set_datetime(struct i2c_client *client, struct rtc_time *tm, } /* disable further writes */ - if ((xfer = i2c_master_send(client, diswe, 3)) != 3) { + xfer = i2c_master_send(client, diswe, 3); + if (xfer != 3) { dev_err(&client->dev, "%s: diswe - %d\n", __func__, xfer); return -EIO; } @@ -375,8 +378,7 @@ static int x1205_get_atrim(struct i2c_client *client, int *trim) return 0; } -struct x1205_limit -{ +struct x1205_limit { unsigned char reg, mask, min, max; }; @@ -430,7 +432,8 @@ static int x1205_validate_client(struct i2c_client *client) }, }; - if ((xfer = i2c_transfer(client->adapter, msgs, 2)) != 2) { + xfer = i2c_transfer(client->adapter, msgs, 2); + if (xfer != 2) { dev_err(&client->dev, "%s: could not read register %x\n", __func__, probe_zero_pattern[i]); @@ -467,7 +470,8 @@ static int x1205_validate_client(struct i2c_client *client) }, }; - if ((xfer = i2c_transfer(client->adapter, msgs, 2)) != 2) { + xfer = i2c_transfer(client->adapter, msgs, 2); + if (xfer != 2) { dev_err(&client->dev, "%s: could not read register %x\n", __func__, probe_limits_pattern[i].reg); @@ -548,10 +552,12 @@ static int x1205_rtc_proc(struct device *dev, struct seq_file *seq) { int err, dtrim, atrim; - if ((err = x1205_get_dtrim(to_i2c_client(dev), &dtrim)) == 0) + err = x1205_get_dtrim(to_i2c_client(dev), &dtrim); + if (!err) seq_printf(seq, "digital_trim\t: %d ppm\n", dtrim); - if ((err = x1205_get_atrim(to_i2c_client(dev), &atrim)) == 0) + err = x1205_get_atrim(to_i2c_client(dev), &atrim); + if (!err) seq_printf(seq, "analog_trim\t: %d.%02d pF\n", atrim / 1000, atrim % 1000); return 0; @@ -639,7 +645,8 @@ static int x1205_probe(struct i2c_client *client, i2c_set_clientdata(client, rtc); /* Check for power failures and eventually enable the osc */ - if ((err = x1205_get_status(client, &sr)) == 0) { + err = x1205_get_status(client, &sr); + if (!err) { if (sr & X1205_SR_RTCF) { dev_err(&client->dev, "power failure detected, " @@ -647,9 +654,9 @@ static int x1205_probe(struct i2c_client *client, udelay(50); x1205_fix_osc(client); } - } - else + } else { dev_err(&client->dev, "couldn't read status\n"); + } err = x1205_sysfs_register(&client->dev); if (err)