3 files changed, 13 insertions, 28 deletions

diff --git a/drivers/pps/clients/pps-ktimer.c b/drivers/pps/clients/pps-ktimer.c
index 82583b0ff82d..436b4e4e71a1 100644
--- a/drivers/pps/clients/pps-ktimer.c
+++ b/drivers/pps/clients/pps-ktimer.c
@@ -52,17 +52,6 @@ static void pps_ktimer_event(unsigned long ptr)
 }
 
 /*
- * The echo function
- */
-
-static void pps_ktimer_echo(struct pps_device *pps, int event, void *data)
-{
-        dev_info(pps->dev, "echo %s %s\n",
-                event & PPS_CAPTUREASSERT ? "assert" : "",
-                event & PPS_CAPTURECLEAR ? "clear" : "");
-}
-
-/*
  * The PPS info struct
  */
 
@@ -72,7 +61,6 @@ static struct pps_source_info pps_ktimer_info = {
         .mode           = PPS_CAPTUREASSERT | PPS_OFFSETASSERT |
                           PPS_ECHOASSERT |
                           PPS_CANWAIT | PPS_TSFMT_TSPEC,
-        .echo           = pps_ktimer_echo,
         .owner          = THIS_MODULE,
 };
 
diff --git a/drivers/pps/clients/pps_parport.c b/drivers/pps/clients/pps_parport.c
index c571d6dd8f61..e1b4705ae3ec 100644
--- a/drivers/pps/clients/pps_parport.c
+++ b/drivers/pps/clients/pps_parport.c
@@ -133,14 +133,6 @@ out_both:
         return;
 }
 
-/* the PPS echo function */
-static void pps_echo(struct pps_device *pps, int event, void *data)
-{
-        dev_info(pps->dev, "echo %s %s\n",
-                event & PPS_CAPTUREASSERT ? "assert" : "",
-                event & PPS_CAPTURECLEAR ? "clear" : "");
-}
-
 static void parport_attach(struct parport *port)
 {
         struct pps_client_pp *device;
@@ -151,7 +143,6 @@ static void parport_attach(struct parport *port)
                                   PPS_OFFSETASSERT | PPS_OFFSETCLEAR | \
                                   PPS_ECHOASSERT | PPS_ECHOCLEAR | \
                                   PPS_CANWAIT | PPS_TSFMT_TSPEC,
-                .echo           = pps_echo,
                 .owner          = THIS_MODULE,
                 .dev            = NULL
         };
diff --git a/drivers/pps/kapi.c b/drivers/pps/kapi.c
index a4e8eb9fece6..f197e8ea185c 100644
--- a/drivers/pps/kapi.c
+++ b/drivers/pps/kapi.c
@@ -52,6 +52,14 @@ static void pps_add_offset(struct pps_ktime *ts, struct pps_ktime *offset)
         ts->sec += offset->sec;
 }
 
+static void pps_echo_client_default(struct pps_device *pps, int event,
+                void *data)
+{
+        dev_info(pps->dev, "echo %s %s\n",
+                event & PPS_CAPTUREASSERT ? "assert" : "",
+                event & PPS_CAPTURECLEAR ? "clear" : "");
+}
+
 /*
  * Exported functions
  */
@@ -80,13 +88,6 @@ struct pps_device *pps_register_source(struct pps_source_info *info,
                 err = -EINVAL;
                 goto pps_register_source_exit;
         }
-        if ((info->mode & (PPS_ECHOASSERT | PPS_ECHOCLEAR)) != 0 &&
-                        info->echo == NULL) {
-                pr_err("%s: echo function is not defined\n",
-                                        info->name);
-                err = -EINVAL;
-                goto pps_register_source_exit;
-        }
         if ((info->mode & (PPS_TSFMT_TSPEC | PPS_TSFMT_NTPFP)) == 0) {
                 pr_err("%s: unspecified time format\n",
                                         info->name);
@@ -108,6 +109,11 @@ struct pps_device *pps_register_source(struct pps_source_info *info,
         pps->params.mode = default_params;
         pps->info = *info;
 
+        /* check for default echo function */
+        if ((pps->info.mode & (PPS_ECHOASSERT | PPS_ECHOCLEAR)) &&
+                        pps->info.echo == NULL)
+                pps->info.echo = pps_echo_client_default;
+
         init_waitqueue_head(&pps->queue);
         spin_lock_init(&pps->lock);