ieee1394: de-inline some functions

This small reorganization of public csr1212 functions saves one
exported symbol and a few bytes in the driver modules.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

1 files changed, 24 insertions, 4 deletions

diff --git a/drivers/ieee1394/csr1212.c b/drivers/ieee1394/csr1212.c
index 54408cbe8f8..6c2f55bb946 100644
--- a/drivers/ieee1394/csr1212.c
+++ b/drivers/ieee1394/csr1212.c
@@ -518,7 +518,7 @@ void csr1212_detach_keyval_from_directory(struct csr1212_keyval *dir,
  * will be destroyed as well if their respective refcnts are 0.  By means of
  * list manipulation, this routine will descend a directory structure in a
  * non-recursive manner. */
-void _csr1212_destroy_keyval(struct csr1212_keyval *kv)
+static void csr1212_destroy_keyval(struct csr1212_keyval *kv)
 {
         struct csr1212_keyval *k, *a;
         struct csr1212_dentry dentry;
@@ -566,6 +566,14 @@ void _csr1212_destroy_keyval(struct csr1212_keyval *kv)
         }
 }
 
+void csr1212_release_keyval(struct csr1212_keyval *kv)
+{
+        if (kv->refcnt > 1)
+                kv->refcnt--;
+        else
+                csr1212_destroy_keyval(kv);
+}
+
 void csr1212_destroy_csr(struct csr1212_csr *csr)
 {
         struct csr1212_csr_rom_cache *c, *oc;
@@ -1251,7 +1259,8 @@ fail:
         return ret;
 }
 
-int _csr1212_read_keyval(struct csr1212_csr *csr, struct csr1212_keyval *kv)
+static int
+csr1212_read_keyval(struct csr1212_csr *csr, struct csr1212_keyval *kv)
 {
         struct csr1212_cache_region *cr, *ncr, *newcr = NULL;
         struct csr1212_keyval_img *kvi = NULL;
@@ -1412,6 +1421,17 @@ int _csr1212_read_keyval(struct csr1212_csr *csr, struct csr1212_keyval *kv)
         return csr1212_parse_keyval(kv, cache);
 }
 
+struct csr1212_keyval *
+csr1212_get_keyval(struct csr1212_csr *csr, struct csr1212_keyval *kv)
+{
+        if (!kv)
+                return NULL;
+        if (!kv->valid)
+                if (csr1212_read_keyval(csr, kv) != CSR1212_SUCCESS)
+                        return NULL;
+        return kv;
+}
+
 int csr1212_parse_csr(struct csr1212_csr *csr)
 {
         static const int mr_map[] = { 4, 64, 1024, 0 };
@@ -1443,7 +1463,7 @@ int csr1212_parse_csr(struct csr1212_csr *csr)
         csr->root_kv->valid = 0;
         csr->root_kv->next = csr->root_kv;
         csr->root_kv->prev = csr->root_kv;
-        ret = _csr1212_read_keyval(csr, csr->root_kv);
+        ret = csr1212_read_keyval(csr, csr->root_kv);
         if (ret != CSR1212_SUCCESS)
                 return ret;
 
@@ -1453,7 +1473,7 @@ int csr1212_parse_csr(struct csr1212_csr *csr)
              dentry; dentry = dentry->next) {
                 if (dentry->kv->key.id == CSR1212_KV_ID_EXTENDED_ROM &&
                         !dentry->kv->valid) {
-                        ret = _csr1212_read_keyval(csr, dentry->kv);
+                        ret = csr1212_read_keyval(csr, dentry->kv);
                         if (ret != CSR1212_SUCCESS)
                                 return ret;
                 }