From 391f8bee7ef5a2e92d24d73f0072915b7cb12b6b Mon Sep 17 00:00:00 2001 From: Marcin Chrzanowski Date: Thu, 3 May 2018 12:52:32 +0200 Subject: Create basic char device --- harddoom_main.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'harddoom_main.c') diff --git a/harddoom_main.c b/harddoom_main.c index 9ffe62f..300c910 100644 --- a/harddoom_main.c +++ b/harddoom_main.c @@ -1,29 +1,31 @@ #include #include +#include "char.h" #include "pci.h" +#include "util.h" MODULE_LICENSE("GPL"); int harddoom_init(void) { int err = 0; - printk(KERN_INFO "Initializing harddoom\n"); - err = pci_init(); - if (err < 0) { - goto error; - } + + ORFAIL(char_init(), error_char) ; + ORFAIL(pci_init(), error_pci); return 0; -error: +error_pci: + char_cleanup(); +error_char: return err; } void harddoom_cleanup(void) { - printk(KERN_INFO "Removing harddoom\n"); pci_cleanup(); + char_cleanup(); } module_init(harddoom_init); -- cgit v1.2.3