From patchwork Wed Jul 12 05:49:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 787008 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3x6p244Fk3z9sNx for ; Wed, 12 Jul 2017 15:50:04 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="HNpYzcrn"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755235AbdGLFuE (ORCPT ); Wed, 12 Jul 2017 01:50:04 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:33698 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750943AbdGLFuD (ORCPT ); Wed, 12 Jul 2017 01:50:03 -0400 Received: by mail-wr0-f195.google.com with SMTP id x23so3216412wrb.0 for ; Tue, 11 Jul 2017 22:50:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:subject:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=lVKR5G9SJGr9ycF71q820iqENiwKs4oOQnJ7doHvmBI=; b=HNpYzcrnePla+BCV0I8yhF4ooVFn+DMH+nmaprLOX//XXHfNDde3fNJHySBB7yZrjv FwwBN9bgBlKlkcdfcRkUX0pVlHr2KR80URBT4B1FQ6bV5pBTMQm0nEzAW026cODVMqne HulOa+pIpYWUpqwR/yDO9cKzC/Ir/0f/stuBJjkcYSpHuWkI2KC8I7BwmZQ7Cpc6NddX Tij2r8lzqrww0VOILIzydAp/QwG1goF6o57nrKVDq2rhkbX2RIoG7woDuPxotCODmCXV N/Bewe8b4Ni/3t0jNMgqQ8cme0nGbFxK0co+NsR6+RTFJSqaKpV8hr6WLAwrijmi21jW mFKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:subject:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=lVKR5G9SJGr9ycF71q820iqENiwKs4oOQnJ7doHvmBI=; b=uQgJULy6J36+hPl7pLu2BZ+w1N9QcSq4oPSPs5uOZ2JTeQemazy9wyCyiVr12INQJ6 PWDgCS/wDtatrgSs6jVkYPrlpvjlFWsMZWiSsNTznRtSKYBrfoMiMPEcyPestWJKYhSs Vjqzo6xkym16z0KqBr6ZJuBgjCOFd2lgI/ICct492W5XJl0aX95PUery/1SFZbKAQrK2 eMkbNVhY2Tj8+IVGZ2xy1AdG8ciLRhlyWYOIbnKp620Ydbma+UeyA39JtWCEH1RxDI7B ZvjwU6Z2eyarb0tggj9v9zpHWkqGl+OBcEsPeSVILXkpKvWOb26dIkQRj+p4leAunCga v2DA== X-Gm-Message-State: AIVw11308ioDwSt3lEs9A9neNtcHsgPxZOfOq6j35OdNdCXq33SJRzMN Kutb5E0HNmiCDmWj X-Received: by 10.28.142.138 with SMTP id q132mr1134544wmd.75.1499838601792; Tue, 11 Jul 2017 22:50:01 -0700 (PDT) Received: from ?IPv6:2003:c6:ebc1:e200:4:ce91:c82d:34f2? (p200300C6EBC1E2000004CE91C82D34F2.dip0.t-ipconnect.de. [2003:c6:ebc1:e200:4:ce91:c82d:34f2]) by smtp.googlemail.com with ESMTPSA id b30sm1435135wra.42.2017.07.11.22.50.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Jul 2017 22:50:01 -0700 (PDT) From: Heiner Kallweit Subject: [PATCH 1/9] rtc: ds1307: remove member irq from struct ds1307 To: Alexandre Belloni Cc: linux-rtc@vger.kernel.org References: Message-ID: <8784802b-3efa-8d2c-fc54-fce7af6bcbf0@gmail.com> Date: Wed, 12 Jul 2017 07:49:14 +0200 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: Sender: linux-rtc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rtc@vger.kernel.org The irq number is used in the probe function only, so we don't have to store it in struct ds1307. Signed-off-by: Heiner Kallweit --- drivers/rtc/rtc-ds1307.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c index 1cedb21b..adc90f18 100644 --- a/drivers/rtc/rtc-ds1307.c +++ b/drivers/rtc/rtc-ds1307.c @@ -126,7 +126,6 @@ struct ds1307 { struct device *dev; struct regmap *regmap; const char *name; - int irq; struct rtc_device *rtc; #ifdef CONFIG_COMMON_CLK struct clk_hw clks[2]; @@ -1334,7 +1333,6 @@ static int ds1307_probe(struct i2c_client *client, dev_set_drvdata(&client->dev, ds1307); ds1307->dev = &client->dev; ds1307->name = client->name; - ds1307->irq = client->irq; ds1307->regmap = devm_regmap_init_i2c(client, ®map_config); if (IS_ERR(ds1307->regmap)) { @@ -1414,7 +1412,7 @@ static int ds1307_probe(struct i2c_client *client, * For some variants, be sure alarms can trigger when we're * running on Vbackup (BBSQI/BBSQW) */ - if (chip->alarm && (ds1307->irq > 0 || + if (chip->alarm && (client->irq > 0 || ds1307_can_wakeup_device)) { ds1307->regs[0] |= DS1337_BIT_INTCN | bbsqi_bitpos[ds1307->type]; @@ -1499,7 +1497,7 @@ static int ds1307_probe(struct i2c_client *client, case rx_8130: ds1307->offset = 0x10; /* Seconds starts at 0x10 */ rtc_ops = &rx8130_rtc_ops; - if (chip->alarm && ds1307->irq > 0) { + if (chip->alarm && client->irq > 0) { irq_handler = rx8130_irq; want_irq = true; } @@ -1509,7 +1507,7 @@ static int ds1307_probe(struct i2c_client *client, break; case mcp794xx: rtc_ops = &mcp794xx_rtc_ops; - if (chip->alarm && (ds1307->irq > 0 || + if (chip->alarm && (client->irq > 0 || ds1307_can_wakeup_device)) { irq_handler = mcp794xx_irq; want_irq = true; @@ -1655,7 +1653,7 @@ static int ds1307_probe(struct i2c_client *client, return PTR_ERR(ds1307->rtc); } - if (ds1307_can_wakeup_device && ds1307->irq <= 0) { + if (ds1307_can_wakeup_device && client->irq <= 0) { /* Disable request for an IRQ */ want_irq = false; dev_info(ds1307->dev, @@ -1666,7 +1664,7 @@ static int ds1307_probe(struct i2c_client *client, if (want_irq) { err = devm_request_threaded_irq(ds1307->dev, - ds1307->irq, NULL, irq_handler, + client->irq, NULL, irq_handler, IRQF_SHARED | IRQF_ONESHOT, ds1307->name, ds1307); if (err) {