From patchwork Sun Oct 29 21:20:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 117432 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp1855097qgn; Sun, 29 Oct 2017 14:27:08 -0700 (PDT) X-Google-Smtp-Source: ABhQp+SMMEf/WKrAF4xpxaZtPLuw15DswpRH3vd7Gc/La4ZuiVvypK7ifO7rWX+YOLzw88CaItjJ X-Received: by 10.98.33.203 with SMTP id o72mr6639889pfj.41.1509312428895; Sun, 29 Oct 2017 14:27:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509312428; cv=none; d=google.com; s=arc-20160816; b=NhIGYbbNYUt/PU57/lAwOocREUAVO45Pys0u0NR5RFRlBpZ65V/FCoJ67PYOuCaS5v YQQLF/UR/82tldJk5+7JCV3MTm6YPmO+jGQJZNHq8p+CqLY3MHqe4DvEW/WVcLn59tqD Tpx18hfzxlzAkEbn8OXDpUFFZ5n4PhJwBhSMp//ZkgXcDWdMan3zYDQfIkWwO87CCuLD xNs2h9Yfb5GNB2ybJDZiOClhXOSd2lU6zCWII4tN4qf06/CdwGGKLGPyZ3SGPuMjgDdg ZYYre1WSxMUZZRv6rpjdY+pAuk6jjAUIfZhTR/2j0jBElhsGNPnL2Yow9sxlFpB1tZUJ 8cmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=jzBGPXNJVnGpnWOKK/oF6N3nprg0r6+WvlvD39//eAA=; b=tAsyMXxhneBSV0YQgAthvK2yEZEnLVser0mQuN1KXgHDyr3a7FM1S/QirD68nbitBM pXBEa+qHilN8yxMTgfQUXcJfq4cCFixbjDU44lpeVVM7Cz59l5DnaZpMjHFf9C1vAEwJ eqEDWvLyMJv5f02XA8kIv3IoQZd/8gHp05BS+0iM8dmHHQ+96o3ooUQmeTMmwQf5zPS0 5+roKmMG0B8tmbQrSsQObw5t2bvnuBTCzNt6xJzXdfaNANE/QlAmN0hZTNJ/LHeJjm1g cQibA4dKHkyrReczKob1WDHEVEoVRpiIlXYBveDr5wL/MjESBQAwSGkkH80nKshnI9p9 phkA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OIHryOQw; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u12si3542739pgq.678.2017.10.29.14.27.08; Sun, 29 Oct 2017 14:27:08 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OIHryOQw; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752110AbdJ2V1H (ORCPT + 27 others); Sun, 29 Oct 2017 17:27:07 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:54553 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932193AbdJ2VY2 (ORCPT ); Sun, 29 Oct 2017 17:24:28 -0400 Received: by mail-wr0-f196.google.com with SMTP id o44so10682341wrf.11 for ; Sun, 29 Oct 2017 14:24:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=jzBGPXNJVnGpnWOKK/oF6N3nprg0r6+WvlvD39//eAA=; b=OIHryOQw27v8TOxAPH4Xe8qfqTWKB0kG6DzWmoXNG+UMoPCr0i0KmbeMdQeOBcGrpT SumRbXWUqb8t6GfeThjOrTy44OUrP1HtQMnVJ5Lcl6chKrKYUroGIp7iN/TM7bH9yYzK Pw0rq+et9g0GzYg0CDO9jHFY9wgx+YZ6KCY64= 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=jzBGPXNJVnGpnWOKK/oF6N3nprg0r6+WvlvD39//eAA=; b=oJVzEppAKxOeaZ1yyEvLstiPL2QUxgEWt6X3JeM9ydq0c+nsXNZUUt/DuGYZ9pANdc 0vr+2KPUH4erpJnlApuoI1Ufl9sVYVhWmRqCNJC9vivlvyOqceLZ8fZgRY5qJg0doKfv 2JOrcIJrSqz/ZeirINAwcxqcLvJ0P9Yv/9ilbi85WSZkFOaqDfMk3b0QRXCf3iG8tGVv wzFmuoHeodcq+ic3zIbB6QadZiMqXHajfAIrwSO7zIUZHuu0GouxDvTnNIXVEHl+5RGJ 6Ch7Dgs9y+NJLmzuVM06W/zd037/04P6nmxulsUKgPYnE9bOKaIz/ber/zC0HWTDml3p 3NLg== X-Gm-Message-State: AMCzsaX6RztC/yCPsYKPiydaija5PqPyG0Ji3aWWEOimH9woYiZaoYmh H27McAPqfne48pwLlzf7ESE//94OGg8= X-Received: by 10.223.196.174 with SMTP id m43mr6407424wrf.7.1509312267593; Sun, 29 Oct 2017 14:24:27 -0700 (PDT) Received: from localhost.localdomain ([2a01:e35:879a:6cd0:2c92:b7e6:9f71:ab86]) by smtp.gmail.com with ESMTPSA id z20sm10067264wrz.62.2017.10.29.14.24.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 29 Oct 2017 14:24:27 -0700 (PDT) From: Daniel Lezcano To: tglx@linutronix.de, daniel.lezcano@linaro.org Cc: linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH 06/17] clocksource/drivers/sh_cmt: Remove unused "renesas, channels-mask" handling Date: Sun, 29 Oct 2017 22:20:23 +0100 Message-Id: <1509312035-17368-6-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1509312035-17368-1-git-send-email-daniel.lezcano@linaro.org> References: <1509312035-17368-1-git-send-email-daniel.lezcano@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Geert Uytterhoeven The in-driver channel configuration in sh_cmt_info.channels_mask is now always set for all CMT devices instantiated from DT. Hence the "renesas,channels-mask" property is no longer checked, and its handling can be removed, cfr. commit 4e18111ff38f0664 ("devicetree: bindings: Remove deprecated properties"). Signed-off-by: Geert Uytterhoeven Reviewed-by: Laurent Pinchart Signed-off-by: Daniel Lezcano --- drivers/clocksource/sh_cmt.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) -- 2.7.4 diff --git a/drivers/clocksource/sh_cmt.c b/drivers/clocksource/sh_cmt.c index 61a9225..89c514c 100644 --- a/drivers/clocksource/sh_cmt.c +++ b/drivers/clocksource/sh_cmt.c @@ -946,14 +946,6 @@ static const struct of_device_id sh_cmt_of_table[] __maybe_unused = { }; MODULE_DEVICE_TABLE(of, sh_cmt_of_table); -static int sh_cmt_parse_dt(struct sh_cmt_device *cmt) -{ - struct device_node *np = cmt->pdev->dev.of_node; - - return of_property_read_u32(np, "renesas,channels-mask", - &cmt->hw_channels); -} - static int sh_cmt_setup(struct sh_cmt_device *cmt, struct platform_device *pdev) { unsigned int mask; @@ -968,15 +960,7 @@ static int sh_cmt_setup(struct sh_cmt_device *cmt, struct platform_device *pdev) id = of_match_node(sh_cmt_of_table, pdev->dev.of_node); cmt->info = id->data; - - /* prefer in-driver channel configuration over DT */ - if (cmt->info->channels_mask) { - cmt->hw_channels = cmt->info->channels_mask; - } else { - ret = sh_cmt_parse_dt(cmt); - if (ret < 0) - return ret; - } + cmt->hw_channels = cmt->info->channels_mask; } else if (pdev->dev.platform_data) { struct sh_timer_config *cfg = pdev->dev.platform_data; const struct platform_device_id *id = pdev->id_entry;