From c5b55712e06551da232fd77eb545e9b7f0409006 Mon Sep 17 00:00:00 2001 From: Benedikt Spranger Date: Tue, 24 Nov 2009 10:19:56 +0100 Subject: more bugfixes --- kernel-devel/module-basics/vain_pci/vain_pci_3.c | 2 +- kernel-devel/module-basics/vain_pci/vain_pci_5.c | 4 ++-- kernel-devel/module-basics/vain_pci/vain_pci_orig.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/kernel-devel/module-basics/vain_pci/vain_pci_3.c b/kernel-devel/module-basics/vain_pci/vain_pci_3.c index 765afaa..b9154f2 100644 --- a/kernel-devel/module-basics/vain_pci/vain_pci_3.c +++ b/kernel-devel/module-basics/vain_pci/vain_pci_3.c @@ -1,6 +1,6 @@ ret = pci_request_regions(pdev, "vain_pci"); if (ret) { - dev_err(&pdev->dev, "I/O address 0x%04x already in use\n"); + dev_err(&pdev->dev, "I/O address already in use\n"); goto err_disable_device; } diff --git a/kernel-devel/module-basics/vain_pci/vain_pci_5.c b/kernel-devel/module-basics/vain_pci/vain_pci_5.c index 6bdc314..2829d8c 100644 --- a/kernel-devel/module-basics/vain_pci/vain_pci_5.c +++ b/kernel-devel/module-basics/vain_pci/vain_pci_5.c @@ -5,7 +5,7 @@ static struct pci_driver vain_pci_driver = { .remove = __devexit_p(vain_pci_remove), }; -static int vain_pci_init(void) +static int __init vain_pci_init(void) { int err; @@ -16,7 +16,7 @@ static int vain_pci_init(void) return err; } -static void vain_pci_exit(void) +static void __exit vain_pci_exit(void) { pci_unregister_driver(&vain_pci_driver); printk(KERN_INFO "vain_pci_exit: done\n"); diff --git a/kernel-devel/module-basics/vain_pci/vain_pci_orig.c b/kernel-devel/module-basics/vain_pci/vain_pci_orig.c index f632f26..1d757e1 100644 --- a/kernel-devel/module-basics/vain_pci/vain_pci_orig.c +++ b/kernel-devel/module-basics/vain_pci/vain_pci_orig.c @@ -87,7 +87,7 @@ static struct pci_driver vain_pci_driver = { .remove = __devexit_p(vain_pci_remove), }; -static int vain_pci_init(void) +static int __init vain_pci_init(void) { int err; @@ -98,7 +98,7 @@ static int vain_pci_init(void) return err; } -static void vain_pci_exit(void) +static void __exit vain_pci_exit(void) { pci_unregister_driver(&vain_pci_driver); printk(KERN_INFO "vain_pci_exit: done\n"); -- cgit v1.2.3