From: "Heiko Stübner" <heiko@sntech.de>
To: Kukjin Kim <kgene.kim@samsung.com>
Cc: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org
Subject: [PATCH 2/2] ARM: S3C24XX: cleanup the included soc init functions in common.h
Date: Thu, 7 Feb 2013 22:50:57 +0100 [thread overview]
Message-ID: <201302072250.57275.heiko@sntech.de> (raw)
In-Reply-To: <201302072249.04263.heiko@sntech.de>
Only the _init, _init_clocks, _init_uarts and _map_io functions need
NULL defines, as they are used in the cpu map.
Further integrate the two restart functions already in common.h in
their respective soc part and compact the numerous empty lines.
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
arch/arm/mach-s3c24xx/common.h | 47 ++++-----------------------------------
1 files changed, 5 insertions(+), 42 deletions(-)
diff --git a/arch/arm/mach-s3c24xx/common.h b/arch/arm/mach-s3c24xx/common.h
index 4db3dd8..8a2b413 100644
--- a/arch/arm/mach-s3c24xx/common.h
+++ b/arch/arm/mach-s3c24xx/common.h
@@ -12,17 +12,15 @@
#ifndef __ARCH_ARM_MACH_S3C24XX_COMMON_H
#define __ARCH_ARM_MACH_S3C24XX_COMMON_H __FILE__
-#ifdef CONFIG_CPU_S3C2410
+struct s3c2410_uartcfg;
+#ifdef CONFIG_CPU_S3C2410
extern int s3c2410_init(void);
extern int s3c2410a_init(void);
-
extern void s3c2410_map_io(void);
-
extern void s3c2410_init_uarts(struct s3c2410_uartcfg *cfg, int no);
-
extern void s3c2410_init_clocks(int xtal);
-
+extern void s3c2410_restart(char mode, const char *cmd);
#else
#define s3c2410_init_clocks NULL
#define s3c2410_init_uarts NULL
@@ -32,61 +30,41 @@ extern void s3c2410_init_clocks(int xtal);
#endif
#ifdef CONFIG_CPU_S3C2412
-
extern int s3c2412_init(void);
-
extern void s3c2412_map_io(void);
-
extern void s3c2412_init_uarts(struct s3c2410_uartcfg *cfg, int no);
-
extern void s3c2412_init_clocks(int xtal);
-
extern int s3c2412_baseclk_add(void);
-
extern void s3c2412_restart(char mode, const char *cmd);
#else
#define s3c2412_init_clocks NULL
#define s3c2412_init_uarts NULL
#define s3c2412_map_io NULL
#define s3c2412_init NULL
-#define s3c2412_restart NULL
#endif
#ifdef CONFIG_CPU_S3C2416
-
-struct s3c2410_uartcfg;
-
extern int s3c2416_init(void);
-
extern void s3c2416_map_io(void);
-
extern void s3c2416_init_uarts(struct s3c2410_uartcfg *cfg, int no);
-
extern void s3c2416_init_clocks(int xtal);
-
extern int s3c2416_baseclk_add(void);
-
extern void s3c2416_restart(char mode, const char *cmd);
-
extern void s3c2416_init_irq(void);
-extern struct syscore_ops s3c2416_irq_syscore_ops;
+extern struct syscore_ops s3c2416_irq_syscore_ops;
#else
#define s3c2416_init_clocks NULL
#define s3c2416_init_uarts NULL
#define s3c2416_map_io NULL
#define s3c2416_init NULL
-#define s3c2416_restart NULL
#endif
#if defined(CONFIG_CPU_S3C2440) || defined(CONFIG_CPU_S3C2442)
-
extern void s3c244x_map_io(void);
-
extern void s3c244x_init_uarts(struct s3c2410_uartcfg *cfg, int no);
-
extern void s3c244x_init_clocks(int xtal);
-
+extern void s3c244x_restart(char mode, const char *cmd);
#else
#define s3c244x_init_clocks NULL
#define s3c244x_init_uarts NULL
@@ -94,7 +72,6 @@ extern void s3c244x_init_clocks(int xtal);
#ifdef CONFIG_CPU_S3C2440
extern int s3c2440_init(void);
-
extern void s3c2440_map_io(void);
#else
#define s3c2440_init NULL
@@ -103,7 +80,6 @@ extern void s3c2440_map_io(void);
#ifdef CONFIG_CPU_S3C2442
extern int s3c2442_init(void);
-
extern void s3c2442_map_io(void);
#else
#define s3c2442_init NULL
@@ -111,33 +87,20 @@ extern void s3c2442_map_io(void);
#endif
#ifdef CONFIG_CPU_S3C2443
-
-struct s3c2410_uartcfg;
-
extern int s3c2443_init(void);
-
extern void s3c2443_map_io(void);
-
extern void s3c2443_init_uarts(struct s3c2410_uartcfg *cfg, int no);
-
extern void s3c2443_init_clocks(int xtal);
-
extern int s3c2443_baseclk_add(void);
-
extern void s3c2443_restart(char mode, const char *cmd);
-
extern void s3c2443_init_irq(void);
#else
#define s3c2443_init_clocks NULL
#define s3c2443_init_uarts NULL
#define s3c2443_map_io NULL
#define s3c2443_init NULL
-#define s3c2443_restart NULL
#endif
-void s3c2410_restart(char mode, const char *cmd);
-void s3c244x_restart(char mode, const char *cmd);
-
extern struct syscore_ops s3c24xx_irq_syscore_ops;
#endif /* __ARCH_ARM_MACH_S3C24XX_COMMON_H */
--
1.7.2.3
WARNING: multiple messages have this Message-ID (diff)
From: heiko@sntech.de (Heiko Stübner)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/2] ARM: S3C24XX: cleanup the included soc init functions in common.h
Date: Thu, 7 Feb 2013 22:50:57 +0100 [thread overview]
Message-ID: <201302072250.57275.heiko@sntech.de> (raw)
In-Reply-To: <201302072249.04263.heiko@sntech.de>
Only the _init, _init_clocks, _init_uarts and _map_io functions need
NULL defines, as they are used in the cpu map.
Further integrate the two restart functions already in common.h in
their respective soc part and compact the numerous empty lines.
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
arch/arm/mach-s3c24xx/common.h | 47 ++++-----------------------------------
1 files changed, 5 insertions(+), 42 deletions(-)
diff --git a/arch/arm/mach-s3c24xx/common.h b/arch/arm/mach-s3c24xx/common.h
index 4db3dd8..8a2b413 100644
--- a/arch/arm/mach-s3c24xx/common.h
+++ b/arch/arm/mach-s3c24xx/common.h
@@ -12,17 +12,15 @@
#ifndef __ARCH_ARM_MACH_S3C24XX_COMMON_H
#define __ARCH_ARM_MACH_S3C24XX_COMMON_H __FILE__
-#ifdef CONFIG_CPU_S3C2410
+struct s3c2410_uartcfg;
+#ifdef CONFIG_CPU_S3C2410
extern int s3c2410_init(void);
extern int s3c2410a_init(void);
-
extern void s3c2410_map_io(void);
-
extern void s3c2410_init_uarts(struct s3c2410_uartcfg *cfg, int no);
-
extern void s3c2410_init_clocks(int xtal);
-
+extern void s3c2410_restart(char mode, const char *cmd);
#else
#define s3c2410_init_clocks NULL
#define s3c2410_init_uarts NULL
@@ -32,61 +30,41 @@ extern void s3c2410_init_clocks(int xtal);
#endif
#ifdef CONFIG_CPU_S3C2412
-
extern int s3c2412_init(void);
-
extern void s3c2412_map_io(void);
-
extern void s3c2412_init_uarts(struct s3c2410_uartcfg *cfg, int no);
-
extern void s3c2412_init_clocks(int xtal);
-
extern int s3c2412_baseclk_add(void);
-
extern void s3c2412_restart(char mode, const char *cmd);
#else
#define s3c2412_init_clocks NULL
#define s3c2412_init_uarts NULL
#define s3c2412_map_io NULL
#define s3c2412_init NULL
-#define s3c2412_restart NULL
#endif
#ifdef CONFIG_CPU_S3C2416
-
-struct s3c2410_uartcfg;
-
extern int s3c2416_init(void);
-
extern void s3c2416_map_io(void);
-
extern void s3c2416_init_uarts(struct s3c2410_uartcfg *cfg, int no);
-
extern void s3c2416_init_clocks(int xtal);
-
extern int s3c2416_baseclk_add(void);
-
extern void s3c2416_restart(char mode, const char *cmd);
-
extern void s3c2416_init_irq(void);
-extern struct syscore_ops s3c2416_irq_syscore_ops;
+extern struct syscore_ops s3c2416_irq_syscore_ops;
#else
#define s3c2416_init_clocks NULL
#define s3c2416_init_uarts NULL
#define s3c2416_map_io NULL
#define s3c2416_init NULL
-#define s3c2416_restart NULL
#endif
#if defined(CONFIG_CPU_S3C2440) || defined(CONFIG_CPU_S3C2442)
-
extern void s3c244x_map_io(void);
-
extern void s3c244x_init_uarts(struct s3c2410_uartcfg *cfg, int no);
-
extern void s3c244x_init_clocks(int xtal);
-
+extern void s3c244x_restart(char mode, const char *cmd);
#else
#define s3c244x_init_clocks NULL
#define s3c244x_init_uarts NULL
@@ -94,7 +72,6 @@ extern void s3c244x_init_clocks(int xtal);
#ifdef CONFIG_CPU_S3C2440
extern int s3c2440_init(void);
-
extern void s3c2440_map_io(void);
#else
#define s3c2440_init NULL
@@ -103,7 +80,6 @@ extern void s3c2440_map_io(void);
#ifdef CONFIG_CPU_S3C2442
extern int s3c2442_init(void);
-
extern void s3c2442_map_io(void);
#else
#define s3c2442_init NULL
@@ -111,33 +87,20 @@ extern void s3c2442_map_io(void);
#endif
#ifdef CONFIG_CPU_S3C2443
-
-struct s3c2410_uartcfg;
-
extern int s3c2443_init(void);
-
extern void s3c2443_map_io(void);
-
extern void s3c2443_init_uarts(struct s3c2410_uartcfg *cfg, int no);
-
extern void s3c2443_init_clocks(int xtal);
-
extern int s3c2443_baseclk_add(void);
-
extern void s3c2443_restart(char mode, const char *cmd);
-
extern void s3c2443_init_irq(void);
#else
#define s3c2443_init_clocks NULL
#define s3c2443_init_uarts NULL
#define s3c2443_map_io NULL
#define s3c2443_init NULL
-#define s3c2443_restart NULL
#endif
-void s3c2410_restart(char mode, const char *cmd);
-void s3c244x_restart(char mode, const char *cmd);
-
extern struct syscore_ops s3c24xx_irq_syscore_ops;
#endif /* __ARCH_ARM_MACH_S3C24XX_COMMON_H */
--
1.7.2.3
next prev parent reply other threads:[~2013-02-07 21:51 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-07 21:49 [PATCH 0/2] ARM: S3C24XX: make s3c24XX.h header content local Heiko Stübner
2013-02-07 21:49 ` Heiko Stübner
2013-02-07 21:49 ` [PATCH 1/2] ARM: S3C24XX: move plat-samsung/s3c24XX headers to local common.h Heiko Stübner
2013-02-07 21:49 ` Heiko Stübner
2013-02-07 21:50 ` Heiko Stübner [this message]
2013-02-07 21:50 ` [PATCH 2/2] ARM: S3C24XX: cleanup the included soc init functions in common.h Heiko Stübner
2013-02-08 22:42 ` [PATCH 0/2] ARM: S3C24XX: make s3c24XX.h header content local Kukjin Kim
2013-02-08 22:42 ` Kukjin Kim
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201302072250.57275.heiko@sntech.de \
--to=heiko@sntech.de \
--cc=kgene.kim@samsung.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-samsung-soc@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.