Commit a7ae725c authored by Christoph Jaeger's avatar Christoph Jaeger Committed by Greg Kroah-Hartman
Browse files

staging: ozwpan: Remove dead code 



No need to return a value from elt_buf_init().

Signed-off-by: default avatarChristoph Jaeger <email@christophjaeger.info>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4abc48d1

drivers/staging/ozwpan/ozeltbuf.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

}



/*

drivers/staging/ozwpan/ozeltbuf.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/staging/ozwpan/ozpd.c

+1 −4
Original line number Diff line number Diff line
@@ -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);