From: Andrey Smirnov <andrew.smirnov@gmail.com> To: rtc-linux@googlegroups.com Cc: Alessandro Zummo <a.zummo@towertech.it>, Alexandre Belloni <alexandre.belloni@free-electrons.com>, linux-kernel@vger.kernel.org, Andrey Smirnov <andrew.smirnov@gmail.com> Subject: [PATCH 05/13] RTC: ds1307: Convert want_irq into a predicate Date: Tue, 14 Jun 2016 22:59:31 -0700 [thread overview] Message-ID: <1465970379-14703-6-git-send-email-andrew.smirnov@gmail.com> (raw) In-Reply-To: <1465970379-14703-1-git-send-email-andrew.smirnov@gmail.com> Convert want_irq variable into a predicate in order to detangle various independent chunks of ds1307_probe(). Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> --- drivers/rtc/rtc-ds1307.c | 44 +++++++++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c index c482d8b..81967c1 100644 --- a/drivers/rtc/rtc-ds1307.c +++ b/drivers/rtc/rtc-ds1307.c @@ -1247,6 +1247,30 @@ static bool ds1307_can_wakeup_device(const struct ds1307 *ds1307) "wakeup-source"); } +static bool ds1307_want_irq(const struct ds1307 *ds1307, + const struct chip_desc *chip) +{ + + + if (chip->alarm) { + switch (ds1307->type) { + case ds_1337: + case ds_1339: + case ds_3231: + case ds_1341: + return (ds1307->client->irq > 0 || + ds1307_can_wakeup_device(ds1307)); + + case mcp794xx: + return (ds1307->client->irq > 0); + default: + break; + } + } + + return false; +} + static int ds1307_probe(struct i2c_client *client, const struct i2c_device_id *id) { @@ -1255,7 +1279,6 @@ static int ds1307_probe(struct i2c_client *client, int tmp; struct chip_desc *chip = &chips[id->driver_data]; struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent); - bool want_irq = false; unsigned char *buf; struct ds1307_platform_data *pdata = dev_get_platdata(&client->dev); irq_handler_t irq_handler = ds1307_irq; @@ -1356,10 +1379,6 @@ static int ds1307_probe(struct i2c_client *client, | bbsqi_bitpos[ds1307->type]; ds1307->regs[0] &= ~(DS1337_BIT_A2IE | DS1337_BIT_A1IE); - if (chip->alarm && (ds1307->client->irq > 0 || - ds1307_can_wakeup_device(ds1307))) - want_irq = true; - i2c_smbus_write_byte_data(client, DS1337_REG_CONTROL, ds1307->regs[0]); @@ -1441,10 +1460,7 @@ static int ds1307_probe(struct i2c_client *client, break; case mcp794xx: rtc_ops = &mcp794xx_rtc_ops; - if (ds1307->client->irq > 0 && chip->alarm) { - irq_handler = mcp794xx_irq; - want_irq = true; - } + irq_handler = mcp794xx_irq; break; default: break; @@ -1557,7 +1573,7 @@ read_rtc: bin2bcd(tmp)); } - if (want_irq) { + if (ds1307_want_irq(ds1307, chip)) { device_set_wakeup_capable(&client->dev, true); set_bit(HAS_ALARM, &ds1307->flags); } @@ -1570,13 +1586,11 @@ read_rtc: if (ds1307_can_wakeup_device(ds1307) && ds1307->client->irq <= 0) { /* Disable request for an IRQ */ - want_irq = false; - dev_info(&client->dev, "'wakeup-source' is set, request for an IRQ is disabled!\n"); + dev_info(&client->dev, + "'wakeup-source' is set, request for an IRQ is disabled!\n"); /* We cannot support UIE mode if we do not have an IRQ line */ ds1307->rtc->uie_unsupported = 1; - } - - if (want_irq) { + } else if (ds1307_want_irq(ds1307, chip)) { err = devm_request_threaded_irq(&client->dev, client->irq, NULL, irq_handler, IRQF_SHARED | IRQF_ONESHOT, -- 2.5.5
WARNING: multiple messages have this Message-ID (diff)
From: Andrey Smirnov <andrew.smirnov@gmail.com> To: rtc-linux@googlegroups.com Cc: Alessandro Zummo <a.zummo@towertech.it>, Alexandre Belloni <alexandre.belloni@free-electrons.com>, linux-kernel@vger.kernel.org, Andrey Smirnov <andrew.smirnov@gmail.com> Subject: [rtc-linux] [PATCH 05/13] RTC: ds1307: Convert want_irq into a predicate Date: Tue, 14 Jun 2016 22:59:31 -0700 [thread overview] Message-ID: <1465970379-14703-6-git-send-email-andrew.smirnov@gmail.com> (raw) In-Reply-To: <1465970379-14703-1-git-send-email-andrew.smirnov@gmail.com> Convert want_irq variable into a predicate in order to detangle various independent chunks of ds1307_probe(). Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> --- drivers/rtc/rtc-ds1307.c | 44 +++++++++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c index c482d8b..81967c1 100644 --- a/drivers/rtc/rtc-ds1307.c +++ b/drivers/rtc/rtc-ds1307.c @@ -1247,6 +1247,30 @@ static bool ds1307_can_wakeup_device(const struct ds1307 *ds1307) "wakeup-source"); } +static bool ds1307_want_irq(const struct ds1307 *ds1307, + const struct chip_desc *chip) +{ + + + if (chip->alarm) { + switch (ds1307->type) { + case ds_1337: + case ds_1339: + case ds_3231: + case ds_1341: + return (ds1307->client->irq > 0 || + ds1307_can_wakeup_device(ds1307)); + + case mcp794xx: + return (ds1307->client->irq > 0); + default: + break; + } + } + + return false; +} + static int ds1307_probe(struct i2c_client *client, const struct i2c_device_id *id) { @@ -1255,7 +1279,6 @@ static int ds1307_probe(struct i2c_client *client, int tmp; struct chip_desc *chip = &chips[id->driver_data]; struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent); - bool want_irq = false; unsigned char *buf; struct ds1307_platform_data *pdata = dev_get_platdata(&client->dev); irq_handler_t irq_handler = ds1307_irq; @@ -1356,10 +1379,6 @@ static int ds1307_probe(struct i2c_client *client, | bbsqi_bitpos[ds1307->type]; ds1307->regs[0] &= ~(DS1337_BIT_A2IE | DS1337_BIT_A1IE); - if (chip->alarm && (ds1307->client->irq > 0 || - ds1307_can_wakeup_device(ds1307))) - want_irq = true; - i2c_smbus_write_byte_data(client, DS1337_REG_CONTROL, ds1307->regs[0]); @@ -1441,10 +1460,7 @@ static int ds1307_probe(struct i2c_client *client, break; case mcp794xx: rtc_ops = &mcp794xx_rtc_ops; - if (ds1307->client->irq > 0 && chip->alarm) { - irq_handler = mcp794xx_irq; - want_irq = true; - } + irq_handler = mcp794xx_irq; break; default: break; @@ -1557,7 +1573,7 @@ read_rtc: bin2bcd(tmp)); } - if (want_irq) { + if (ds1307_want_irq(ds1307, chip)) { device_set_wakeup_capable(&client->dev, true); set_bit(HAS_ALARM, &ds1307->flags); } @@ -1570,13 +1586,11 @@ read_rtc: if (ds1307_can_wakeup_device(ds1307) && ds1307->client->irq <= 0) { /* Disable request for an IRQ */ - want_irq = false; - dev_info(&client->dev, "'wakeup-source' is set, request for an IRQ is disabled!\n"); + dev_info(&client->dev, + "'wakeup-source' is set, request for an IRQ is disabled!\n"); /* We cannot support UIE mode if we do not have an IRQ line */ ds1307->rtc->uie_unsupported = 1; - } - - if (want_irq) { + } else if (ds1307_want_irq(ds1307, chip)) { err = devm_request_threaded_irq(&client->dev, client->irq, NULL, irq_handler, IRQF_SHARED | IRQF_ONESHOT, -- 2.5.5 -- You received this message because you are subscribed to "rtc-linux". Membership options at http://groups.google.com/group/rtc-linux . Please read http://groups.google.com/group/rtc-linux/web/checklist before submitting a driver. --- You received this message because you are subscribed to the Google Groups "rtc-linux" group. To unsubscribe from this group and stop receiving emails from it, send an email to rtc-linux+unsubscribe@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
next prev parent reply other threads:[~2016-06-15 6:00 UTC|newest] Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-06-15 5:59 [PATCH 00/13] DS1341 support and code cleanup Andrey Smirnov 2016-06-15 5:59 ` [rtc-linux] " Andrey Smirnov 2016-06-15 5:59 ` [PATCH 01/13] RTC: ds1307: Add DS1341 variant Andrey Smirnov 2016-06-15 5:59 ` [rtc-linux] " Andrey Smirnov 2016-06-15 5:59 ` [PATCH 02/13] RTC: ds1307: Disable square wave and timers as default Andrey Smirnov 2016-06-15 5:59 ` [rtc-linux] " Andrey Smirnov 2016-06-15 5:59 ` [PATCH 03/13] RTC: ds1307: Add DS1341 specific power-saving options Andrey Smirnov 2016-06-15 5:59 ` Andrey Smirnov 2016-06-15 5:59 ` [rtc-linux] " Andrey Smirnov 2016-06-19 14:29 ` Rob Herring 2016-06-19 14:29 ` Rob Herring 2016-06-19 14:29 ` [rtc-linux] " Rob Herring 2016-06-19 18:12 ` Andrey Smirnov 2016-06-19 18:12 ` Andrey Smirnov 2016-06-19 18:12 ` [rtc-linux] " Andrey Smirnov 2016-06-21 20:49 ` Rob Herring 2016-06-21 20:49 ` Rob Herring 2016-06-21 20:49 ` [rtc-linux] " Rob Herring 2016-06-21 21:07 ` Alexandre Belloni 2016-06-21 21:07 ` Alexandre Belloni 2016-06-21 21:07 ` [rtc-linux] " Alexandre Belloni 2016-06-22 2:34 ` Andrey Smirnov 2016-06-22 2:34 ` Andrey Smirnov 2016-06-22 2:34 ` [rtc-linux] " Andrey Smirnov 2016-07-12 16:21 ` Andrey Smirnov 2016-07-12 16:21 ` Andrey Smirnov 2016-07-12 16:21 ` [rtc-linux] " Andrey Smirnov 2016-07-19 22:47 ` Alexandre Belloni 2016-07-19 22:47 ` Alexandre Belloni 2016-07-19 22:47 ` [rtc-linux] " Alexandre Belloni 2016-07-19 23:56 ` Andrey Smirnov 2016-07-19 23:56 ` Andrey Smirnov 2016-07-19 23:56 ` [rtc-linux] " Andrey Smirnov 2016-07-20 9:02 ` Alexandre Belloni 2016-07-20 9:02 ` [rtc-linux] " Alexandre Belloni 2016-07-20 14:36 ` Andrey Smirnov 2016-07-20 14:36 ` Andrey Smirnov 2016-07-20 14:36 ` [rtc-linux] " Andrey Smirnov 2016-07-20 15:38 ` Alexandre Belloni 2016-07-20 15:38 ` Alexandre Belloni 2016-07-20 15:38 ` [rtc-linux] " Alexandre Belloni 2016-07-20 16:11 ` Andrey Smirnov 2016-07-20 16:11 ` Andrey Smirnov 2016-07-20 16:11 ` [rtc-linux] " Andrey Smirnov 2016-06-21 23:23 ` Andrey Smirnov 2016-06-21 23:23 ` [rtc-linux] " Andrey Smirnov 2016-06-15 5:59 ` [PATCH 04/13] RTC: ds1307: Convert ds1307_can_wakeup_device into a predicate Andrey Smirnov 2016-06-15 5:59 ` [rtc-linux] " Andrey Smirnov 2016-06-15 5:59 ` Andrey Smirnov [this message] 2016-06-15 5:59 ` [rtc-linux] [PATCH 05/13] RTC: ds1307: Convert want_irq " Andrey Smirnov 2016-06-15 5:59 ` [PATCH 06/13] RTC: ds1307: Move chip configuration into a separate routine Andrey Smirnov 2016-06-15 5:59 ` [rtc-linux] " Andrey Smirnov 2016-06-15 5:59 ` [PATCH 07/13] RTC: ds1307: Move chip sanity checking " Andrey Smirnov 2016-06-15 5:59 ` [rtc-linux] " Andrey Smirnov 2016-06-15 5:59 ` [PATCH 08/13] RTC: ds1307: Remove register "cache" Andrey Smirnov 2016-06-15 5:59 ` [rtc-linux] " Andrey Smirnov 2016-06-15 5:59 ` [PATCH 09/13] RTC: ds1307: Constify struct ds1307 where possible Andrey Smirnov 2016-06-15 5:59 ` [rtc-linux] " Andrey Smirnov 2016-06-15 5:59 ` [PATCH 10/13] RTC: ds1307: Convert goto to a loop Andrey Smirnov 2016-06-15 5:59 ` [rtc-linux] " Andrey Smirnov 2016-06-15 5:59 ` [PATCH 11/13] RTC: ds1307: Redefine RX8025_REG_* to minimize extra code Andrey Smirnov 2016-06-15 5:59 ` [rtc-linux] " Andrey Smirnov 2016-06-15 5:59 ` [PATCH 12/13] RTC: ds1307: Report oscillator problems more intelligently Andrey Smirnov 2016-06-15 5:59 ` [rtc-linux] " Andrey Smirnov 2016-06-15 5:59 ` [PATCH 13/13] RTC: ds1307: Move last bits of sanity checking out of chip_configure Andrey Smirnov 2016-06-15 5:59 ` [rtc-linux] " Andrey Smirnov
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1465970379-14703-6-git-send-email-andrew.smirnov@gmail.com \ --to=andrew.smirnov@gmail.com \ --cc=a.zummo@towertech.it \ --cc=alexandre.belloni@free-electrons.com \ --cc=linux-kernel@vger.kernel.org \ --cc=rtc-linux@googlegroups.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.