Skip to contentSkip to conversation

ARM: SAMSUNG: remove obsolete tick.h

PATCH New Heiko Stübner 3 participants 4 messages Jan 7, 2014 – Feb 12, 2014

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: SAMSUNG: remove obsolete tick.h

Commit 48cf83dc12f2 (ARM: samsung: remove unused tick.h) removed some occurences of tick.h. tick.h itself and s3c24xx_ostimer_pending was only used by the old timer driver and is not used anymore.

Therefore remove the last 3 occurences.

---
 arch/arm/mach-s3c24xx/include/mach/tick.h |   15 --------------
 arch/arm/mach-s3c64xx/include/mach/tick.h |   31 -----------------------------
 arch/arm/mach-s5pc100/include/mach/tick.h |   31 -----------------------------
 3 files changed, 77 deletions(-)
 delete mode 100644 arch/arm/mach-s3c24xx/include/mach/tick.h
 delete mode 100644 arch/arm/mach-s3c64xx/include/mach/tick.h
 delete mode 100644 arch/arm/mach-s5pc100/include/mach/tick.h
arch/arm/mach-s3c24xx/include/mach/tick.h deleted +0 -15
deleted file mode 100644
index 544da41..0000000
@@ -1,15 +0,0 @@
-/* linux/arch/arm/mach-s3c2410/include/mach/tick.h
- *
- * Copyright 2008 Simtec Electronics
- *      Ben Dooks <[email protected]>
- *      http://armlinux.simtec.co.uk/
- *
- * S3C2410 - timer tick support
- */
-
-#define SRCPND_TIMER4 (1<<(IRQ_TIMER4 - IRQ_EINT0))
-
-static inline int s3c24xx_ostimer_pending(void)
-{
-	return __raw_readl(S3C2410_SRCPND) & SRCPND_TIMER4;
-}
arch/arm/mach-s3c64xx/include/mach/tick.h deleted +0 -31
deleted file mode 100644
index db9c1b1..0000000
@@ -1,31 +0,0 @@
-/* linux/arch/arm/mach-s3c6400/include/mach/tick.h
- *
- * Copyright 2008 Openmoko, Inc.
- * Copyright 2008 Simtec Electronics
- *	http://armlinux.simtec.co.uk/
- *	Ben Dooks <[email protected]>
- *
- * S3C64XX - Timer tick support definitions
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
-
-#ifndef __ASM_ARCH_TICK_H
-#define __ASM_ARCH_TICK_H __FILE__
-
-#include <linux/irqchip/arm-vic.h>
-
-/* note, the timer interrutps turn up in 2 places, the vic and then
- * the timer block. We take the VIC as the base at the moment.
- */
-static inline u32 s3c24xx_ostimer_pending(void)
-{
-	u32 pend = __raw_readl(VA_VIC0 + VIC_RAW_STATUS);
-	return pend & 1 << (IRQ_TIMER4_VIC - S3C64XX_IRQ_VIC0(0));
-}
-
-#define TICK_MAX	(0xffffffff)
-
-#endif /* __ASM_ARCH_6400_TICK_H */
arch/arm/mach-s5pc100/include/mach/tick.h deleted +0 -31
deleted file mode 100644
index 0af8e41..0000000
@@ -1,31 +0,0 @@
-/* linux/arch/arm/mach-s5pc100/include/mach/tick.h
- *
- * Copyright 2009 Samsung Electronics Co.
- *	Byungho Min <[email protected]>
- *
- * S3C64XX - Timer tick support definitions
- *
- * Based on mach-s3c6400/include/mach/tick.h
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
-
-#ifndef __ASM_ARCH_TICK_H
-#define __ASM_ARCH_TICK_H __FILE__
-
-#include <linux/irqchip/arm-vic.h>
-
-/* note, the timer interrutps turn up in 2 places, the vic and then
- * the timer block. We take the VIC as the base at the moment.
- */
-static inline u32 s3c24xx_ostimer_pending(void)
-{
-	u32 pend = __raw_readl(VA_VIC0 + VIC_RAW_STATUS);
-	return pend & (1 << (IRQ_TIMER4_VIC - S5P_IRQ_VIC0(0)));
-}
-
-#define TICK_MAX	(0xffffffff)
-
-#endif /* __ASM_ARCH_TICK_H */
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 1/1 ARM: SAMSUNG: remove obsolete tick.h

Hi Heiko,

Quoted 7 lines · On Tuesday 07 of January 2014 21:53:51 Heiko St?bner wrote:

Commit 48cf83dc12f2 (ARM: samsung: remove unused tick.h) removed some occurences of tick.h. tick.h itself and s3c24xx_ostimer_pending was only used by the old timer driver and is not used anymore.

Therefore remove the last 3 occurences.

Quoted 8 lines
---
 arch/arm/mach-s3c24xx/include/mach/tick.h |   15 --------------
 arch/arm/mach-s3c64xx/include/mach/tick.h |   31 -----------------------------
 arch/arm/mach-s5pc100/include/mach/tick.h |   31 -----------------------------
 3 files changed, 77 deletions(-)
 delete mode 100644 arch/arm/mach-s3c24xx/include/mach/tick.h
 delete mode 100644 arch/arm/mach-s3c64xx/include/mach/tick.h
 delete mode 100644 arch/arm/mach-s5pc100/include/mach/tick.h

Thanks for cleaning this up.

Best regards,
Tomasz

#2 lore raw

PATCH 1/1 ARM: SAMSUNG: remove obsolete tick.h

In reply to Heiko Stübner
Quoted 11 lines · Heiko St?bner

Commit 48cf83dc12f2 (ARM: samsung: remove unused tick.h) removed some occurences of tick.h. tick.h itself and s3c24xx_ostimer_pending was only used by the old timer driver and is not used anymore.

Therefore remove the last 3 occurences.

---
 arch/arm/mach-s3c24xx/include/mach/tick.h |   15 --------------
 arch/arm/mach-s3c64xx/include/mach/tick.h |   31

-------------------------

Quoted 2 lines

----

 arch/arm/mach-s5pc100/include/mach/tick.h |   31

-------------------------

Quoted 6 lines

----

 3 files changed, 77 deletions(-)
 delete mode 100644 arch/arm/mach-s3c24xx/include/mach/tick.h
 delete mode 100644 arch/arm/mach-s3c64xx/include/mach/tick.h
 delete mode 100644 arch/arm/mach-s5pc100/include/mach/tick.h

Nice cleanup :-)

Applied, thanks,
Kukjin

#3 lore raw

PATCH 1/1 ARM: SAMSUNG: remove obsolete tick.h

Am Freitag, 10. Januar 2014, 17:17:43 schrieb kgene at kernel.org:

Quoted 23 lines
Quoted 11 lines · Heiko St?bner

Commit 48cf83dc12f2 (ARM: samsung: remove unused tick.h) removed some occurences of tick.h. tick.h itself and s3c24xx_ostimer_pending was only used by the old timer driver and is not used anymore.

Therefore remove the last 3 occurences.

---

 arch/arm/mach-s3c24xx/include/mach/tick.h |   15 --------------
 arch/arm/mach-s3c64xx/include/mach/tick.h |   31

-------------------------

Quoted 3 lines

----

 arch/arm/mach-s5pc100/include/mach/tick.h |   31

-------------------------

Quoted 2 lines

----

Quoted 8 lines
Quoted 4 lines
 3 files changed, 77 deletions(-)
 delete mode 100644 arch/arm/mach-s3c24xx/include/mach/tick.h
 delete mode 100644 arch/arm/mach-s3c64xx/include/mach/tick.h
 delete mode 100644 arch/arm/mach-s5pc100/include/mach/tick.h

Nice cleanup :-)

Applied, thanks,

did this make its way into your tree? Because as of now I can't see it in the linux-samsung.git.

Thanks
Heiko