Skip to contentSkip to conversation

char/vme_scc: adding __init macro to vme_scc.c

PATCH Applied Peter Huewe 4 participants 7 messages Aug 20, 2009 – Dec 23, 2009

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

PATCH 1/1 char/vme_scc: adding __init macro to vme_scc.c

From: Peter Huewe <[email protected]>

Trivial patch which adds the __init macro to the module_init function and all of its helper functions of char/vme_scc.c

Alan or Geert, please have a look at the small patch and either pull it through your tree, or please ack' it so Jiri can pull it through the trivial tree.

linux version 2.6.31-rc6 - linus git tree, Do 20. Aug 22:26:06 CEST 2009

---

drivers/char/vme_scc.c +6 -6
index 994e1a5..8b24729 100644
@@ -136,7 +136,7 @@ static const struct tty_port_operations scc_port_ops = {
  * vme_scc_init() and support functions
  *---------------------------------------------------------------------------*/
 
-static int scc_init_drivers(void)
+static int __init scc_init_drivers(void)
 {
 	int error;
 
@@ -172,7 +172,7 @@ static int scc_init_drivers(void)
 /* ports[] array is indexed by line no (i.e. [0] for ttyS0, [1] for ttyS1).
  */
 
-static void scc_init_portstructs(void)
+static void __init scc_init_portstructs(void)
 {
 	struct scc_port *port;
 	int i;
@@ -195,7 +195,7 @@ static void scc_init_portstructs(void)
 
 
 #ifdef CONFIG_MVME147_SCC
-static int mvme147_scc_init(void)
+static int __init mvme147_scc_init(void)
 {
 	struct scc_port *port;
 	int error;
@@ -298,7 +298,7 @@ fail:
 
 
 #ifdef CONFIG_MVME162_SCC
-static int mvme162_scc_init(void)
+static int __init mvme162_scc_init(void)
 {
 	struct scc_port *port;
 	int error;
@@ -404,7 +404,7 @@ fail:
 
 
 #ifdef CONFIG_BVME6000_SCC
-static int bvme6000_scc_init(void)
+static int __init bvme6000_scc_init(void)
 {
 	struct scc_port *port;
 	int error;
@@ -503,7 +503,7 @@ fail_free_b_rx:
 #endif
 
 
-static int vme_scc_init(void)
+static int __init vme_scc_init(void)
 {
 	int res = -ENODEV;
#1 lore raw
Quoted 70 lines · Peter Huewe

From: Peter Huewe <[email protected]>

Trivial patch which adds the __init macro to the module_init function and all of its helper functions of char/vme_scc.c

Alan or Geert, please have a look at the small patch and either pull it through your tree, or please ack' it so Jiri can pull it through the trivial tree.

linux version 2.6.31-rc6 - linus git tree, Do 20. Aug 22:26:06 CEST 2009

---

drivers/char/vme_scc.c +6 -7
index 994e1a5..8b24729 100644
@@ -136,7 +136,7 @@ static const struct tty_port_operations scc_port_ops = {
  * vme_scc_init() and support functions
  *---------------------------------------------------------------------------*/
 
-static int scc_init_drivers(void)
+static int __init scc_init_drivers(void)
 {
 	int error;
 
@@ -172,7 +172,7 @@ static int scc_init_drivers(void)
 /* ports[] array is indexed by line no (i.e. [0] for ttyS0, [1] for ttyS1).
  */
 
-static void scc_init_portstructs(void)
+static void __init scc_init_portstructs(void)
 {
 	struct scc_port *port;
 	int i;
@@ -195,7 +195,7 @@ static void scc_init_portstructs(void)
 
 
 #ifdef CONFIG_MVME147_SCC
-static int mvme147_scc_init(void)
+static int __init mvme147_scc_init(void)
 {
 	struct scc_port *port;
 	int error;
@@ -298,7 +298,7 @@ fail:
 
 
 #ifdef CONFIG_MVME162_SCC
-static int mvme162_scc_init(void)
+static int __init mvme162_scc_init(void)
 {
 	struct scc_port *port;
 	int error;
@@ -404,7 +404,7 @@ fail:
 
 
 #ifdef CONFIG_BVME6000_SCC
-static int bvme6000_scc_init(void)
+static int __init bvme6000_scc_init(void)
 {
 	struct scc_port *port;
 	int error;
@@ -503,7 +503,7 @@ fail_free_b_rx:
 #endif
 
 
-static int vme_scc_init(void)
+static int __init vme_scc_init(void)
 {
 	int res = -ENODEV;
--
Quoted 5 lines

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Then there are issnvram.txt iss.conf etc ... I guess we need to change these as well.
How about error messages? I assume they would have ISS in them. Regards
Matheos

#2 lore raw
Quoted 49 lines · Matheos Worku
Quoted 49 lines

Alan or Geert, please have a look at the small patch and either pull it through your tree, or please ack' it so Jiri can pull it through the trivial tree.

linux version 2.6.31-rc6 - linus git tree, Do 20. Aug 22:26:06 CEST 2009

---

drivers/char/vme_scc.c +5 -3
index 994e1a5..8b24729 100644
@@ -136,7 +136,7 @@ static const struct tty_port_operations scc_port_ops = {
  * vme_scc_init() and support functions
  *---------------------------------------------------------------------------*/
 -static int scc_init_drivers(void)
+static int __init scc_init_drivers(void)
 {
 	int error;
 @@ -172,7 +172,7 @@ static int scc_init_drivers(void)
 /* ports[] array is indexed by line no (i.e. [0] for ttyS0, [1] for ttyS1).
  */
 -static void scc_init_portstructs(void)
+static void __init scc_init_portstructs(void)
 {
 	struct scc_port *port;
 	int i;
@@ -195,7 +195,7 @@ static void scc_init_portstructs(void)
   #ifdef CONFIG_MVME147_SCC
-static int mvme147_scc_init(void)
+static int __init mvme147_scc_init(void)
 {
 	struct scc_port *port;
 	int error;
@@ -298,7 +298,7 @@ fail:
   #ifdef CONFIG_MVME162_SCC
-static int mvme162_scc_init(void)
+static int __init mvme162_scc_init(void)
 {
 	struct scc_port *port;
 	int error;
@@ -404,7 +404,7 @@ fail:
   #ifdef CONFIG_BVME6000_SCC
-static int bvme6000_scc_init(void)
+static int __init bvme6000_scc_init(void)
 {
 	struct scc_port *port;
 	int error;
@@ -503,7 +503,7 @@ fail_free_b_rx:
Quoted 8 lines

drivers/char/vme_scc.c fail_free_b_rx: · line 508

Quoted 5 lines
drivers/char/vme_scc.c +1 -0
 #endif
  -static int vme_scc_init(void)
+static int __init vme_scc_init(void)
 {
 	int res = -ENODEV;

Then there are issnvram.txt iss.conf etc ... I guess we need to change these as well. How about error messages? I assume they would have ISS in them.

Confused ... how is this related to the patch?

Signature · 2 lines
Jiri Kosina
SUSE Labs, Novell Inc.
#3 lore raw

Am Freitag 09 Oktober 2009 17:04:22 schrieb Jiri Kosina:

Quoted 62 lines · Matheos Worku
Quoted 52 lines
Quoted 52 lines

Alan or Geert, please have a look at the small patch and either pull it through your tree, or please ack' it so Jiri can pull it through the trivial tree.

linux version 2.6.31-rc6 - linus git tree, Do 20. Aug 22:26:06 CEST 2009

---

drivers/char/vme_scc.c +0 -0
index 994e1a5..8b24729 100644
@@ -136,7 +136,7 @@ static const struct tty_port_operations

scc_port_ops = { * vme_scc_init() and support functions

*----------------------------------------------------------------------
-----*/ -static int scc_init_drivers(void)

drivers/char/vme_scc.c +1 -0
+static int __init scc_init_drivers(void)
 {
 	int error;
 @@ -172,7 +172,7 @@ static int scc_init_drivers(void)
 /* ports[] array is indexed by line no (i.e. [0] for ttyS0, [1] for

ttyS1). */
-static void scc_init_portstructs(void)

drivers/char/vme_scc.c +4 -3
+static void __init scc_init_portstructs(void)
 {
 	struct scc_port *port;
 	int i;
@@ -195,7 +195,7 @@ static void scc_init_portstructs(void)
   #ifdef CONFIG_MVME147_SCC
-static int mvme147_scc_init(void)
+static int __init mvme147_scc_init(void)
 {
 	struct scc_port *port;
 	int error;
@@ -298,7 +298,7 @@ fail:
   #ifdef CONFIG_MVME162_SCC
-static int mvme162_scc_init(void)
+static int __init mvme162_scc_init(void)
 {
 	struct scc_port *port;
 	int error;
@@ -404,7 +404,7 @@ fail:
   #ifdef CONFIG_BVME6000_SCC
-static int bvme6000_scc_init(void)
+static int __init bvme6000_scc_init(void)
 {
 	struct scc_port *port;
 	int error;
@@ -503,7 +503,7 @@ fail_free_b_rx:
 #endif
Quoted 8 lines

drivers/char/vme_scc.c fail_free_b_rx: · line 508

Quoted 4 lines
drivers/char/vme_scc.c +1 -0
  -static int vme_scc_init(void)
+static int __init vme_scc_init(void)
 {
 	int res = -ENODEV;

Then there are issnvram.txt iss.conf etc ... I guess we need to change these as well. How about error messages? I assume they would have ISS in them.

Quoted 2 lines

Confused ... how is this related to the patch?

Hi,

any updates on this one? This patch floats around for quite a while now (2009/08/20)

@Matheos: Can you perhaps clearify your remark/objection?

Thanks,
Peter

#4 lore raw
In reply to Peter Huewe

Am Donnerstag 20 August 2009 22:42:31 schrieb Peter Huewe:

Quoted 64 lines

From: Peter Huewe <[email protected]>

Trivial patch which adds the __init macro to the module_init function and all of its helper functions of char/vme_scc.c

Alan or Geert, please have a look at the small patch and either pull it through your tree, or please ack' it so Jiri can pull it through the trivial tree.

linux version 2.6.31-rc6 - linus git tree, Do 20. Aug 22:26:06 CEST 2009

---

drivers/char/vme_scc.c +1 -2
index 994e1a5..8b24729 100644
@@ -136,7 +136,7 @@ static const struct tty_port_operations scc_port_ops > { * vme_scc_init() and support functions
 
 *--------------------------------------------------------------------------
-*/
 
-static int scc_init_drivers(void)
+static int __init scc_init_drivers(void)
 {
 	int error;
@@ -172,7 +172,7 @@ static int scc_init_drivers(void)
 /* ports[] array is indexed by line no (i.e. [0] for ttyS0, [1] for

ttyS1). */

drivers/char/vme_scc.c +4 -4
-static void scc_init_portstructs(void)
+static void __init scc_init_portstructs(void)
 {
 	struct scc_port *port;
 	int i;
@@ -195,7 +195,7 @@ static void scc_init_portstructs(void)
 
 
 #ifdef CONFIG_MVME147_SCC
-static int mvme147_scc_init(void)
+static int __init mvme147_scc_init(void)
 {
 	struct scc_port *port;
 	int error;
@@ -298,7 +298,7 @@ fail:
 
 
 #ifdef CONFIG_MVME162_SCC
-static int mvme162_scc_init(void)
+static int __init mvme162_scc_init(void)
 {
 	struct scc_port *port;
 	int error;
@@ -404,7 +404,7 @@ fail:
 
 
 #ifdef CONFIG_BVME6000_SCC
-static int bvme6000_scc_init(void)
+static int __init bvme6000_scc_init(void)
 {
 	struct scc_port *port;
 	int error;

drivers/char/vme_scc.c fail_free_b_rx: · line 508

Quoted 7 lines
drivers/char/vme_scc.c +1 -1
@@ -503,7 +503,7 @@ fail_free_b_rx:
 #endif
 
 
-static int vme_scc_init(void)
+static int __init vme_scc_init(void)
 {
 	int res = -ENODEV;

Forwarded message to Alan Cox <[email protected]>, as [email protected] - as reported by get_maintainer.pl does not work anymore.

#5 lore raw

Am Thursday 20 August 2009 23:01:13 schrieb Peter Huewe:

Quoted 69 lines

Am Donnerstag 20 August 2009 22:42:31 schrieb Peter Huewe:

Quoted 68 lines

From: Peter Huewe <[email protected]>

Trivial patch which adds the __init macro to the module_init function and all of its helper functions of char/vme_scc.c

Alan or Geert, please have a look at the small patch and either pull it through your tree, or please ack' it so Jiri can pull it through the trivial tree.

linux version 2.6.31-rc6 - linus git tree, Do 20. Aug 22:26:06 CEST 2009

---

drivers/char/vme_scc.c +0 -0
index 994e1a5..8b24729 100644
@@ -136,7 +136,7 @@ static const struct tty_port_operations scc_port_ops

= { * vme_scc_init() and support functions

*------------------------------------------------------------------------
-- -*/

drivers/char/vme_scc.c +1 -1
-static int scc_init_drivers(void)
+static int __init scc_init_drivers(void)
 {
 	int error;
@@ -172,7 +172,7 @@ static int scc_init_drivers(void)
 /* ports[] array is indexed by line no (i.e. [0] for ttyS0, [1] for

ttyS1). */

drivers/char/vme_scc.c +4 -4
-static void scc_init_portstructs(void)
+static void __init scc_init_portstructs(void)
 {
 	struct scc_port *port;
 	int i;
@@ -195,7 +195,7 @@ static void scc_init_portstructs(void)
 
 
 #ifdef CONFIG_MVME147_SCC
-static int mvme147_scc_init(void)
+static int __init mvme147_scc_init(void)
 {
 	struct scc_port *port;
 	int error;
@@ -298,7 +298,7 @@ fail:
 
 
 #ifdef CONFIG_MVME162_SCC
-static int mvme162_scc_init(void)
+static int __init mvme162_scc_init(void)
 {
 	struct scc_port *port;
 	int error;
@@ -404,7 +404,7 @@ fail:
 
 
 #ifdef CONFIG_BVME6000_SCC
-static int bvme6000_scc_init(void)
+static int __init bvme6000_scc_init(void)
 {
 	struct scc_port *port;
 	int error;
@@ -503,7 +503,7 @@ fail_free_b_rx:
 #endif
 
 
Quoted 7 lines

drivers/char/vme_scc.c fail_free_b_rx: · line 508

Quoted 4 lines
drivers/char/vme_scc.c +1 -1
-static int vme_scc_init(void)
+static int __init vme_scc_init(void)
 {
 	int res = -ENODEV;

Forwarded message to Alan Cox <[email protected]>, as [email protected] - as reported by get_maintainer.pl does not work anymore.

Hmm any updates on this one?

Thanks,
Peter

#6 lore raw
In reply to Peter Huewe
Quoted 7 lines · Peter Huewe

From: Peter Huewe <[email protected]>

Trivial patch which adds the __init macro to the module_init function and all of its helper functions of char/vme_scc.c

Alan or Geert, please have a look at the small patch and either pull it through your tree, or please ack' it so Jiri can pull it through the trivial tree.

Thanks, applied.

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds