]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
clocksource/drivers/sh_cmt: Remove unused "renesas, channels-mask" handling
authorGeert Uytterhoeven <geert+renesas@glider.be>
Mon, 18 Sep 2017 13:46:46 +0000 (15:46 +0200)
committerDaniel Lezcano <daniel.lezcano@linaro.org>
Thu, 19 Oct 2017 21:48:58 +0000 (23:48 +0200)
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>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
drivers/clocksource/sh_cmt.c

index 61a9225097065cc4482cf284ede5153f8b5ce2f2..89c514cf59a44e48751d9d0fffc40867efcf079b 100644 (file)
@@ -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;