Commit 95aded1b authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Daniel Lezcano
Browse files

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: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20230328091514.874724-1-u.kleine-koenig@pengutronix.de
parent e738521a

drivers/clocksource/timer-imx-gpt.c

+6 −12
Original line number Diff line number Diff line
@@ -93,13 +93,11 @@ static void imx1_gpt_irq_disable(struct imx_timer *imxtm) 
	tmp = readl_relaxed(imxtm->base + MXC_TCTL);

	writel_relaxed(tmp & ~MX1_2_TCTL_IRQEN, imxtm->base + MXC_TCTL);

}

#define imx21_gpt_irq_disable imx1_gpt_irq_disable



static void imx31_gpt_irq_disable(struct imx_timer *imxtm)

{

	writel_relaxed(0, imxtm->base + V2_IR);

}

#define imx6dl_gpt_irq_disable imx31_gpt_irq_disable



static void imx1_gpt_irq_enable(struct imx_timer *imxtm)

{
@@ -108,13 +106,11 @@ static void imx1_gpt_irq_enable(struct imx_timer *imxtm) 
	tmp = readl_relaxed(imxtm->base + MXC_TCTL);

	writel_relaxed(tmp | MX1_2_TCTL_IRQEN, imxtm->base + MXC_TCTL);

}

#define imx21_gpt_irq_enable imx1_gpt_irq_enable



static void imx31_gpt_irq_enable(struct imx_timer *imxtm)

{

	writel_relaxed(1<<0, imxtm->base + V2_IR);

}

#define imx6dl_gpt_irq_enable imx31_gpt_irq_enable



static void imx1_gpt_irq_acknowledge(struct imx_timer *imxtm)

{
@@ -131,7 +127,6 @@ static void imx31_gpt_irq_acknowledge(struct imx_timer *imxtm) 
{

	writel_relaxed(V2_TSTAT_OF1, imxtm->base + V2_TSTAT);

}

#define imx6dl_gpt_irq_acknowledge imx31_gpt_irq_acknowledge



static void __iomem *sched_clock_reg;
@@ -296,7 +291,6 @@ static void imx1_gpt_setup_tctl(struct imx_timer *imxtm) 
	tctl_val = MX1_2_TCTL_FRR | MX1_2_TCTL_CLK_PCLK1 | MXC_TCTL_TEN;

	writel_relaxed(tctl_val, imxtm->base + MXC_TCTL);

}

#define imx21_gpt_setup_tctl imx1_gpt_setup_tctl



static void imx31_gpt_setup_tctl(struct imx_timer *imxtm)

{
@@ -343,10 +337,10 @@ static const struct imx_gpt_data imx21_gpt_data = { 
	.reg_tstat = MX1_2_TSTAT,

	.reg_tcn = MX1_2_TCN,

	.reg_tcmp = MX1_2_TCMP,

	.gpt_irq_enable = imx21_gpt_irq_enable,

	.gpt_irq_disable = imx21_gpt_irq_disable,

	.gpt_irq_enable = imx1_gpt_irq_enable,

	.gpt_irq_disable = imx1_gpt_irq_disable,

	.gpt_irq_acknowledge = imx21_gpt_irq_acknowledge,

	.gpt_setup_tctl = imx21_gpt_setup_tctl,

	.gpt_setup_tctl = imx1_gpt_setup_tctl,

	.set_next_event = mx1_2_set_next_event,

};
@@ -365,9 +359,9 @@ static const struct imx_gpt_data imx6dl_gpt_data = { 
	.reg_tstat = V2_TSTAT,

	.reg_tcn = V2_TCN,

	.reg_tcmp = V2_TCMP,

	.gpt_irq_enable = imx6dl_gpt_irq_enable,

	.gpt_irq_disable = imx6dl_gpt_irq_disable,

	.gpt_irq_acknowledge = imx6dl_gpt_irq_acknowledge,

	.gpt_irq_enable = imx31_gpt_irq_enable,

	.gpt_irq_disable = imx31_gpt_irq_disable,

	.gpt_irq_acknowledge = imx31_gpt_irq_acknowledge,

	.gpt_setup_tctl = imx6dl_gpt_setup_tctl,

	.set_next_event = v2_set_next_event,

};