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
Signed-off-by: Peter Huewe <[email protected]>
---
diff --git a/drivers/staging/et131x/et131x_initpci.c b/drivers/staging/et131x/et131x_initpci.c
index 9db2056..5ec0d5b 100644
--- a/drivers/staging/et131x/et131x_initpci.c
+++ b/drivers/staging/et131x/et131x_initpci.c
@@ -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);
}
On Tue, 29 Sep 2009, Peter Huewe 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.
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,
--
Jiri Kosina
SUSE Labs, Novell Inc.
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
>
> Signed-off-by: Peter Huewe <[email protected]>
Acked-by: Alan Cox <[email protected]>
On Tue, Sep 29, 2009 at 11:10:01AM +0200, Jiri Kosina wrote:
> On Tue, 29 Sep 2009, Peter Huewe 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.
>
> 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
Am Tuesday 29 September 2009 11:10:01 schrieb Jiri Kosina:
> On Tue, 29 Sep 2009, Peter Huewe 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.
>
> 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
On Mon, Oct 19, 2009 at 05:24:44PM +0200, Peter H?we wrote:
> Am Tuesday 29 September 2009 11:10:01 schrieb Jiri Kosina:
> > On Tue, 29 Sep 2009, Peter Huewe 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.
> >
> > 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
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
Am Monday 19 October 2009 23:43:51 schrieb Greg KH:
> 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
> --
> 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