mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
staging: ozwpan: Move code from success handling to error handling
The original version was success handling rather than error handling, therefore this patch reduces nesting. Signed-off-by: Quentin Lambert <lambert.quentin@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
e03b7297f8
commit
6498613d2c
2 changed files with 36 additions and 33 deletions
|
@ -283,15 +283,17 @@ static struct oz_endpoint *oz_ep_alloc(int buffer_size, gfp_t mem_flags)
|
|||
struct oz_endpoint *ep;
|
||||
|
||||
ep = kzalloc(sizeof(struct oz_endpoint)+buffer_size, mem_flags);
|
||||
if (ep) {
|
||||
INIT_LIST_HEAD(&ep->urb_list);
|
||||
INIT_LIST_HEAD(&ep->link);
|
||||
ep->credit = -1;
|
||||
if (buffer_size) {
|
||||
ep->buffer_size = buffer_size;
|
||||
ep->buffer = (u8 *)(ep+1);
|
||||
}
|
||||
if (!ep)
|
||||
return NULL;
|
||||
|
||||
INIT_LIST_HEAD(&ep->urb_list);
|
||||
INIT_LIST_HEAD(&ep->link);
|
||||
ep->credit = -1;
|
||||
if (buffer_size) {
|
||||
ep->buffer_size = buffer_size;
|
||||
ep->buffer = (u8 *)(ep+1);
|
||||
}
|
||||
|
||||
return ep;
|
||||
}
|
||||
|
||||
|
|
|
@ -103,34 +103,35 @@ void oz_pd_put(struct oz_pd *pd)
|
|||
struct oz_pd *oz_pd_alloc(const u8 *mac_addr)
|
||||
{
|
||||
struct oz_pd *pd;
|
||||
int i;
|
||||
|
||||
pd = kzalloc(sizeof(struct oz_pd), GFP_ATOMIC);
|
||||
if (pd) {
|
||||
int i;
|
||||
if (!pd)
|
||||
return NULL;
|
||||
|
||||
atomic_set(&pd->ref_count, 2);
|
||||
for (i = 0; i < OZ_NB_APPS; i++)
|
||||
spin_lock_init(&pd->app_lock[i]);
|
||||
pd->last_rx_pkt_num = 0xffffffff;
|
||||
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);
|
||||
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);
|
||||
pd->last_sent_frame = &pd->tx_queue;
|
||||
spin_lock_init(&pd->stream_lock);
|
||||
INIT_LIST_HEAD(&pd->stream_list);
|
||||
tasklet_init(&pd->heartbeat_tasklet, oz_pd_heartbeat_handler,
|
||||
(unsigned long)pd);
|
||||
tasklet_init(&pd->timeout_tasklet, oz_pd_timeout_handler,
|
||||
(unsigned long)pd);
|
||||
hrtimer_init(&pd->heartbeat, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
|
||||
hrtimer_init(&pd->timeout, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
|
||||
pd->heartbeat.function = oz_pd_heartbeat_event;
|
||||
pd->timeout.function = oz_pd_timeout_event;
|
||||
|
||||
atomic_set(&pd->ref_count, 2);
|
||||
for (i = 0; i < OZ_NB_APPS; i++)
|
||||
spin_lock_init(&pd->app_lock[i]);
|
||||
pd->last_rx_pkt_num = 0xffffffff;
|
||||
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);
|
||||
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);
|
||||
pd->last_sent_frame = &pd->tx_queue;
|
||||
spin_lock_init(&pd->stream_lock);
|
||||
INIT_LIST_HEAD(&pd->stream_list);
|
||||
tasklet_init(&pd->heartbeat_tasklet, oz_pd_heartbeat_handler,
|
||||
(unsigned long)pd);
|
||||
tasklet_init(&pd->timeout_tasklet, oz_pd_timeout_handler,
|
||||
(unsigned long)pd);
|
||||
hrtimer_init(&pd->heartbeat, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
|
||||
hrtimer_init(&pd->timeout, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
|
||||
pd->heartbeat.function = oz_pd_heartbeat_event;
|
||||
pd->timeout.function = oz_pd_timeout_event;
|
||||
}
|
||||
return pd;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue