From: Adrian Bunk <bunk@stusta.de>
To: Dmitry Torokhov <dtor_core@ameritech.net>
Cc: linux-kernel@vger.kernel.org, linux-input@atrey.karlin.mff.cuni.cz
Subject: [2.6 patch] make INPUT a bool
Date: Fri, 17 Feb 2006 00:22:06 +0100 [thread overview]
Message-ID: <20060216232205.GC4422@stusta.de> (raw)
In-Reply-To: <200602150120.58844.dtor_core@ameritech.net>
On Wed, Feb 15, 2006 at 01:20:58AM -0500, Dmitry Torokhov wrote:
> On Tuesday 14 February 2006 10:22, Adrian Bunk wrote:
> > Make INPUT a bool.
> >
> > INPUT!=y is only possible if EMBEDDED=y, and in such cases it doesn't
> > make that much sense to make it modular.
> >
>
> Adrian,
>
> We also need to get rid of input_register_device pinning input module
> and input_dev release function decrementing module's refcount.
Is the patch below OK?
> Thanks!
> Dmitry
cu
Adrian
<-- snip -->
Make INPUT a bool.
INPUT!=y is only possible if EMBEDDED=y, and in such cases it doesn't
make that much sense to make it modular.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
drivers/input/Kconfig | 2 +-
drivers/input/input.c | 21 ---------------------
2 files changed, 1 insertion(+), 22 deletions(-)
--- linux-2.6.16-rc1-mm5-full/drivers/input/Kconfig.old 2006-02-03 22:42:18.000000000 +0100
+++ linux-2.6.16-rc1-mm5-full/drivers/input/Kconfig 2006-02-03 22:42:29.000000000 +0100
@@ -5,7 +5,7 @@
menu "Input device support"
config INPUT
- tristate "Generic input layer (needed for keyboard, mouse, ...)" if EMBEDDED
+ bool "Generic input layer (needed for keyboard, mouse, ...)" if EMBEDDED
default y
---help---
Say Y here if you have any input device (mouse, keyboard, tablet,
--- linux-2.6.16-rc3-mm1-full/drivers/input/input.c.old 2006-02-16 23:59:47.000000000 +0100
+++ linux-2.6.16-rc3-mm1-full/drivers/input/input.c 2006-02-17 00:06:06.000000000 +0100
@@ -23,10 +23,6 @@
#include <linux/device.h>
#include <linux/mutex.h>
-MODULE_AUTHOR("Vojtech Pavlik <vojtech@suse.cz>");
-MODULE_DESCRIPTION("Input core");
-MODULE_LICENSE("GPL");
-
EXPORT_SYMBOL(input_allocate_device);
EXPORT_SYMBOL(input_register_device);
EXPORT_SYMBOL(input_unregister_device);
@@ -470,13 +466,10 @@
if (!proc_bus_input_dir)
return -ENOMEM;
- proc_bus_input_dir->owner = THIS_MODULE;
-
entry = create_proc_read_entry("devices", 0, proc_bus_input_dir, input_devices_read, NULL);
if (!entry)
goto fail1;
- entry->owner = THIS_MODULE;
input_fileops = *entry->proc_fops;
input_fileops.poll = input_devices_poll;
entry->proc_fops = &input_fileops;
@@ -485,8 +478,6 @@
if (!entry)
goto fail2;
- entry->owner = THIS_MODULE;
-
return 0;
fail2: remove_proc_entry("devices", proc_bus_input_dir);
@@ -662,7 +653,6 @@
struct input_dev *dev = to_input_dev(class_dev);
kfree(dev);
- module_put(THIS_MODULE);
}
/*
@@ -830,8 +820,6 @@
if (error)
goto fail3;
- __module_get(THIS_MODULE);
-
path = kobject_get_path(&dev->cdev.kobj, GFP_KERNEL);
printk(KERN_INFO "input: %s as %s\n",
dev->name ? dev->name : "Unspecified device", path ? path : "N/A");
@@ -953,7 +941,6 @@
}
static struct file_operations input_fops = {
- .owner = THIS_MODULE,
.open = input_open_file,
};
@@ -984,12 +971,4 @@
return err;
}
-static void __exit input_exit(void)
-{
- input_proc_exit();
- unregister_chrdev(INPUT_MAJOR, "input");
- class_unregister(&input_class);
-}
-
subsys_initcall(input_init);
-module_exit(input_exit);
next prev parent reply other threads:[~2006-02-16 23:22 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-02-14 15:22 [2.6 patch] make INPUT a bool Adrian Bunk
2006-02-14 18:14 ` Jan Engelhardt
2006-02-14 18:22 ` Adrian Bunk
2006-02-14 23:47 ` Adrian Bunk
2006-02-17 15:56 ` Jan Engelhardt
2006-02-17 16:38 ` Adrian Bunk
2006-02-20 3:33 ` Samuel Masham
2006-02-20 13:28 ` Adrian Bunk
2006-02-22 1:34 ` Herbert Poetzl
2006-02-22 2:31 ` Adrian Bunk
2006-02-22 2:44 ` Herbert Poetzl
2006-02-22 3:10 ` Adrian Bunk
2006-02-22 3:20 ` Dmitry Torokhov
2006-02-23 19:59 ` Status of X86_P4_CLOCKMOD? Adrian Bunk
2006-02-23 20:41 ` Dave Jones
2006-02-23 23:15 ` Andi Kleen
2006-02-23 23:33 ` Adrian Bunk
2006-02-23 23:55 ` Andi Kleen
2006-02-24 2:39 ` Adrian Bunk
2006-02-24 2:42 ` Andi Kleen
2006-02-24 17:33 ` Adrian Bunk
2006-02-25 1:57 ` Johannes Stezenbach
2006-02-25 4:24 ` Dave Jones
2006-02-25 12:53 ` Johannes Stezenbach
2006-02-27 21:17 ` Wes Felter
2006-02-25 4:27 ` Andi Kleen
2006-02-25 12:53 ` Adrian Bunk
2006-02-25 13:28 ` Dominik Brodowski
2006-02-26 11:12 ` Pavel Machek
2006-02-26 20:39 ` Johannes Stezenbach
2006-02-26 20:55 ` Dominik Brodowski
2006-02-26 23:37 ` Johannes Stezenbach
2006-02-25 13:36 ` Andi Kleen
2006-02-25 13:05 ` Johannes Stezenbach
2006-02-28 19:46 ` Matt Mackall
2006-02-28 20:09 ` Dave Jones
2006-02-28 20:19 ` Dmitry Torokhov
2006-02-28 20:47 ` Matt Mackall
2006-02-28 20:57 ` Dominik Brodowski
2006-02-28 21:26 ` Matt Mackall
2006-02-28 21:34 ` Dominik Brodowski
2006-02-28 21:39 ` Dmitry Torokhov
2006-02-28 22:22 ` Andi Kleen
2006-02-22 12:01 ` [2.6 patch] make INPUT a bool Herbert Poetzl
2006-02-22 12:15 ` Adrian Bunk
2006-02-22 18:09 ` Herbert Poetzl
2006-02-25 11:58 ` Geert Uytterhoeven
2006-02-25 12:46 ` Adrian Bunk
2006-02-25 14:22 ` Jan Engelhardt
2006-02-25 14:50 ` Adrian Bunk
2006-02-25 15:29 ` Jan Engelhardt
2006-02-25 15:40 ` Adrian Bunk
2006-02-25 22:01 ` Jan Engelhardt
2006-02-25 22:07 ` Adrian Bunk
2006-02-25 22:23 ` Dmitry Torokhov
2006-02-26 18:13 ` Adrian Bunk
2006-02-27 7:11 ` Vojtech Pavlik
2006-02-27 12:59 ` Vojtech Pavlik
2006-02-25 14:57 ` Jesper Juhl
2006-02-15 6:20 ` Dmitry Torokhov
2006-02-16 23:22 ` Adrian Bunk [this message]
2006-02-17 1:47 ` Dmitry Torokhov
-- strict thread matches above, loose matches on Subject: below --
2006-01-24 18:19 [PATCH] Export symbols so CONFIG_INPUT works as a module Martin Michlmayr
2006-01-24 23:08 ` Dmitry Torokhov
2006-01-24 23:14 ` Martin Michlmayr
2006-01-25 5:04 ` Dmitry Torokhov
2006-02-03 22:36 ` [2.6 patch] make INPUT a bool Adrian Bunk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060216232205.GC4422@stusta.de \
--to=bunk@stusta.de \
--cc=dtor_core@ameritech.net \
--cc=linux-input@atrey.karlin.mff.cuni.cz \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).