Have a single probe function instead of a probe and a connect function.
Also tidy a comment.
1 files changed, 33 insertions(+), 48 deletions(-)
Signed-off-by: Adrian McMenamin <[email protected]>
---
diff --git a/drivers/input/keyboard/maple_keyb.c b/drivers/input/keyboard/maple_keyb.c
index 94e9b3f..37ad346 100644
--- a/drivers/input/keyboard/maple_keyb.c
+++ b/drivers/input/keyboard/maple_keyb.c
@@ -144,8 +144,8 @@ static void dc_kbd_callback(struct mapleq *mq)
unsigned long *buf = mq->recvbuf;
/*
- * We should always be getting the lock because the only
- * time it may be locked if driver is in cleanup phase.
+ * We should always get the lock because the only
+ * time it may be locked is if driver is in cleanup phase.
*/
if (likely(mutex_trylock(&maple_keyb_mutex))) {
@@ -158,63 +158,73 @@ static void dc_kbd_callback(struct mapleq *mq)
}
}
-static int dc_kbd_connect(struct maple_device *mdev)
+
+/* allow the keyboard to be used */
+static int probe_maple_kbd(struct device *dev)
{
- int i, error;
+ struct maple_device *mdev = to_maple_dev(dev);
+ struct maple_driver *mdrv = to_maple_driver(dev->driver);
struct dc_kbd *kbd;
- struct input_dev *dev;
+ struct input_dev *idev;
+ int error, i;
kbd = kzalloc(sizeof(struct dc_kbd), GFP_KERNEL);
if (!kbd) {
error = -ENOMEM;
goto fail_kbd;
}
- dev = input_allocate_device();
- if (!dev) {
+
+ idev = input_allocate_device();
+ if (!idev) {
error = -ENOMEM;
goto fail_dev;
}
mdev->private_data = kbd;
- kbd->dev = dev;
+ kbd->dev = idev;
memcpy(kbd->keycode, dc_kbd_keycode, sizeof(kbd->keycode));
- dev->name = mdev->product_name;
- dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
- dev->keycode = kbd->keycode;
- dev->keycodesize = sizeof(unsigned short);
- dev->keycodemax = ARRAY_SIZE(kbd->keycode);
- dev->id.bustype = BUS_HOST;
- dev->dev.parent = &mdev->dev;
+ idev->name = mdev->product_name;
+ idev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
+ idev->keycode = kbd->keycode;
+ idev->keycodesize = sizeof(unsigned short);
+ idev->keycodemax = ARRAY_SIZE(kbd->keycode);
+ idev->id.bustype = BUS_HOST;
+ idev->dev.parent = &mdev->dev;
for (i = 0; i < NR_SCANCODES; i++)
- __set_bit(dc_kbd_keycode[i], dev->keybit);
- __clear_bit(KEY_RESERVED, dev->keybit);
+ __set_bit(dc_kbd_keycode[i], idev->keybit);
+ __clear_bit(KEY_RESERVED, idev->keybit);
- input_set_capability(dev, EV_MSC, MSC_SCAN);
- input_set_drvdata(dev, kbd);
+ input_set_capability(idev, EV_MSC, MSC_SCAN);
+ input_set_drvdata(idev, kbd);
- error = input_register_device(dev);
+ error = input_register_device(idev);
if (error)
goto fail;
/* Maple polling is locked to VBLANK - which may be just 50/s */
maple_getcond_callback(mdev, dc_kbd_callback, HZ/50,
MAPLE_FUNC_KEYBOARD);
- return 0;
+
+ mdev->driver = mdrv;
+
+ return error;
fail:
- input_free_device(dev);
+ input_free_device(idev);
fail_dev:
kfree(kbd);
fail_kbd:
mdev->private_data = NULL;
return error;
+
}
-static void dc_kbd_disconnect(struct maple_device *mdev)
+static int remove_maple_kbd(struct device *dev)
{
+ struct maple_device *mdev = to_maple_dev(dev);
struct dc_kbd *kbd;
mutex_lock(&maple_keyb_mutex);
@@ -225,36 +235,11 @@ static void dc_kbd_disconnect(struct maple_device *mdev)
kfree(kbd);
mutex_unlock(&maple_keyb_mutex);
-}
-
-/* allow the keyboard to be used */
-static int probe_maple_kbd(struct device *dev)
-{
- struct maple_device *mdev = to_maple_dev(dev);
- struct maple_driver *mdrv = to_maple_driver(dev->driver);
- int error;
-
- error = dc_kbd_connect(mdev);
- if (error)
- return error;
-
- mdev->driver = mdrv;
-
- return 0;
-}
-
-static int remove_maple_kbd(struct device *dev)
-{
- struct maple_device *mdev = to_maple_dev(dev);
-
- dc_kbd_disconnect(mdev);
return 0;
}
static struct maple_driver dc_kbd_driver = {
.function = MAPLE_FUNC_KEYBOARD,
- .connect = dc_kbd_connect,
- .disconnect = dc_kbd_disconnect,
.drv = {
.name = "Dreamcast_keyboard",
.probe = probe_maple_kbd,
On Sun, Jun 15, 2008 at 08:43:39PM +0100, Adrian McMenamin wrote:
> Have a single probe function instead of a probe and a connect function.
> Also tidy a comment.
> 1 files changed, 33 insertions(+), 48 deletions(-)
>
>
> Signed-off-by: Adrian McMenamin <[email protected]>
Ok, so I was going to take this through my tree, but it doesn't apply any
more. Please send an updated version that can be merged.
On Sat, 2008-07-19 at 07:43 +0900, Paul Mundt wrote:
> On Sun, Jun 15, 2008 at 08:43:39PM +0100, Adrian McMenamin wrote:
> > Have a single probe function instead of a probe and a connect function.
> > Also tidy a comment.
> > 1 files changed, 33 insertions(+), 48 deletions(-)
> >
> >
> > Signed-off-by: Adrian McMenamin <[email protected]>
>
> Ok, so I was going to take this through my tree, but it doesn't apply any
> more. Please send an updated version that can be merged.
What is the problem? Is it just a badly formed patch or has something
changed elsewhere?
I'll have a look but as I have no issues I'm not sure what is wrong.
On Sat, Jul 19, 2008 at 01:17:59PM +0100, Adrian McMenamin wrote:
> On Sat, 2008-07-19 at 07:43 +0900, Paul Mundt wrote:
> > On Sun, Jun 15, 2008 at 08:43:39PM +0100, Adrian McMenamin wrote:
> > > Have a single probe function instead of a probe and a connect function.
> > > Also tidy a comment.
> > > 1 files changed, 33 insertions(+), 48 deletions(-)
> > >
> > >
> > > Signed-off-by: Adrian McMenamin <[email protected]>
> >
> > Ok, so I was going to take this through my tree, but it doesn't apply any
> > more. Please send an updated version that can be merged.
>
> What is the problem? Is it just a badly formed patch or has something
> changed elsewhere?
>
> I'll have a look but as I have no issues I'm not sure what is wrong.
>
The problem is it doesnt apply, and the code it is against has also
changed. If you have no issues, you obviously havent tried to apply it.