From patchwork Fri Aug 25 20:06:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 806011 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-rtc-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="uxhCtnUJ"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xfBy36QB8z9t2y for ; Sat, 26 Aug 2017 06:06:35 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932725AbdHYUGf (ORCPT ); Fri, 25 Aug 2017 16:06:35 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:33536 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932711AbdHYUGe (ORCPT ); Fri, 25 Aug 2017 16:06:34 -0400 Received: by mail-wr0-f193.google.com with SMTP id z91so449440wrc.0 for ; Fri, 25 Aug 2017 13:06:33 -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=dbKeKhA3mUB+KHw1UVbua+V9YWJMtrSOS85XTAsBAPU=; b=uxhCtnUJcke8k+W/kKpsZrJO8RxojzsrS8cGNGwld4A2jfchcMHpGdadVD403baBO/ +FKyDBHiCOzXD1Dx4cEsCSDu31SP81wrU8+XDJb89ISGK9XwUubNDy08ccTPcJHbvEgK fJKlKqtbo5XblkE/Ul6ECGXCUy59T+AqnVYeAp/p24c5A10JOrQYVa/EPlRK7fhANjCT nMa5OOo/MJ20x3ktptgfxV9O7NqLlA+ol898WLRLbs/x1exb24kW+YE1XiuKn4ClKDZ/ a0vv7/D6jSRpcev1Tr749UOrwQlLkZ4pHddqTaxlSpjtwXS/Yte2EHRNHxI0SUzaaJbG 4qag== 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=dbKeKhA3mUB+KHw1UVbua+V9YWJMtrSOS85XTAsBAPU=; b=dHqLm6mW4Vmryimh/vOx/aLTjJ5GzEFy65xh1L/mAc6q6z2ot782cKyVQGLA+Wz4X1 noCuE4BJjr7g3z8E/DQAl8V3d/zoGcV+aKOV4J8ngh3tXo5wX3za+5MKcqTwxakHT7bP Q+m/UJexVNmBh9AKHhhfmpQLY5p5mZ85frGYUreiL6spQLByQ6Q/zo+9NfgGQ/WazA+F 9RSuq9vcn+3UsmN2P83BxhZm9PS4OCNkgkQlbDq2NK+htI9FlcleUJJsQqPvJNEcGjSE pmD5bI+Yeugf9RhWwKqNzXalUpzwfEtva8HgH1cWO0Zu4YhCq9e36QBoYExDQPqg22HF gnCA== X-Gm-Message-State: AHYfb5hJieAylUgSzkOhIm2WWeX0KlMRFfAg0cVtZbFZ2HolR1zXa3kk Mx2WVvSPZxbJSSwo X-Received: by 10.223.145.3 with SMTP id j3mr6061585wrj.80.1503691592957; Fri, 25 Aug 2017 13:06:32 -0700 (PDT) Received: from ?IPv6:2003:ea:8bc7:5e00:6026:1205:9e47:4fa8? (p200300EA8BC75E00602612059E474FA8.dip0.t-ipconnect.de. [2003:ea:8bc7:5e00:6026:1205:9e47:4fa8]) by smtp.googlemail.com with ESMTPSA id d17sm7548768wrc.78.2017.08.25.13.06.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Aug 2017 13:06:32 -0700 (PDT) From: Heiner Kallweit Subject: [PATCH 1/5] rtc: ds1307: factor out determining the chip type To: Alexandre Belloni Cc: linux-rtc@vger.kernel.org References: Message-ID: <6096da22-92b7-ecac-382c-39dbb7f494db@gmail.com> Date: Fri, 25 Aug 2017 22:06:05 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 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 ds1307_probe is very long and confusing, so let's factor out functionalities. As a first step factor out determining the chip type. Signed-off-by: Heiner Kallweit --- drivers/rtc/rtc-ds1307.c | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c index 4f00cea2..2b5c6d60 100644 --- a/drivers/rtc/rtc-ds1307.c +++ b/drivers/rtc/rtc-ds1307.c @@ -1329,6 +1329,21 @@ static void ds1307_clks_register(struct ds1307 *ds1307) #endif /* CONFIG_COMMON_CLK */ +static enum ds_type ds1307_get_type(struct device *dev, + const struct i2c_device_id *id) +{ + const struct acpi_device_id *acpi_id; + + if (dev->of_node) + return (enum ds_type) of_device_get_match_data(dev); + + if (id) + return id->driver_data; + + acpi_id = acpi_match_device(ACPI_PTR(ds1307_acpi_ids), dev); + return acpi_id ? acpi_id->driver_data : -ENODEV; +} + static const struct regmap_config regmap_config = { .reg_bits = 8, .val_bits = 8, @@ -1365,23 +1380,11 @@ static int ds1307_probe(struct i2c_client *client, i2c_set_clientdata(client, ds1307); - if (client->dev.of_node) { - ds1307->type = (enum ds_type) - of_device_get_match_data(&client->dev); - chip = &chips[ds1307->type]; - } else if (id) { - chip = &chips[id->driver_data]; - ds1307->type = id->driver_data; - } else { - const struct acpi_device_id *acpi_id; - - acpi_id = acpi_match_device(ACPI_PTR(ds1307_acpi_ids), - ds1307->dev); - if (!acpi_id) - return -ENODEV; - chip = &chips[acpi_id->driver_data]; - ds1307->type = acpi_id->driver_data; - } + ds1307->type = ds1307_get_type(&client->dev, id); + if (ds1307->type < 0) + return ds1307->type; + + chip = &chips[ds1307->type]; want_irq = client->irq > 0 && chip->alarm;