pps: access pps device by direct pointer

Using device index as a pointer needs some unnecessary work to be done
every time the pointer is needed (in irq handler for example).  Using a
direct pointer is much more easy (and safe as well).

Signed-off-by: Alexander Gordeev <lasaine@lvk.cs.msu.su>
Acked-by: Rodolfo Giometti <giometti@linux.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

2 files changed, 39 insertions, 32 deletions

diff --git a/drivers/pps/clients/pps-ktimer.c b/drivers/pps/clients/pps-ktimer.c
index e1bdd8bc8c9c..966ead188ee2 100644
--- a/drivers/pps/clients/pps-ktimer.c
+++ b/drivers/pps/clients/pps-ktimer.c
@@ -31,7 +31,7 @@
  * Global variables
  */
 
-static int source;
+static struct pps_device *pps;
 static struct timer_list ktimer;
 
 /*
@@ -47,7 +47,7 @@ static void pps_ktimer_event(unsigned long ptr)
 
         pr_info("PPS event at %lu\n", jiffies);
 
-        pps_event(source, &ts, PPS_CAPTUREASSERT, NULL);
+        pps_event(pps, &ts, PPS_CAPTUREASSERT, NULL);
 
         mod_timer(&ktimer, jiffies + HZ);
 }
@@ -56,12 +56,11 @@ static void pps_ktimer_event(unsigned long ptr)
  * The echo function
  */
 
-static void pps_ktimer_echo(int source, int event, void *data)
+static void pps_ktimer_echo(struct pps_device *pps, int event, void *data)
 {
-        pr_info("echo %s %s for source %d\n",
+        dev_info(pps->dev, "echo %s %s\n",
                 event & PPS_CAPTUREASSERT ? "assert" : "",
-                event & PPS_CAPTURECLEAR ? "clear" : "",
-                source);
+                event & PPS_CAPTURECLEAR ? "clear" : "");
 }
 
 /*
@@ -84,30 +83,27 @@ static struct pps_source_info pps_ktimer_info = {
 
 static void __exit pps_ktimer_exit(void)
 {
-        del_timer_sync(&ktimer);
-        pps_unregister_source(source);
+        dev_info(pps->dev, "ktimer PPS source unregistered\n");
 
-        pr_info("ktimer PPS source unregistered\n");
+        del_timer_sync(&ktimer);
+        pps_unregister_source(pps);
 }
 
 static int __init pps_ktimer_init(void)
 {
-        int ret;
-
-        ret = pps_register_source(&pps_ktimer_info,
+        pps = pps_register_source(&pps_ktimer_info,
                                 PPS_CAPTUREASSERT | PPS_OFFSETASSERT);
-        if (ret < 0) {
+        if (pps == NULL) {
                 printk(KERN_ERR "cannot register ktimer source\n");
-                return ret;
+                return -ENOMEM;
         }
-        source = ret;
 
         setup_timer(&ktimer, pps_ktimer_event, 0);
         mod_timer(&ktimer, jiffies + HZ);
 
-        pr_info("ktimer PPS source registered at %d\n", source);
+        dev_info(pps->dev, "ktimer PPS source registered\n");
 
-        return  0;
+        return 0;
 }
 
 module_init(pps_ktimer_init);
diff --git a/drivers/pps/clients/pps-ldisc.c b/drivers/pps/clients/pps-ldisc.c
index 20fc9f7645c8..1517f5498ec0 100644
--- a/drivers/pps/clients/pps-ldisc.c
+++ b/drivers/pps/clients/pps-ldisc.c
@@ -29,7 +29,7 @@
 static void pps_tty_dcd_change(struct tty_struct *tty, unsigned int status,
                                 struct pps_event_time *ts)
 {
-        int id = (long)tty->disc_data;
+        struct pps_device *pps = (struct pps_device *)tty->disc_data;
         struct pps_event_time __ts;
 
         /* First of all we get the time stamp... */
@@ -39,12 +39,14 @@ static void pps_tty_dcd_change(struct tty_struct *tty, unsigned int status,
         if (!ts)        /* No. Do it ourself! */
                 ts = &__ts;
 
+        BUG_ON(pps == NULL);
+
         /* Now do the PPS event report */
-        pps_event(id, ts, status ? PPS_CAPTUREASSERT : PPS_CAPTURECLEAR,
-                        NULL);
+        pps_event(pps, ts, status ? PPS_CAPTUREASSERT :
+                        PPS_CAPTURECLEAR, NULL);
 
-        pr_debug("PPS %s at %lu on source #%d\n",
-                        status ? "assert" : "clear", jiffies, id);
+        dev_dbg(pps->dev, "PPS %s at %lu\n",
+                        status ? "assert" : "clear", jiffies);
 }
 
 static int (*alias_n_tty_open)(struct tty_struct *tty);
@@ -54,6 +56,7 @@ static int pps_tty_open(struct tty_struct *tty)
         struct pps_source_info info;
         struct tty_driver *drv = tty->driver;
         int index = tty->index + drv->name_base;
+        struct pps_device *pps;
         int ret;
 
         info.owner = THIS_MODULE;
@@ -64,34 +67,42 @@ static int pps_tty_open(struct tty_struct *tty)
                         PPS_OFFSETASSERT | PPS_OFFSETCLEAR | \
                         PPS_CANWAIT | PPS_TSFMT_TSPEC;
 
-        ret = pps_register_source(&info, PPS_CAPTUREBOTH | \
+        pps = pps_register_source(&info, PPS_CAPTUREBOTH | \
                                 PPS_OFFSETASSERT | PPS_OFFSETCLEAR);
-        if (ret < 0) {
+        if (pps == NULL) {
                 pr_err("cannot register PPS source \"%s\"\n", info.path);
-                return ret;
+                return -ENOMEM;
         }
-        tty->disc_data = (void *)(long)ret;
+        tty->disc_data = pps;
 
         /* Should open N_TTY ldisc too */
         ret = alias_n_tty_open(tty);
-        if (ret < 0)
-                pps_unregister_source((long)tty->disc_data);
+        if (ret < 0) {
+                pr_err("cannot open tty ldisc \"%s\"\n", info.path);
+                goto err_unregister;
+        }
 
-        pr_info("PPS source #%d \"%s\" added\n", ret, info.path);
+        dev_info(pps->dev, "source \"%s\" added\n", info.path);
 
         return 0;
+
+err_unregister:
+        tty->disc_data = NULL;
+        pps_unregister_source(pps);
+        return ret;
 }
 
 static void (*alias_n_tty_close)(struct tty_struct *tty);
 
 static void pps_tty_close(struct tty_struct *tty)
 {
-        int id = (long)tty->disc_data;
+        struct pps_device *pps = (struct pps_device *)tty->disc_data;
 
-        pps_unregister_source(id);
         alias_n_tty_close(tty);
 
-        pr_info("PPS source #%d removed\n", id);
+        tty->disc_data = NULL;
+        dev_info(pps->dev, "removed\n");
+        pps_unregister_source(pps);
 }
 
 static struct tty_ldisc_ops pps_ldisc_ops;