Skip to contentSkip to conversation

staging/et131x: adding __init/__exit macros

PATCH In review Peter Huewe 5 participants 7 messages Sep 28, 2009 – Oct 19, 2009

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

PATCH 1/1 staging/et131x: adding __init/__exit macros

From: Peter Huewe <[email protected]>

Trivial patch which adds the __init/__exit macros to the module_init/ module_exit functions of ./staging/et131x/et131x_initpci.c

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

linux version v2.6.32-rc1 - linus git tree, Di 29. Sep 01:10:18 CEST 2009

---

drivers/staging/et131x/et131x_initpci.c +2 -2
index 9db2056..5ec0d5b 100644
@@ -989,7 +989,7 @@ static struct pci_driver et131x_driver = {
  *
  * Returns 0 on success, errno on failure (as defined in errno.h)
  */
-static int et131x_init_module(void)
+static int __init et131x_init_module(void)
 {
 	if (et131x_speed_set < PARM_SPEED_DUPLEX_MIN ||
 	    et131x_speed_set > PARM_SPEED_DUPLEX_MAX) {
@@ -1002,7 +1002,7 @@ static int et131x_init_module(void)
 /**
  * et131x_cleanup_module - The entry point called on driver cleanup
  */
-static void et131x_cleanup_module(void)
+static void __exit et131x_cleanup_module(void)
 {
 	pci_unregister_driver(&et131x_driver);
 }
#1 lore raw
Quoted 7 lines · Peter Huewe

From: Peter Huewe <[email protected]>

Trivial patch which adds the __init/__exit macros to the module_init/ module_exit functions of ./staging/et131x/et131x_initpci.c

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

Greg -- I'd prefer you taking trivial staging fixes through yoru tree, as I expect we'll be conflicting soon due to the speed of changes in staging area, if you don't have any objections.

Thanks,

Signature · 2 lines
Jiri Kosina
SUSE Labs, Novell Inc.
#2 lore raw
Quoted 7 lines · Jiri Kosina
Quoted 5 lines · Peter Huewe

From: Peter Huewe <[email protected]>

Trivial patch which adds the __init/__exit macros to the module_init/ module_exit functions of ./staging/et131x/et131x_initpci.c

Quoted 6 lines
Quoted 2 lines

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

Greg -- I'd prefer you taking trivial staging fixes through yoru tree, as I expect we'll be conflicting soon due to the speed of changes in staging area, if you don't have any objections.

No objection at all, I'll queue all of these up later today.

thanks,

greg k-h

#3 lore raw
In reply to Jiri Kosina

Am Tuesday 29 September 2009 11:10:01 schrieb Jiri Kosina:

Quoted 10 lines · Peter Huewe
Quoted 8 lines

From: Peter Huewe <[email protected]>

Trivial patch which adds the __init/__exit macros to the module_init/ module_exit functions of ./staging/et131x/et131x_initpci.c

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

Quoted 5 lines

Greg -- I'd prefer you taking trivial staging fixes through yoru tree, as I expect we'll be conflicting soon due to the speed of changes in staging area, if you don't have any objections.

Thanks,

Hi Greg,

any updates on this patch?
If I should recreate the patch against the linux-next tree, or your staging tree, please tell me.

Same applies to
[PATCH] staging/cx25821: adding __init/__exit macros
[PATCH] staging/p9auth: adding __init/__exit macros
[PATCH] staging/phison: adding __init/__exit macros
and somewhat also to
[PATCH] staging/panel: prevent driver from calling misc_deregister twice on same ressource

Thanks,
Peter

#4 lore raw
Quoted 24 lines · Peter H?we

Am Tuesday 29 September 2009 11:10:01 schrieb Jiri Kosina:

Quoted 10 lines · Peter Huewe
Quoted 8 lines

From: Peter Huewe <[email protected]>

Trivial patch which adds the __init/__exit macros to the module_init/ module_exit functions of ./staging/et131x/et131x_initpci.c

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

Quoted 5 lines

Greg -- I'd prefer you taking trivial staging fixes through yoru tree, as I expect we'll be conflicting soon due to the speed of changes in staging area, if you don't have any objections.

Thanks,

Hi Greg,

any updates on this patch?
If I should recreate the patch against the linux-next tree, or your staging tree, please tell me.

Quoted 7 lines

Same applies to
[PATCH] staging/cx25821: adding __init/__exit macros
[PATCH] staging/p9auth: adding __init/__exit macros
[PATCH] staging/phison: adding __init/__exit macros
and somewhat also to
[PATCH] staging/panel: prevent driver from calling misc_deregister twice on same ressource

These patches are still in my queue, sorry, been really busy, and am now at the Linux kernel summit this week. I should get to them next week when I return.

thanks for your patience,

greg k-h

#5 lore raw

Am Monday 19 October 2009 23:43:51 schrieb Greg KH:

Quoted 7 lines

These patches are still in my queue, sorry, been really busy, and am now at the Linux kernel summit this week. I should get to them next week when I return.

thanks for your patience,

greg k-h

Absolutely no problem - sorry for bugging you.

Have a good time at the summit.
Peter

Quoted 4 lines

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

Acked-by on v1 1/1
#6 lore raw
In reply to Peter Huewe
Quoted 11 lines · On Tue, 29 Sep 2009 01:34:14 +0200 Peter Huewe <[email protected]> wrote:

From: Peter Huewe <[email protected]>

Trivial patch which adds the __init/__exit macros to the module_init/ module_exit functions of ./staging/et131x/et131x_initpci.c

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

linux version v2.6.32-rc1 - linus git tree, Di 29. Sep 01:10:18 CEST 2009