summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2017-09-18 16:46:46 +0300
committerDaniel Lezcano <daniel.lezcano@linaro.org>2017-10-20 00:48:58 +0300
commitd1d285972e24b63eeee8118359dcd4c451b295c5 (patch)
treea33ed7e53b926934070934972f86463838c2f721 /drivers
parent8d50e9476bb4aea53fca12637e71d950deafdf37 (diff)
downloadlinux-d1d285972e24b63eeee8118359dcd4c451b295c5.tar.xz
clocksource/drivers/sh_cmt: Remove unused "renesas, channels-mask" handling
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/clocksource/sh_cmt.c18
1 files changed, 1 insertions, 17 deletions
diff --git a/drivers/clocksource/sh_cmt.c b/drivers/clocksource/sh_cmt.c
index 61a922509706..89c514cf59a4 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;