From patchwork Wed Aug 28 06:59:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 172322 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp347025ily; Tue, 27 Aug 2019 23:59:44 -0700 (PDT) X-Google-Smtp-Source: APXvYqx5DpYGRKJigATAq59O3mw3HnQ9nZAWwi14mZwjyXgdvcPgigMKkwaQNQlRe8FvCKqRubrG X-Received: by 2002:a63:2b0c:: with SMTP id r12mr2158405pgr.206.1566975583939; Tue, 27 Aug 2019 23:59:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566975583; cv=none; d=google.com; s=arc-20160816; b=WNmpm8bp8AjKRQOZEOSDokM8Ssu4cbx3UTmrURHNKShGHJ9jT9yk4atnl/RKrd/BVW 9s/BX7kKRBADps5XOBtegabxQ7jLsTGSF4AScpR1GnYNl8xiTQcfJBOsz38E5OiChqgt rzk3FeVvFB5PgTzY7sfLJln/cLbOuVJZ6Ckh/ZbSls6BIG5kp/pXZrzEre5WmDlVIuT/ acsyBf9K33POt+ySOExqy0gPGPLaHeIKmKkQYCIE+THNEw5rJ9cLtTtQ9DXsj3rU6Qr6 IKs1sJ/Gm5Xpt/BrZGBSUqdijAKyEK2LnkeSqXqc6+tGuAIxc4HafrLFjiQ7VVsQ1GUt +fIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=CA2p2SsjZBiZ+CVSDGSdF5T0f2itSmxPDgeQXhbNBGw=; b=xFnIBKtQguRLjiIwt4oV7xNx4T1cR4JEDvMyxPJzz9EDrItycijHBCRbkn0yLmFqfD bp4+7iXlNtkfo/oGrc6hWNpKqELi3JDn4ifp4+FFGeZHUVIsLZGNJRpxgDolEIFgptpk gE08H/PHiME0QllB/hWFvDZAegFWebh0uYWiPIrIdnQogX2cl/gARzvWXgVIE7zMmbMH ypAdcbp5hxHEM8Wa/wj5nrWaKa/Aq5DoR8e9IWrEbZBbWqARrKhTP0hwDWoz/24xUM3S JPRbmCtk+KMIcrLp21fP8vRoZYn5l8GY4kpCnXx+tCvi1bLJ1WHSgAWogzKHTVe4lbd1 a46w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=g2DE3ZVa; spf=pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-omap-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d3si1739135pfq.7.2019.08.27.23.59.43; Tue, 27 Aug 2019 23:59:43 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-omap-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=@ti.com header.s=ti-com-17Q1 header.b=g2DE3ZVa; spf=pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-omap-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726571AbfH1G7n (ORCPT + 5 others); Wed, 28 Aug 2019 02:59:43 -0400 Received: from lelv0142.ext.ti.com ([198.47.23.249]:58032 "EHLO lelv0142.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726394AbfH1G7m (ORCPT ); Wed, 28 Aug 2019 02:59:42 -0400 Received: from fllv0035.itg.ti.com ([10.64.41.0]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id x7S6xd8u120626; Wed, 28 Aug 2019 01:59:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1566975579; bh=CA2p2SsjZBiZ+CVSDGSdF5T0f2itSmxPDgeQXhbNBGw=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=g2DE3ZVaRj7PYe/aBAiixh42hQEr8B7mqZkEdnWGLFAnaqBfj1OaCTFuRttc9fx5J ve0Wh8BkoxQR/S8S5lc7AG51A1jFc1Gv1bO1dGpVxAiSM7lICA9+o3X2dVzunLjtgd FXIoTaoofQrZdAiIN+sW6eTMLhXmUxRMkJAA/OoM= Received: from DFLE112.ent.ti.com (dfle112.ent.ti.com [10.64.6.33]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id x7S6xdBA052339 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 28 Aug 2019 01:59:39 -0500 Received: from DFLE104.ent.ti.com (10.64.6.25) by DFLE112.ent.ti.com (10.64.6.33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5; Wed, 28 Aug 2019 01:59:39 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) by DFLE104.ent.ti.com (10.64.6.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5 via Frontend Transport; Wed, 28 Aug 2019 01:59:39 -0500 Received: from sokoban.bb.dnainternet.fi (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id x7S6xXVC074399; Wed, 28 Aug 2019 01:59:37 -0500 From: Tero Kristo To: , , CC: , , Subject: [PATCHv2 2/6] clk: ti: clkctrl: convert to use bit helper macros instead of bitops Date: Wed, 28 Aug 2019 09:59:25 +0300 Message-ID: <20190828065929.32150-3-t-kristo@ti.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190828065929.32150-1-t-kristo@ti.com> References: <20190828065929.32150-1-t-kristo@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org This improves the readibility of the code slightly, and makes modifying the flags bit simpler. Signed-off-by: Tero Kristo --- drivers/clk/ti/clkctrl.c | 8 ++++---- include/linux/clk/ti.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) -- 2.17.1 -- Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki diff --git a/drivers/clk/ti/clkctrl.c b/drivers/clk/ti/clkctrl.c index a914df2e9e1b..d904a9a7626a 100644 --- a/drivers/clk/ti/clkctrl.c +++ b/drivers/clk/ti/clkctrl.c @@ -24,7 +24,7 @@ #include #include "clock.h" -#define NO_IDLEST 0x1 +#define NO_IDLEST 0 #define OMAP4_MODULEMODE_MASK 0x3 @@ -158,7 +158,7 @@ static int _omap4_clkctrl_clk_enable(struct clk_hw *hw) ti_clk_ll_ops->clk_writel(val, &clk->enable_reg); - if (clk->flags & NO_IDLEST) + if (test_bit(NO_IDLEST, &clk->flags)) return 0; /* Wait until module is enabled */ @@ -187,7 +187,7 @@ static void _omap4_clkctrl_clk_disable(struct clk_hw *hw) ti_clk_ll_ops->clk_writel(val, &clk->enable_reg); - if (clk->flags & NO_IDLEST) + if (test_bit(NO_IDLEST, &clk->flags)) goto exit; /* Wait until module is disabled */ @@ -596,7 +596,7 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node) if (reg_data->flags & CLKF_HW_SUP) hw->enable_bit = MODULEMODE_HWCTRL; if (reg_data->flags & CLKF_NO_IDLEST) - hw->flags |= NO_IDLEST; + set_bit(NO_IDLEST, &hw->flags); if (reg_data->clkdm_name) hw->clkdm_name = reg_data->clkdm_name; diff --git a/include/linux/clk/ti.h b/include/linux/clk/ti.h index 1e8ef96555ce..bb2c5af9082a 100644 --- a/include/linux/clk/ti.h +++ b/include/linux/clk/ti.h @@ -153,7 +153,7 @@ struct clk_hw_omap { u8 fixed_div; struct clk_omap_reg enable_reg; u8 enable_bit; - u8 flags; + unsigned long flags; struct clk_omap_reg clksel_reg; struct dpll_data *dpll_data; const char *clkdm_name;