Update of /cvsroot/gc-linux/linux/drivers/input/keyboard
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv1410/drivers/input/keyboard
Modified Files:
rvl-stkbd.c
Log Message:
- rename functions: start_ios_* -> starlet_*
- get rid of the old explicit ioctl completion function
Index: rvl-stkbd.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/input/keyboard/rvl-stkbd.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- rvl-stkbd.c 12 Apr 2008 17:34:03 -0000 1.1
+++ rvl-stkbd.c 2 Jul 2008 20:43:10 -0000 1.2
@@ -221,8 +221,7 @@
struct stkbd_event *event;
int error;
- /* complete and free the ipc request, retrieving our data first */
- starlet_ios_ioctl_complete(req);
+ /* retrieve the interesting data before freeing the request */
kbd = req->done_data;
error = req->result;
starlet_ipc_free_request(req);
@@ -261,7 +260,7 @@
int error = 0;
if (!test_and_set_bit(__STKBD_WAITING_REPORT, &kbd->flags)) {
- error = starlet_ios_ioctl_nowait(kbd->fd, 0,
+ error = starlet_ioctl_nowait(kbd->fd, 0,
NULL, 0,
event, sizeof(*event),
stkbd_dispatch_ipc_request,
@@ -378,7 +377,7 @@
}
kbd->event = event;
- kbd->fd = starlet_ios_open(stkbd_dev_path, 0);
+ kbd->fd = starlet_open(stkbd_dev_path, 0);
if (kbd->fd < 0) {
drv_printk(KERN_ERR, "unable to open device %s\n",
stkbd_dev_path);
@@ -400,7 +399,7 @@
err_input_dev:
stkbd_exit_input_dev(kbd);
err_fd:
- starlet_ios_close(kbd->fd);
+ starlet_close(kbd->fd);
err_event:
starlet_kfree(event);
err:
@@ -410,7 +409,7 @@
static void stkbd_exit(struct stkbd_keyboard *kbd)
{
stkbd_exit_input_dev(kbd);
- starlet_ios_close(kbd->fd);
+ starlet_close(kbd->fd);
starlet_kfree(kbd->event);
}
|
