net: return operator cleanup
Change "return (EXPR);" to "return EXPR;" return is not a function, parentheses are not required. Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
committed by
David S. Miller
parent
6a08d194ee
commit
a02cec2155
@ -573,9 +573,9 @@ static int irda_find_lsap_sel(struct irda_sock *self, char *name)
|
||||
/* Requested object/attribute doesn't exist */
|
||||
if((self->errno == IAS_CLASS_UNKNOWN) ||
|
||||
(self->errno == IAS_ATTRIB_UNKNOWN))
|
||||
return (-EADDRNOTAVAIL);
|
||||
return -EADDRNOTAVAIL;
|
||||
else
|
||||
return (-EHOSTUNREACH);
|
||||
return -EHOSTUNREACH;
|
||||
}
|
||||
|
||||
/* Get the remote TSAP selector */
|
||||
@ -663,7 +663,7 @@ static int irda_discover_daddr_and_lsap_sel(struct irda_sock *self, char *name)
|
||||
__func__, name);
|
||||
self->daddr = DEV_ADDR_ANY;
|
||||
kfree(discoveries);
|
||||
return(-ENOTUNIQ);
|
||||
return -ENOTUNIQ;
|
||||
}
|
||||
/* First time we found that one, save it ! */
|
||||
daddr = self->daddr;
|
||||
@ -677,7 +677,7 @@ static int irda_discover_daddr_and_lsap_sel(struct irda_sock *self, char *name)
|
||||
IRDA_DEBUG(0, "%s(), unexpected IAS query failure\n", __func__);
|
||||
self->daddr = DEV_ADDR_ANY;
|
||||
kfree(discoveries);
|
||||
return(-EHOSTUNREACH);
|
||||
return -EHOSTUNREACH;
|
||||
break;
|
||||
}
|
||||
}
|
||||
@ -689,7 +689,7 @@ static int irda_discover_daddr_and_lsap_sel(struct irda_sock *self, char *name)
|
||||
IRDA_DEBUG(1, "%s(), cannot discover service ''%s'' in any device !!!\n",
|
||||
__func__, name);
|
||||
self->daddr = DEV_ADDR_ANY;
|
||||
return(-EADDRNOTAVAIL);
|
||||
return -EADDRNOTAVAIL;
|
||||
}
|
||||
|
||||
/* Revert back to discovered device & service */
|
||||
@ -2465,9 +2465,9 @@ bed:
|
||||
/* Requested object/attribute doesn't exist */
|
||||
if((self->errno == IAS_CLASS_UNKNOWN) ||
|
||||
(self->errno == IAS_ATTRIB_UNKNOWN))
|
||||
return (-EADDRNOTAVAIL);
|
||||
return -EADDRNOTAVAIL;
|
||||
else
|
||||
return (-EHOSTUNREACH);
|
||||
return -EHOSTUNREACH;
|
||||
}
|
||||
|
||||
/* Translate from internal to user structure */
|
||||
|
@ -315,7 +315,7 @@ struct irda_device_info *irlmp_copy_discoveries(hashbin_t *log, int *pn,
|
||||
|
||||
/* Get the actual number of device in the buffer and return */
|
||||
*pn = i;
|
||||
return(buffer);
|
||||
return buffer;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PROC_FS
|
||||
|
@ -449,8 +449,8 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
|
||||
}
|
||||
|
||||
#ifdef SERIAL_DO_RESTART
|
||||
return ((self->flags & ASYNC_HUP_NOTIFY) ?
|
||||
-EAGAIN : -ERESTARTSYS);
|
||||
return (self->flags & ASYNC_HUP_NOTIFY) ?
|
||||
-EAGAIN : -ERESTARTSYS;
|
||||
#else
|
||||
return -EAGAIN;
|
||||
#endif
|
||||
|
@ -939,7 +939,7 @@ struct irda_device_info *irlmp_get_discoveries(int *pn, __u16 mask, int nslots)
|
||||
}
|
||||
|
||||
/* Return current cached discovery log */
|
||||
return(irlmp_copy_discoveries(irlmp->cachelog, pn, mask, TRUE));
|
||||
return irlmp_copy_discoveries(irlmp->cachelog, pn, mask, TRUE);
|
||||
}
|
||||
EXPORT_SYMBOL(irlmp_get_discoveries);
|
||||
|
||||
|
@ -448,7 +448,7 @@ static struct lsap_cb *irlmp_find_lsap(struct lap_cb *self, __u8 dlsap_sel,
|
||||
(self->cache.slsap_sel == slsap_sel) &&
|
||||
(self->cache.dlsap_sel == dlsap_sel))
|
||||
{
|
||||
return (self->cache.lsap);
|
||||
return self->cache.lsap;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
@ -238,7 +238,7 @@ irnet_ias_to_tsap(irnet_socket * self,
|
||||
DEXIT(IRDA_SR_TRACE, "\n");
|
||||
|
||||
/* Return the TSAP */
|
||||
return(dtsap_sel);
|
||||
return dtsap_sel;
|
||||
}
|
||||
|
||||
/*------------------------------------------------------------------*/
|
||||
@ -301,7 +301,7 @@ irnet_connect_tsap(irnet_socket * self)
|
||||
{
|
||||
clear_bit(0, &self->ttp_connect);
|
||||
DERROR(IRDA_SR_ERROR, "connect aborted!\n");
|
||||
return(err);
|
||||
return err;
|
||||
}
|
||||
|
||||
/* Connect to remote device */
|
||||
@ -312,7 +312,7 @@ irnet_connect_tsap(irnet_socket * self)
|
||||
{
|
||||
clear_bit(0, &self->ttp_connect);
|
||||
DERROR(IRDA_SR_ERROR, "connect aborted!\n");
|
||||
return(err);
|
||||
return err;
|
||||
}
|
||||
|
||||
/* The above call is non-blocking.
|
||||
@ -321,7 +321,7 @@ irnet_connect_tsap(irnet_socket * self)
|
||||
* See you there ;-) */
|
||||
|
||||
DEXIT(IRDA_SR_TRACE, "\n");
|
||||
return(err);
|
||||
return err;
|
||||
}
|
||||
|
||||
/*------------------------------------------------------------------*/
|
||||
@ -362,10 +362,10 @@ irnet_discover_next_daddr(irnet_socket * self)
|
||||
/* The above request is non-blocking.
|
||||
* After a while, IrDA will call us back in irnet_discovervalue_confirm()
|
||||
* We will then call irnet_ias_to_tsap() and come back here again... */
|
||||
return(0);
|
||||
return 0;
|
||||
}
|
||||
else
|
||||
return(1);
|
||||
return 1;
|
||||
}
|
||||
|
||||
/*------------------------------------------------------------------*/
|
||||
@ -436,7 +436,7 @@ irnet_discover_daddr_and_lsap_sel(irnet_socket * self)
|
||||
/* Follow me in irnet_discovervalue_confirm() */
|
||||
|
||||
DEXIT(IRDA_SR_TRACE, "\n");
|
||||
return(0);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*------------------------------------------------------------------*/
|
||||
@ -485,7 +485,7 @@ irnet_dname_to_daddr(irnet_socket * self)
|
||||
/* No luck ! */
|
||||
DEBUG(IRDA_SR_INFO, "cannot discover device ``%s'' !!!\n", self->rname);
|
||||
kfree(discoveries);
|
||||
return(-EADDRNOTAVAIL);
|
||||
return -EADDRNOTAVAIL;
|
||||
}
|
||||
|
||||
|
||||
@ -527,7 +527,7 @@ irda_irnet_create(irnet_socket * self)
|
||||
INIT_WORK(&self->disconnect_work, irnet_ppp_disconnect);
|
||||
|
||||
DEXIT(IRDA_SOCK_TRACE, "\n");
|
||||
return(0);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*------------------------------------------------------------------*/
|
||||
@ -601,7 +601,7 @@ irda_irnet_connect(irnet_socket * self)
|
||||
* We will finish the connection procedure in irnet_connect_tsap().
|
||||
*/
|
||||
DEXIT(IRDA_SOCK_TRACE, "\n");
|
||||
return(0);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*------------------------------------------------------------------*/
|
||||
@ -733,7 +733,7 @@ irnet_daddr_to_dname(irnet_socket * self)
|
||||
/* No luck ! */
|
||||
DEXIT(IRDA_SERV_INFO, ": cannot discover device 0x%08x !!!\n", self->daddr);
|
||||
kfree(discoveries);
|
||||
return(-EADDRNOTAVAIL);
|
||||
return -EADDRNOTAVAIL;
|
||||
}
|
||||
|
||||
/*------------------------------------------------------------------*/
|
||||
|
@ -166,7 +166,7 @@ irnet_ctrl_write(irnet_socket * ap,
|
||||
}
|
||||
|
||||
/* Success : we have parsed all commands successfully */
|
||||
return(count);
|
||||
return count;
|
||||
}
|
||||
|
||||
#ifdef INITIAL_DISCOVERY
|
||||
@ -300,7 +300,7 @@ irnet_ctrl_read(irnet_socket * ap,
|
||||
}
|
||||
|
||||
DEXIT(CTRL_TRACE, "\n");
|
||||
return(strlen(event));
|
||||
return strlen(event);
|
||||
}
|
||||
#endif /* INITIAL_DISCOVERY */
|
||||
|
||||
@ -409,7 +409,7 @@ irnet_ctrl_read(irnet_socket * ap,
|
||||
}
|
||||
|
||||
DEXIT(CTRL_TRACE, "\n");
|
||||
return(strlen(event));
|
||||
return strlen(event);
|
||||
}
|
||||
|
||||
/*------------------------------------------------------------------*/
|
||||
@ -623,7 +623,7 @@ dev_irnet_poll(struct file * file,
|
||||
mask |= irnet_ctrl_poll(ap, file, wait);
|
||||
|
||||
DEXIT(FS_TRACE, " - mask=0x%X\n", mask);
|
||||
return(mask);
|
||||
return mask;
|
||||
}
|
||||
|
||||
/*------------------------------------------------------------------*/
|
||||
|
Reference in New Issue
Block a user