Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1734129

[PATCH v3 6/7] clocksource: sh_cmt: Remove unused "renesas,channels-mask" handling

Show all headers | View raw

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 <geert+renesas@glider.be>
---
v3:
  - New.
---
 drivers/clocksource/sh_cmt.c | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/drivers/clocksource/sh_cmt.c b/drivers/clocksource/sh_cmt.c
index 61a9225097065cc4..89c514cf59a44e48 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;
-- 
2.7.4

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v3 0/7] clocksource: sh_cmt: Update driver for DT binding rework Geert Uytterhoeven <geert+renesas@glider.be> - 2017-09-18 15:50 +0200
  [PATCH v3 4/7] clocksource: sh_cmt: Remove support for "renesas,cmt-32*" Geert Uytterhoeven <geert+renesas@glider.be> - 2017-09-18 15:50 +0200
  [PATCH v3 6/7] clocksource: sh_cmt: Remove unused "renesas,channels-mask" handling Geert Uytterhoeven <geert+renesas@glider.be> - 2017-09-18 15:50 +0200
  [PATCH v3 1/7] dt-bindings: timer: renesas,cmt: Fix SoC-specific compatible values Geert Uytterhoeven <geert+renesas@glider.be> - 2017-09-18 15:50 +0200
    Re: [PATCH v3 1/7] dt-bindings: timer: renesas,cmt: Fix SoC-specific  compatible values Rob Herring <robh@kernel.org> - 2017-09-22 01:20 +0200
  [PATCH v3 5/7] clocksource: sh_cmt: Mark "renesas,cmt-48-gen2" deprecated Geert Uytterhoeven <geert+renesas@glider.be> - 2017-09-18 15:50 +0200
  [PATCH v3 3/7] clocksource: sh_cmt: Support separate R-Car Gen2 CMT0/1 Geert Uytterhoeven <geert+renesas@glider.be> - 2017-09-18 15:50 +0200
  [PATCH v3 2/7] clocksource: sh_cmt: Use 0x3f mask for SH_CMT_48BIT case Geert Uytterhoeven <geert+renesas@glider.be> - 2017-09-18 15:50 +0200
  [PATCH v3 7/7] clocksource: sh_cmt: Use of_device_get_match_data() helper Geert Uytterhoeven <geert+renesas@glider.be> - 2017-09-18 15:50 +0200
  Re: [PATCH v3 0/7] clocksource: sh_cmt: Update driver for DT binding  rework Daniel Lezcano <daniel.lezcano@linaro.org> - 2017-09-26 01:30 +0200
  Re: [PATCH v3 0/7] clocksource: sh_cmt: Update driver for DT binding rework Laurent Pinchart <laurent.pinchart@ideasonboard.com> - 2017-09-26 10:30 +0200

csiph-web