* [PATCH] crypto: hifn_795x - fix __dev{init,exit} markings
@ 2009-05-18 7:51 Mike Frysinger
2009-05-20 14:56 ` Evgeniy Polyakov
0 siblings, 1 reply; 3+ messages in thread
From: Mike Frysinger @ 2009-05-18 7:51 UTC (permalink / raw)
To: linux-kernel; +Cc: Evgeniy Polyakov, Patrick McHardy
The remove member of the pci_driver hifn_pci_driver uses __devexit_p(),
so the remove function itself should be marked with __devexit. And where
there be __devexit on the remove, so is there __devinit on the probe.
Similarly, the module_init/module_exit functions should be declared with
plain __init/__exit markings, not the hotplug __dev{init,exit} ones.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
CC: Evgeniy Polyakov <zbr@ioremap.net>
CC: Patrick McHardy <kaber@trash.net>
---
drivers/crypto/hifn_795x.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c
index 2bef086..5f753fc 100644
--- a/drivers/crypto/hifn_795x.c
+++ b/drivers/crypto/hifn_795x.c
@@ -2564,7 +2564,7 @@ static void hifn_tasklet_callback(unsigned long data)
hifn_process_queue(dev);
}
-static int hifn_probe(struct pci_dev *pdev, const struct pci_device_id *id)
+static int __devinit hifn_probe(struct pci_dev *pdev, const struct pci_device_id *id)
{
int err, i;
struct hifn_device *dev;
@@ -2696,7 +2696,7 @@ err_out_disable_pci_device:
return err;
}
-static void hifn_remove(struct pci_dev *pdev)
+static void __devexit hifn_remove(struct pci_dev *pdev)
{
int i;
struct hifn_device *dev;
@@ -2744,7 +2744,7 @@ static struct pci_driver hifn_pci_driver = {
.remove = __devexit_p(hifn_remove),
};
-static int __devinit hifn_init(void)
+static int __init hifn_init(void)
{
unsigned int freq;
int err;
@@ -2789,7 +2789,7 @@ static int __devinit hifn_init(void)
return 0;
}
-static void __devexit hifn_fini(void)
+static void __exit hifn_fini(void)
{
pci_unregister_driver(&hifn_pci_driver);
--
1.6.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] crypto: hifn_795x - fix __dev{init,exit} markings
2009-05-18 7:51 [PATCH] crypto: hifn_795x - fix __dev{init,exit} markings Mike Frysinger
@ 2009-05-20 14:56 ` Evgeniy Polyakov
2009-05-27 5:16 ` Herbert Xu
0 siblings, 1 reply; 3+ messages in thread
From: Evgeniy Polyakov @ 2009-05-20 14:56 UTC (permalink / raw)
To: Mike Frysinger; +Cc: linux-kernel, Patrick McHardy, Herbert Xu
Hi Mike.
On Mon, May 18, 2009 at 03:51:50AM -0400, Mike Frysinger (vapier@gentoo.org) wrote:
> The remove member of the pci_driver hifn_pci_driver uses __devexit_p(),
> so the remove function itself should be marked with __devexit. And where
> there be __devexit on the remove, so is there __devinit on the probe.
>
> Similarly, the module_init/module_exit functions should be declared with
> plain __init/__exit markings, not the hotplug __dev{init,exit} ones.
>
> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
> CC: Evgeniy Polyakov <zbr@ioremap.net>
> CC: Patrick McHardy <kaber@trash.net>
Looks good, thank you Mike.
Ack. Herbert, please apply.
--
Evgeniy Polyakov
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] crypto: hifn_795x - fix __dev{init,exit} markings
2009-05-20 14:56 ` Evgeniy Polyakov
@ 2009-05-27 5:16 ` Herbert Xu
0 siblings, 0 replies; 3+ messages in thread
From: Herbert Xu @ 2009-05-27 5:16 UTC (permalink / raw)
To: Evgeniy Polyakov; +Cc: Mike Frysinger, linux-kernel, Patrick McHardy
On Wed, May 20, 2009 at 06:56:23PM +0400, Evgeniy Polyakov wrote:
> Hi Mike.
>
> On Mon, May 18, 2009 at 03:51:50AM -0400, Mike Frysinger (vapier@gentoo.org) wrote:
> > The remove member of the pci_driver hifn_pci_driver uses __devexit_p(),
> > so the remove function itself should be marked with __devexit. And where
> > there be __devexit on the remove, so is there __devinit on the probe.
> >
> > Similarly, the module_init/module_exit functions should be declared with
> > plain __init/__exit markings, not the hotplug __dev{init,exit} ones.
> >
> > Signed-off-by: Mike Frysinger <vapier@gentoo.org>
> > CC: Evgeniy Polyakov <zbr@ioremap.net>
> > CC: Patrick McHardy <kaber@trash.net>
>
> Looks good, thank you Mike.
> Ack. Herbert, please apply.
Applied to cryptodev. Thanks a lot!
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-05-27 5:16 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-05-18 7:51 [PATCH] crypto: hifn_795x - fix __dev{init,exit} markings Mike Frysinger
2009-05-20 14:56 ` Evgeniy Polyakov
2009-05-27 5:16 ` Herbert Xu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).