Changes in uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c [a635535:fafb8e5] in mainline

File:

• uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c (modified) (4 diffs)

uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2010 Jiri Svoboda
  * All rights reserved.
  *
@@ -39 +39 @@
 #include <ddi.h>
 #include <loc.h>
+#include <io/console.h>
 #include <vfs/vfs.h>
 #include <ipc/mouseev.h>
@@ -80 +81 @@
 int main(int argc, char *argv[])
 {
-        loc_srv_t *srv;
-
         printf("%s: S3C24xx touchscreen driver\n", NAME);
 
         async_set_fallback_port_handler(s3c24xx_ts_connection, NULL);
-        errno_t rc = loc_server_register(NAME, &srv);
+        errno_t rc = loc_server_register(NAME);
         if (rc != EOK) {
                 printf("%s: Unable to register driver.\n", NAME);
@@ -92 +91 @@
 
         ts = malloc(sizeof(s3c24xx_ts_t));
-        if (ts == NULL) {
-                loc_server_unregister(srv);
+        if (ts == NULL)
                 return -1;
-        }
-
-        if (s3c24xx_ts_init(ts) != EOK) {
-                free(ts);
-                loc_server_unregister(srv);
+
+        if (s3c24xx_ts_init(ts) != EOK)
                 return -1;
-        }
-
-        rc = loc_service_register(srv, NAMESPACE "/mouse", &ts->service_id);
+
+        rc = loc_service_register(NAMESPACE "/mouse", &ts->service_id);
         if (rc != EOK) {
-                // XXX s3c24xx_ts_fini();
-                free(ts);
-                loc_server_unregister(srv);
                 printf(NAME ": Unable to register device %s.\n",
                     NAMESPACE "/mouse");