Skip to contentSkip to conversation

ARM: S5P6440: Remove redundant defines

PATCH New Kukjin Kim 5 participants 7 messages May 13, 2010 – May 14, 2010

Subsystems (3)
lore
Share & tools
lore

Kukjin Kim

author
#0 lore raw

PATCH 11/11 ARM: S5P6440: Remove redundant defines

From: Thomas Abraham <[email protected]>

Remove redundant defines in the clock code.

---
 arch/arm/mach-s5p6440/clock.c                   |   62 +++++++++++-----------
 arch/arm/mach-s5p6440/include/mach/regs-clock.h |   49 ------------------
 2 files changed, 31 insertions(+), 80 deletions(-)
arch/arm/mach-s5p6440/clock.c +31 -31
index ca6e48d..051d182 100644
@@ -357,121 +357,121 @@ static struct clk init_clocks_disable[] = {
 		.id		= -1,
 		.parent		= &clk_hclk.clk,
 		.enable		= s5p6440_mem_ctrl,
-		.ctrlbit	= S5P_CLKCON_MEM0_HCLK_NFCON,
+		.ctrlbit	= (1 << 2),
 	}, {
 		.name		= "adc",
 		.id		= -1,
 		.parent		= &clk_pclk_low.clk,
 		.enable		= s5p6440_pclk_ctrl,
-		.ctrlbit	= S5P_CLKCON_PCLK_TSADC,
+		.ctrlbit	= (1 << 12),
 	}, {
 		.name		= "i2c",
 		.id		= -1,
 		.parent		= &clk_pclk_low.clk,
 		.enable		= s5p6440_pclk_ctrl,
-		.ctrlbit	= S5P_CLKCON_PCLK_IIC0,
+		.ctrlbit	= (1 << 17),
 	}, {
 		.name		= "i2s_v40",
 		.id		= 0,
 		.parent		= &clk_pclk_low.clk,
 		.enable		= s5p6440_pclk_ctrl,
-		.ctrlbit	= S5P_CLKCON_PCLK_IIS2,
+		.ctrlbit	= (1 << 26),
 	}, {
 		.name		= "spi",
 		.id		= 0,
 		.parent		= &clk_pclk_low.clk,
 		.enable		= s5p6440_pclk_ctrl,
-		.ctrlbit	= S5P_CLKCON_PCLK_SPI0,
+		.ctrlbit	= (1 << 21),
 	}, {
 		.name		= "spi",
 		.id		= 1,
 		.parent		= &clk_pclk_low.clk,
 		.enable		= s5p6440_pclk_ctrl,
-		.ctrlbit	= S5P_CLKCON_PCLK_SPI1,
+		.ctrlbit	= (1 << 22),
 	}, {
 		.name		= "sclk_spi_48",
 		.id		= 0,
 		.parent		= &clk_48m,
 		.enable		= s5p6440_sclk_ctrl,
-		.ctrlbit	= S5P_CLKCON_SCLK0_SPI0_48,
+		.ctrlbit	= (1 << 22),
 	}, {
 		.name		= "sclk_spi_48",
 		.id		= 1,
 		.parent		= &clk_48m,
 		.enable		= s5p6440_sclk_ctrl,
-		.ctrlbit	= S5P_CLKCON_SCLK0_SPI1_48,
+		.ctrlbit	= (1 << 23),
 	}, {
 		.name		= "mmc_48m",
 		.id		= 0,
 		.parent		= &clk_48m,
 		.enable		= s5p6440_sclk_ctrl,
-		.ctrlbit	= S5P_CLKCON_SCLK0_MMC0_48,
+		.ctrlbit	= (1 << 27),
 	}, {
 		.name		= "mmc_48m",
 		.id		= 1,
 		.parent		= &clk_48m,
 		.enable		= s5p6440_sclk_ctrl,
-		.ctrlbit	= S5P_CLKCON_SCLK0_MMC1_48,
+		.ctrlbit	= (1 << 28),
 	}, {
 		.name		= "mmc_48m",
 		.id		= 2,
 		.parent		= &clk_48m,
 		.enable		= s5p6440_sclk_ctrl,
-		.ctrlbit	= S5P_CLKCON_SCLK0_MMC2_48,
+		.ctrlbit	= (1 << 29),
 	}, {
 		.name    	= "otg",
 		.id	   	= -1,
 		.parent		= &clk_hclk_low.clk,
 		.enable  	= s5p6440_hclk0_ctrl,
-		.ctrlbit 	= S5P_CLKCON_HCLK0_USB
+		.ctrlbit	= (1 << 20),
 	}, {
 		.name    	= "post",
 		.id	   	= -1,
 		.parent		= &clk_hclk_low.clk,
 		.enable  	= s5p6440_hclk0_ctrl,
-		.ctrlbit 	= S5P_CLKCON_HCLK0_POST0
+		.ctrlbit	= (1 << 5),
 	}, {
 		.name		= "lcd",
 		.id		= -1,
 		.parent		= &clk_hclk_low.clk,
 		.enable		= s5p6440_hclk1_ctrl,
-		.ctrlbit	= S5P_CLKCON_HCLK1_DISPCON,
+		.ctrlbit	= (1 << 1),
 	}, {
 		.name		= "hsmmc",
 		.id		= 0,
 		.parent		= &clk_hclk_low.clk,
 		.enable		= s5p6440_hclk0_ctrl,
-		.ctrlbit	= S5P_CLKCON_HCLK0_HSMMC0,
+		.ctrlbit	= (1 << 17),
 	}, {
 		.name		= "hsmmc",
 		.id		= 1,
 		.parent		= &clk_hclk_low.clk,
 		.enable		= s5p6440_hclk0_ctrl,
-		.ctrlbit	= S5P_CLKCON_HCLK0_HSMMC1,
+		.ctrlbit	= (1 << 18),
 	}, {
 		.name		= "hsmmc",
 		.id		= 2,
 		.parent		= &clk_hclk_low.clk,
 		.enable		= s5p6440_hclk0_ctrl,
-		.ctrlbit	= S5P_CLKCON_HCLK0_HSMMC2,
+		.ctrlbit	= (1 << 19),
 	}, {
 		.name		= "rtc",
 		.id		= -1,
 		.parent		= &clk_pclk_low.clk,
 		.enable		= s5p6440_pclk_ctrl,
-		.ctrlbit	= S5P_CLKCON_PCLK_RTC,
+		.ctrlbit	= (1 << 6),
 	}, {
 		.name		= "watchdog",
 		.id		= -1,
 		.parent		= &clk_pclk_low.clk,
 		.enable		= s5p6440_pclk_ctrl,
-		.ctrlbit	= S5P_CLKCON_PCLK_WDT,
+		.ctrlbit	= (1 << 5),
 	}, {
 		.name		= "timers",
 		.id		= -1,
 		.parent		= &clk_pclk_low.clk,
 		.enable		= s5p6440_pclk_ctrl,
-		.ctrlbit	= S5P_CLKCON_PCLK_PWM,
+		.ctrlbit	= (1 << 7),
 	}, {
 		.name		= "hclk_fimgvg",
 		.id		= -1,
@@ -550,31 +550,31 @@ static struct clk init_clocks[] = {
 		.id		= -1,
 		.parent		= &clk_pclk_low.clk,
 		.enable		= s5p6440_pclk_ctrl,
-		.ctrlbit	= S5P_CLKCON_PCLK_GPIO,
+		.ctrlbit	= (1 << 18),
 	}, {
 		.name		= "uart",
 		.id		= 0,
 		.parent		= &clk_pclk_low.clk,
 		.enable		= s5p6440_pclk_ctrl,
-		.ctrlbit	= S5P_CLKCON_PCLK_UART0,
+		.ctrlbit	= (1 << 1),
 	}, {
 		.name		= "uart",
 		.id		= 1,
 		.parent		= &clk_pclk_low.clk,
 		.enable		= s5p6440_pclk_ctrl,
-		.ctrlbit	= S5P_CLKCON_PCLK_UART1,
+		.ctrlbit	= (1 << 2),
 	}, {
 		.name		= "uart",
 		.id		= 2,
 		.parent		= &clk_pclk_low.clk,
 		.enable		= s5p6440_pclk_ctrl,
-		.ctrlbit	= S5P_CLKCON_PCLK_UART2,
+		.ctrlbit	= (1 << 3),
 	}, {
 		.name		= "uart",
 		.id		= 3,
 		.parent		= &clk_pclk_low.clk,
 		.enable		= s5p6440_pclk_ctrl,
-		.ctrlbit	= S5P_CLKCON_PCLK_UART3,
+		.ctrlbit	= (1 << 4),
 	}, {
 		.name		= "mem",
 		.id		= -1,
@@ -639,7 +639,7 @@ static struct clksrc_clk clksrcs[] = {
 		.clk	= {
 			.name		= "mmc_bus",
 			.id		= 0,
-			.ctrlbit        = S5P_CLKCON_SCLK0_MMC0,
+			.ctrlbit        = (1 << 24),
 			.enable		= s5p6440_sclk_ctrl,
 		},
 		.sources = &clkset_group1,
@@ -649,7 +649,7 @@ static struct clksrc_clk clksrcs[] = {
 		.clk	= {
 			.name		= "mmc_bus",
 			.id		= 1,
-			.ctrlbit        = S5P_CLKCON_SCLK0_MMC1,
+			.ctrlbit        = (1 << 25),
 			.enable		= s5p6440_sclk_ctrl,
 		},
 		.sources = &clkset_group1,
@@ -659,7 +659,7 @@ static struct clksrc_clk clksrcs[] = {
 		.clk	= {
 			.name		= "mmc_bus",
 			.id		= 2,
-			.ctrlbit        = S5P_CLKCON_SCLK0_MMC2,
+			.ctrlbit        = (1 << 26),
 			.enable		= s5p6440_sclk_ctrl,
 		},
 		.sources = &clkset_group1,
@@ -669,7 +669,7 @@ static struct clksrc_clk clksrcs[] = {
 		.clk	= {
 			.name		= "uclk1",
 			.id		= -1,
-			.ctrlbit        = S5P_CLKCON_SCLK0_UART,
+			.ctrlbit        = (1 << 5),
 			.enable		= s5p6440_sclk_ctrl,
 		},
 		.sources = &clkset_uart,
@@ -679,7 +679,7 @@ static struct clksrc_clk clksrcs[] = {
 		.clk	= {
 			.name		= "spi_epll",
 			.id		= 0,
-			.ctrlbit        = S5P_CLKCON_SCLK0_SPI0,
+			.ctrlbit        = (1 << 20),
 			.enable		= s5p6440_sclk_ctrl,
 		},
 		.sources = &clkset_group1,
@@ -689,7 +689,7 @@ static struct clksrc_clk clksrcs[] = {
 		.clk	= {
 			.name		= "spi_epll",
 			.id		= 1,
-			.ctrlbit        = S5P_CLKCON_SCLK0_SPI1,
+			.ctrlbit        = (1 << 21),
 			.enable		= s5p6440_sclk_ctrl,
 		},
 		.sources = &clkset_group1,
arch/arm/mach-s5p6440/include/mach/regs-clock.h +0 -49

55 lines not on this page · raw message

Signature · 1 line
1.6.2.5
#1 lore raw

PATCH 11/11 ARM: S5P6440: Remove redundant defines

arch/arm/mach-s5p6440/clock.c static struct clk init_clocks_disable[] = { · line 360

Quoted 9 lines · Kukjin Kim

From: Thomas Abraham <[email protected]>

arch/arm/mach-s5p6440/clock.c +1 -1
@@ -357,121 +357,121 @@ static struct clk init_clocks_disable[] = {
 ? ? ? ? ? ? ? ?.id ? ? ? ? ? ? = -1,
 ? ? ? ? ? ? ? ?.parent ? ? ? ? = &clk_hclk.clk,
 ? ? ? ? ? ? ? ?.enable ? ? ? ? = s5p6440_mem_ctrl,
- ? ? ? ? ? ? ? .ctrlbit ? ? ? ?= S5P_CLKCON_MEM0_HCLK_NFCON,
+ ? ? ? ? ? ? ? .ctrlbit ? ? ? ?= (1 << 2),

Peculiar. I have never seen defines dropped in favor of magic numbers.

#2 lore raw

PATCH 11/11 ARM: S5P6440: Remove redundant defines

Quoted 11 lines · Jassi Brar

arch/arm/mach-s5p6440/clock.c static struct clk init_clocks_disable[] = { · line 360

Quoted 9 lines · Kukjin Kim

From: Thomas Abraham <[email protected]>

arch/arm/mach-s5p6440/clock.c +1 -1
@@ -357,121 +357,121 @@ static struct clk init_clocks_disable[] = {
 ? ? ? ? ? ? ? ?.id ? ? ? ? ? ? = -1,
 ? ? ? ? ? ? ? ?.parent ? ? ? ? = &clk_hclk.clk,
 ? ? ? ? ? ? ? ?.enable ? ? ? ? = s5p6440_mem_ctrl,
- ? ? ? ? ? ? ? .ctrlbit ? ? ? ?= S5P_CLKCON_MEM0_HCLK_NFCON,
+ ? ? ? ? ? ? ? .ctrlbit ? ? ? ?= (1 << 2),

Peculiar. I have never seen defines dropped in favor of magic numbers.

I know it seems a little odd at first, but people seem to be clinging on to writing it down in a header file and then using it once as some form of high law of programming. Whilst talking with Kukjin and others last year and looking at this, we came to the following conclusions about single-use defines:

1) It takes two lines of code, where one is sufficient.

2) You only have to look in the relevant .c file to find out the value instead of tracking down a header. This makes it easier to verify the value against the manual and easier to compare against simialr code.

Thus ends today's public service broadcast.

Signature · 4 lines
Ben

Q:      What's a light-year?
A:      One-third less calories than a regular year.
#3 lore raw

PATCH 11/11 ARM: S5P6440: Remove redundant defines

Quoted 19 lines · Ben Dooks
Quoted 11 lines · Jassi Brar

arch/arm/mach-s5p6440/clock.c static struct clk init_clocks_disable[] = { · line 360

Quoted 9 lines · Kukjin Kim

From: Thomas Abraham <[email protected]>

arch/arm/mach-s5p6440/clock.c +1 -1
@@ -357,121 +357,121 @@ static struct clk init_clocks_disable[] = {
 ? ? ? ? ? ? ? ?.id ? ? ? ? ? ? = -1,
 ? ? ? ? ? ? ? ?.parent ? ? ? ? = &clk_hclk.clk,
 ? ? ? ? ? ? ? ?.enable ? ? ? ? = s5p6440_mem_ctrl,
- ? ? ? ? ? ? ? .ctrlbit ? ? ? ?= S5P_CLKCON_MEM0_HCLK_NFCON,
+ ? ? ? ? ? ? ? .ctrlbit ? ? ? ?= (1 << 2),

Peculiar. I have never seen defines dropped in favor of magic numbers.

I know it seems a little odd at first, but people seem to be clinging on to writing it down in a header file and then using it once as some form of high law of programming. Whilst talking with Kukjin and others last year and looking at this, we came to the following conclusions about single-use defines:

Quoted 6 lines

1) It takes two lines of code, where one is sufficient.

2) You only have to look in the relevant .c file to find out the ? value instead of tracking down a header. This makes it easier ? to verify the value against the manual and easier to compare ? against simialr code.

Then define it at c code and use the macro. I also don't like the hard-coded values.

Thank you,
Kyungmin Park

#4 lore raw

PATCH 11/11 ARM: S5P6440: Remove redundant defines

Quoted 10 lines · Kyungmin Park
Quoted 6 lines · Ben Dooks

1) It takes two lines of code, where one is sufficient.

2) You only have to look in the relevant .c file to find out the ? value instead of tracking down a header. This makes it easier ? to verify the value against the manual and easier to compare ? against simialr code.

Then define it at c code and use the macro. I also don't like the hard-coded values.

I'm almost with Ben on this; but we can do better to satisfy both camps.

	.ctrlbit	= 1 << 2, /* CLKCON_MEM0_HCLK_NFCON */

It's now documented what the magic constant is.

#5 lore raw

PATCH 11/11 ARM: S5P6440: Remove redundant defines

Quoted 9 lines · Russell King - ARM Linux
Quoted 8 lines · Kyungmin Park
Quoted 6 lines · Ben Dooks

1) It takes two lines of code, where one is sufficient.

2) You only have to look in the relevant .c file to find out the ? value instead of tracking down a header. This makes it easier ? to verify the value against the manual and easier to compare ? against simialr code.

Quoted 8 lines
Quoted 2 lines

Then define it at c code and use the macro. I also don't like the hard-coded values.

I'm almost with Ben on this; but we can do better to satisfy both camps.

	.ctrlbit	= 1 << 2, /* CLKCON_MEM0_HCLK_NFCON */

It's now documented what the magic constant is.

Gah, my braincell!

I should also point out that we are also trying to cut down on the large headerfiles that are being poured into the kernel without things using them and the likelyhood of not being used. It seems that people think that the more output the more work has been done, which makes life harder for anyone else looking at the code to review.

Signature · 4 lines
Ben

Q:      What's a light-year?
A:      One-third less calories than a regular year.
#6 lore raw

PATCH 11/11 ARM: S5P6440: Remove redundant defines

In reply to Russell King - ARM Linux
Quoted 9 lines · Russell King - ARM Linux
Quoted 8 lines · Kyungmin Park
Quoted 6 lines · Ben Dooks

1) It takes two lines of code, where one is sufficient.

2) You only have to look in the relevant .c file to find out the ? value instead of tracking down a header. This makes it easier ? to verify the value against the manual and easier to compare ? against simialr code.

Quoted 6 lines
Quoted 2 lines

Then define it at c code and use the macro. I also don't like the hard-coded values.

I'm almost with Ben on this; but we can do better to satisfy both camps.

	.ctrlbit	= 1 << 2, /* CLKCON_MEM0_HCLK_NFCON */

As a note, the following awk will do that to this patch:

#!/bin/awk

{
    if ($0 ~ /^-.*ctrlbit*/) {
	last = $4;
	gsub(/,/,"",last)
	print $0;
    } else if ($0 ~ /^\+.*ctrlbit*/) {
	print $0 " /* " last " */";
    } else {
	print $0 default;
    }
}
Signature · 4 lines
Ben

Q:      What's a light-year?
A:      One-third less calories than a regular year.