2 files changed, 2 insertions, 53 deletions

diff --git a/drivers/s390/cio/eadm_sch.c b/drivers/s390/cio/eadm_sch.c
index aca7bfc113aa..3a2ee4a740b4 100644
--- a/drivers/s390/cio/eadm_sch.c
+++ b/drivers/s390/cio/eadm_sch.c
@@ -190,7 +190,7 @@ static struct subchannel *eadm_get_idle_sch(void)
         return NULL;
 }
 
-static int eadm_start_aob(struct aob *aob)
+int eadm_start_aob(struct aob *aob)
 {
         struct eadm_private *private;
         struct subchannel *sch;
@@ -218,6 +218,7 @@ out_unlock:
 
         return ret;
 }
+EXPORT_SYMBOL_GPL(eadm_start_aob);
 
 static int eadm_subchannel_probe(struct subchannel *sch)
 {
@@ -380,11 +381,6 @@ static struct css_driver eadm_subchannel_driver = {
         .restore = eadm_subchannel_restore,
 };
 
-static struct eadm_ops eadm_ops = {
-        .eadm_start = eadm_start_aob,
-        .owner = THIS_MODULE,
-};
-
 static int __init eadm_sch_init(void)
 {
         int ret;
@@ -404,7 +400,6 @@ static int __init eadm_sch_init(void)
         if (ret)
                 goto cleanup;
 
-        register_eadm_ops(&eadm_ops);
         return ret;
 
 cleanup:
@@ -415,7 +410,6 @@ cleanup:
 
 static void __exit eadm_sch_exit(void)
 {
-        unregister_eadm_ops(&eadm_ops);
         css_driver_unregister(&eadm_subchannel_driver);
         isc_unregister(EADM_SCH_ISC);
         debug_unregister(eadm_debug);
diff --git a/drivers/s390/cio/scm.c b/drivers/s390/cio/scm.c
index 46ec25632e8b..15268edc54ae 100644
--- a/drivers/s390/cio/scm.c
+++ b/drivers/s390/cio/scm.c
@@ -15,8 +15,6 @@
 #include "chsc.h"
 
 static struct device *scm_root;
-static struct eadm_ops *eadm_ops;
-static DEFINE_MUTEX(eadm_ops_mutex);
 
 #define to_scm_dev(n) container_of(n, struct scm_device, dev)
 #define to_scm_drv(d) container_of(d, struct scm_driver, drv)
@@ -73,49 +71,6 @@ void scm_driver_unregister(struct scm_driver *scmdrv)
 }
 EXPORT_SYMBOL_GPL(scm_driver_unregister);
 
-int scm_get_ref(void)
-{
-        int ret = 0;
-
-        mutex_lock(&eadm_ops_mutex);
-        if (!eadm_ops || !try_module_get(eadm_ops->owner))
-                ret = -ENOENT;
-        mutex_unlock(&eadm_ops_mutex);
-
-        return ret;
-}
-EXPORT_SYMBOL_GPL(scm_get_ref);
-
-void scm_put_ref(void)
-{
-        mutex_lock(&eadm_ops_mutex);
-        module_put(eadm_ops->owner);
-        mutex_unlock(&eadm_ops_mutex);
-}
-EXPORT_SYMBOL_GPL(scm_put_ref);
-
-void register_eadm_ops(struct eadm_ops *ops)
-{
-        mutex_lock(&eadm_ops_mutex);
-        eadm_ops = ops;
-        mutex_unlock(&eadm_ops_mutex);
-}
-EXPORT_SYMBOL_GPL(register_eadm_ops);
-
-void unregister_eadm_ops(struct eadm_ops *ops)
-{
-        mutex_lock(&eadm_ops_mutex);
-        eadm_ops = NULL;
-        mutex_unlock(&eadm_ops_mutex);
-}
-EXPORT_SYMBOL_GPL(unregister_eadm_ops);
-
-int scm_start_aob(struct aob *aob)
-{
-        return eadm_ops->eadm_start(aob);
-}
-EXPORT_SYMBOL_GPL(scm_start_aob);
-
 void scm_irq_handler(struct aob *aob, int error)
 {
         struct aob_rq_header *aobrq = (void *) aob->request.data;