caif: Move refcount from service layer to sock and dev.

[linux-block.git] / net / caif / cfsrvl.c

diff --git a/net/caif/cfsrvl.c b/net/caif/cfsrvl.c
index ab5e542526bf4e9e2f65562e56a97ccb96ba85bf..535a1e72b366a212e24a4b242cb76c81ceb54301 100644 (file)
--- a/net/caif/cfsrvl.c
+++ b/net/caif/cfsrvl.c
@@ -10,6 +10,7 @@
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include <net/caif/caif_layer.h>
 #include <net/caif/cfsrvl.h>
 #include <net/caif/cfpkt.h>
@@ -27,8 +28,8 @@ static void cfservl_ctrlcmd(struct cflayer *layr, enum caif_ctrlcmd ctrl,
 {
        struct cfsrvl *service = container_obj(layr);
 
-       caif_assert(layr->up != NULL);
-       caif_assert(layr->up->ctrlcmd != NULL);
+       if (layr->up == NULL || layr->up->ctrlcmd == NULL)
+               return;
 
        switch (ctrl) {
        case CAIF_CTRLCMD_INIT_RSP:
@@ -151,14 +152,9 @@ static int cfservl_modemcmd(struct cflayer *layr, enum caif_modemcmd ctrl)
        return -EINVAL;
 }
 
-void cfservl_destroy(struct cflayer *layer)
+static void cfsrvl_release(struct cflayer *layer)
 {
-       kfree(layer);
-}
-
-void cfsrvl_release(struct kref *kref)
-{
-       struct cfsrvl *service = container_of(kref, struct cfsrvl, ref);
+       struct cfsrvl *service = container_of(layer, struct cfsrvl, layer);
        kfree(service);
 }
 
@@ -178,10 +174,8 @@ void cfsrvl_init(struct cfsrvl *service,
        service->dev_info = *dev_info;
        service->supports_flowctrl = supports_flowctrl;
        service->release = cfsrvl_release;
-       kref_init(&service->ref);
 }
 
-
 bool cfsrvl_ready(struct cfsrvl *service, int *err)
 {
        if (service->open && service->modem_flow_on && service->phy_flow_on)
@@ -194,6 +188,7 @@ bool cfsrvl_ready(struct cfsrvl *service, int *err)
        *err = -EAGAIN;
        return false;
 }
+
 u8 cfsrvl_getphyid(struct cflayer *layer)
 {
        struct cfsrvl *servl = container_obj(layer);
@@ -205,3 +200,26 @@ bool cfsrvl_phyid_match(struct cflayer *layer, int phyid)
        struct cfsrvl *servl = container_obj(layer);
        return servl->dev_info.id == phyid;
 }
+
+void caif_free_client(struct cflayer *adap_layer)
+{
+       struct cfsrvl *servl;
+       if (adap_layer == NULL || adap_layer->dn == NULL)
+               return;
+       servl = container_obj(adap_layer->dn);
+       servl->release(&servl->layer);
+}
+EXPORT_SYMBOL(caif_free_client);
+
+void caif_client_register_refcnt(struct cflayer *adapt_layer,
+                                       void (*hold)(struct cflayer *lyr),
+                                       void (*put)(struct cflayer *lyr))
+{
+       struct cfsrvl *service;
+       service = container_of(adapt_layer->dn, struct cfsrvl, layer);
+
+       WARN_ON(adapt_layer == NULL || adapt_layer->dn == NULL);
+       service->hold = hold;
+       service->put = put;
+}
+EXPORT_SYMBOL(caif_client_register_refcnt);