staging: ozwpan: Remove dead code

No need to return a value from elt_buf_init().

Signed-off-by: Christoph Jaeger <email@christophjaeger.info>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/ozwpan/ozeltbuf.c b/drivers/staging/ozwpan/ozeltbuf.c
index bd560c67fc8ce0dcf150cb664e943b243ff3c97c..f6e64817fb166a780d02c27115ba4208215aec7c 100644 (file)
--- a/drivers/staging/ozwpan/ozeltbuf.c
+++ b/drivers/staging/ozwpan/ozeltbuf.c
@@ -16,7 +16,7 @@
 /*
  * Context: softirq-serialized
  */
-int oz_elt_buf_init(struct oz_elt_buf *buf)
+void oz_elt_buf_init(struct oz_elt_buf *buf)
 {
        memset(buf, 0, sizeof(struct oz_elt_buf));
        INIT_LIST_HEAD(&buf->stream_list);
@@ -24,7 +24,6 @@ int oz_elt_buf_init(struct oz_elt_buf *buf)
        INIT_LIST_HEAD(&buf->isoc_list);
        buf->max_free_elts = 32;
        spin_lock_init(&buf->lock);
-       return 0;
 }
 
 /*

diff --git a/drivers/staging/ozwpan/ozeltbuf.h b/drivers/staging/ozwpan/ozeltbuf.h
index 03c12f57b9bb3500ded4b0b9980ee0aebe9be600..384643272a432498f215e3ff298df506ec4ce116 100644 (file)
--- a/drivers/staging/ozwpan/ozeltbuf.h
+++ b/drivers/staging/ozwpan/ozeltbuf.h
@@ -50,7 +50,7 @@ struct oz_elt_buf {
        u8 tx_seq_num[OZ_NB_APPS];
 };
 
-int oz_elt_buf_init(struct oz_elt_buf *buf);
+void oz_elt_buf_init(struct oz_elt_buf *buf);
 void oz_elt_buf_term(struct oz_elt_buf *buf);
 struct oz_elt_info *oz_elt_info_alloc(struct oz_elt_buf *buf);
 void oz_elt_info_free(struct oz_elt_buf *buf, struct oz_elt_info *ei);

diff --git a/drivers/staging/ozwpan/ozpd.c b/drivers/staging/ozwpan/ozpd.c
index 10f1b3ac88322cfd3f81e9a048e082db14bccc9c..a27c6030e2f2e5e487039b316279b31c0c25adf1 100644 (file)
--- a/drivers/staging/ozwpan/ozpd.c
+++ b/drivers/staging/ozwpan/ozpd.c
@@ -175,10 +175,7 @@ struct oz_pd *oz_pd_alloc(const u8 *mac_addr)
                oz_pd_set_state(pd, OZ_PD_S_IDLE);
                pd->max_tx_size = OZ_MAX_TX_SIZE;
                ether_addr_copy(pd->mac_addr, mac_addr);
-               if (0 != oz_elt_buf_init(&pd->elt_buff)) {
-                       kfree(pd);
-                       pd = NULL;
-               }
+               oz_elt_buf_init(&pd->elt_buff);
                spin_lock_init(&pd->tx_frame_lock);
                INIT_LIST_HEAD(&pd->tx_queue);
                INIT_LIST_HEAD(&pd->farewell_list);