Skip to content

Commit 95aded1

Browse files
Uwe Kleine-Königdlezcano
authored andcommitted
clocksource/drivers/imx-gpt: Use only a single name for functions
When looking at the data structs defining the different behaviours of the GPT blocks in different SoCs it's not helpful that the same functions are used with different names. So drop the cpp defines and use the original names. This commit was generated using: perl -i -e 'my %m; while (<>) { if (/^#define (imx[a-zA-Z0-6_]*)\s(imx[a-zA-Z0-6_]*)/) {$m{$1} = $2; } else { foreach my $f (keys %m) {s/$f/$m{$f}/; } print; } }' drivers/clocksource/timer-imx-gpt.c This patch has no effect on the generated code. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Link: https://lore.kernel.org/r/20230328091514.874724-1-u.kleine-koenig@pengutronix.de
1 parent e738521 commit 95aded1

File tree

1 file changed

+6
-12
lines changed

1 file changed

+6
-12
lines changed

drivers/clocksource/timer-imx-gpt.c

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,11 @@ static void imx1_gpt_irq_disable(struct imx_timer *imxtm)
9393
tmp = readl_relaxed(imxtm->base + MXC_TCTL);
9494
writel_relaxed(tmp & ~MX1_2_TCTL_IRQEN, imxtm->base + MXC_TCTL);
9595
}
96-
#define imx21_gpt_irq_disable imx1_gpt_irq_disable
9796

9897
static void imx31_gpt_irq_disable(struct imx_timer *imxtm)
9998
{
10099
writel_relaxed(0, imxtm->base + V2_IR);
101100
}
102-
#define imx6dl_gpt_irq_disable imx31_gpt_irq_disable
103101

104102
static void imx1_gpt_irq_enable(struct imx_timer *imxtm)
105103
{
@@ -108,13 +106,11 @@ static void imx1_gpt_irq_enable(struct imx_timer *imxtm)
108106
tmp = readl_relaxed(imxtm->base + MXC_TCTL);
109107
writel_relaxed(tmp | MX1_2_TCTL_IRQEN, imxtm->base + MXC_TCTL);
110108
}
111-
#define imx21_gpt_irq_enable imx1_gpt_irq_enable
112109

113110
static void imx31_gpt_irq_enable(struct imx_timer *imxtm)
114111
{
115112
writel_relaxed(1<<0, imxtm->base + V2_IR);
116113
}
117-
#define imx6dl_gpt_irq_enable imx31_gpt_irq_enable
118114

119115
static void imx1_gpt_irq_acknowledge(struct imx_timer *imxtm)
120116
{
@@ -131,7 +127,6 @@ static void imx31_gpt_irq_acknowledge(struct imx_timer *imxtm)
131127
{
132128
writel_relaxed(V2_TSTAT_OF1, imxtm->base + V2_TSTAT);
133129
}
134-
#define imx6dl_gpt_irq_acknowledge imx31_gpt_irq_acknowledge
135130

136131
static void __iomem *sched_clock_reg;
137132

@@ -296,7 +291,6 @@ static void imx1_gpt_setup_tctl(struct imx_timer *imxtm)
296291
tctl_val = MX1_2_TCTL_FRR | MX1_2_TCTL_CLK_PCLK1 | MXC_TCTL_TEN;
297292
writel_relaxed(tctl_val, imxtm->base + MXC_TCTL);
298293
}
299-
#define imx21_gpt_setup_tctl imx1_gpt_setup_tctl
300294

301295
static void imx31_gpt_setup_tctl(struct imx_timer *imxtm)
302296
{
@@ -343,10 +337,10 @@ static const struct imx_gpt_data imx21_gpt_data = {
343337
.reg_tstat = MX1_2_TSTAT,
344338
.reg_tcn = MX1_2_TCN,
345339
.reg_tcmp = MX1_2_TCMP,
346-
.gpt_irq_enable = imx21_gpt_irq_enable,
347-
.gpt_irq_disable = imx21_gpt_irq_disable,
340+
.gpt_irq_enable = imx1_gpt_irq_enable,
341+
.gpt_irq_disable = imx1_gpt_irq_disable,
348342
.gpt_irq_acknowledge = imx21_gpt_irq_acknowledge,
349-
.gpt_setup_tctl = imx21_gpt_setup_tctl,
343+
.gpt_setup_tctl = imx1_gpt_setup_tctl,
350344
.set_next_event = mx1_2_set_next_event,
351345
};
352346

@@ -365,9 +359,9 @@ static const struct imx_gpt_data imx6dl_gpt_data = {
365359
.reg_tstat = V2_TSTAT,
366360
.reg_tcn = V2_TCN,
367361
.reg_tcmp = V2_TCMP,
368-
.gpt_irq_enable = imx6dl_gpt_irq_enable,
369-
.gpt_irq_disable = imx6dl_gpt_irq_disable,
370-
.gpt_irq_acknowledge = imx6dl_gpt_irq_acknowledge,
362+
.gpt_irq_enable = imx31_gpt_irq_enable,
363+
.gpt_irq_disable = imx31_gpt_irq_disable,
364+
.gpt_irq_acknowledge = imx31_gpt_irq_acknowledge,
371365
.gpt_setup_tctl = imx6dl_gpt_setup_tctl,
372366
.set_next_event = v2_set_next_event,
373367
};

0 commit comments

Comments
 (0)