提交 b2ab99c9 编写于 作者: R Robert Love 提交者: James Bottomley

[SCSI] libfc, fcoe: Cleanup function formatting and minor typos

1) There were a few functions with a strange layout, i.e. all
   arguments on the second line, when not necessary.

   Where ever possible I moved the return value to the same line
   as the function name. However, when the line was too long
   to have a single argument on the same line I moved the
   return value to above line. For example:

   <short return> <function name>(<arg 1>, <arg2>)

   and

   <very long return value>
   <function name>(<arg1>,
		   <arg2>)

2) Removed one extra whitespace line

3) Fixed two typos
Signed-off-by: NRobert Love <robert.w.love@intel.com>
Signed-off-by: NJames Bottomley <James.Bottomley@HansenPartnership.com>
上级 34f42a07
...@@ -62,8 +62,9 @@ struct pci_dev *fcoe_transport_pcidev(const struct net_device *netdev) ...@@ -62,8 +62,9 @@ struct pci_dev *fcoe_transport_pcidev(const struct net_device *netdev)
* *
* Returns: 0 for success * Returns: 0 for success
*/ */
static struct fcoe_transport_internal *fcoe_transport_device_lookup( static struct fcoe_transport_internal *
struct fcoe_transport *t, struct net_device *netdev) fcoe_transport_device_lookup(struct fcoe_transport *t,
struct net_device *netdev)
{ {
struct fcoe_transport_internal *ti; struct fcoe_transport_internal *ti;
...@@ -184,7 +185,7 @@ static void fcoe_transport_device_remove_all(struct fcoe_transport *t) ...@@ -184,7 +185,7 @@ static void fcoe_transport_device_remove_all(struct fcoe_transport *t)
* Returns: true for match up * Returns: true for match up
*/ */
static bool fcoe_transport_match(struct fcoe_transport *t, static bool fcoe_transport_match(struct fcoe_transport *t,
struct net_device *netdev) struct net_device *netdev)
{ {
/* match transport by vendor and device id */ /* match transport by vendor and device id */
struct pci_dev *pci; struct pci_dev *pci;
...@@ -217,8 +218,8 @@ static bool fcoe_transport_match(struct fcoe_transport *t, ...@@ -217,8 +218,8 @@ static bool fcoe_transport_match(struct fcoe_transport *t,
* *
* TODO: return default sw transport if no other transport is found * TODO: return default sw transport if no other transport is found
*/ */
static struct fcoe_transport *fcoe_transport_lookup( static struct fcoe_transport *
struct net_device *netdev) fcoe_transport_lookup(struct net_device *netdev)
{ {
struct fcoe_transport *t; struct fcoe_transport *t;
......
...@@ -949,8 +949,8 @@ static struct net_device *fcoe_if_to_netdev(const char *buffer) ...@@ -949,8 +949,8 @@ static struct net_device *fcoe_if_to_netdev(const char *buffer)
* *
* Returns: ptr to the struct module, NULL for failure * Returns: ptr to the struct module, NULL for failure
*/ */
static struct module *fcoe_netdev_to_module_owner( static struct module *
const struct net_device *netdev) fcoe_netdev_to_module_owner(const struct net_device *netdev)
{ {
struct device *dev; struct device *dev;
...@@ -1205,8 +1205,8 @@ EXPORT_SYMBOL_GPL(fcoe_clean_pending_queue); ...@@ -1205,8 +1205,8 @@ EXPORT_SYMBOL_GPL(fcoe_clean_pending_queue);
* Returns: ptr to Scsi_Host * Returns: ptr to Scsi_Host
* TODO: to libfc? * TODO: to libfc?
*/ */
static inline struct Scsi_Host *libfc_host_alloc( static inline struct Scsi_Host *
struct scsi_host_template *sht, int priv_size) libfc_host_alloc(struct scsi_host_template *sht, int priv_size)
{ {
return scsi_host_alloc(sht, sizeof(struct fc_lport) + priv_size); return scsi_host_alloc(sht, sizeof(struct fc_lport) + priv_size);
} }
...@@ -1285,8 +1285,8 @@ EXPORT_SYMBOL_GPL(fcoe_wwn_from_mac); ...@@ -1285,8 +1285,8 @@ EXPORT_SYMBOL_GPL(fcoe_wwn_from_mac);
* *
* Returns: NULL or the located fcoe_softc * Returns: NULL or the located fcoe_softc
*/ */
static struct fcoe_softc *fcoe_hostlist_lookup_softc( static struct fcoe_softc *
const struct net_device *dev) fcoe_hostlist_lookup_softc(const struct net_device *dev)
{ {
struct fcoe_softc *fc; struct fcoe_softc *fc;
...@@ -1426,7 +1426,6 @@ static int __init fcoe_init(void) ...@@ -1426,7 +1426,6 @@ static int __init fcoe_init(void)
} else { } else {
fcoe_percpu[cpu] = NULL; fcoe_percpu[cpu] = NULL;
kfree(p); kfree(p);
} }
} }
} }
...@@ -1476,7 +1475,7 @@ static void __exit fcoe_exit(void) ...@@ -1476,7 +1475,7 @@ static void __exit fcoe_exit(void)
*/ */
del_timer_sync(&fcoe_timer); del_timer_sync(&fcoe_timer);
/* releases the assocaited fcoe transport for each lport */ /* releases the associated fcoe transport for each lport */
list_for_each_entry_safe(fc, tmp, &fcoe_hostlist, list) list_for_each_entry_safe(fc, tmp, &fcoe_hostlist, list)
fcoe_transport_release(fc->real_dev); fcoe_transport_release(fc->real_dev);
......
...@@ -675,8 +675,8 @@ static struct fc_exch *fc_exch_resp(struct fc_exch_mgr *mp, struct fc_frame *fp) ...@@ -675,8 +675,8 @@ static struct fc_exch *fc_exch_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
* If fc_pf_rjt_reason is FC_RJT_NONE then this function will have a hold * If fc_pf_rjt_reason is FC_RJT_NONE then this function will have a hold
* on the ep that should be released by the caller. * on the ep that should be released by the caller.
*/ */
static enum fc_pf_rjt_reason static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_exch_mgr *mp,
fc_seq_lookup_recip(struct fc_exch_mgr *mp, struct fc_frame *fp) struct fc_frame *fp)
{ {
struct fc_frame_header *fh = fc_frame_header_get(fp); struct fc_frame_header *fh = fc_frame_header_get(fp);
struct fc_exch *ep = NULL; struct fc_exch *ep = NULL;
...@@ -994,9 +994,9 @@ static void fc_seq_send_ack(struct fc_seq *sp, const struct fc_frame *rx_fp) ...@@ -994,9 +994,9 @@ static void fc_seq_send_ack(struct fc_seq *sp, const struct fc_frame *rx_fp)
* Send BLS Reject. * Send BLS Reject.
* This is for rejecting BA_ABTS only. * This is for rejecting BA_ABTS only.
*/ */
static void static void fc_exch_send_ba_rjt(struct fc_frame *rx_fp,
fc_exch_send_ba_rjt(struct fc_frame *rx_fp, enum fc_ba_rjt_reason reason, enum fc_ba_rjt_reason reason,
enum fc_ba_rjt_explan explan) enum fc_ba_rjt_explan explan)
{ {
struct fc_frame *fp; struct fc_frame *fp;
struct fc_frame_header *rx_fh; struct fc_frame_header *rx_fh;
......
...@@ -179,8 +179,8 @@ EXPORT_SYMBOL(fc_set_rport_loss_tmo); ...@@ -179,8 +179,8 @@ EXPORT_SYMBOL(fc_set_rport_loss_tmo);
* @flp: FLOGI payload structure * @flp: FLOGI payload structure
* @maxval: upper limit, may be less than what is in the service parameters * @maxval: upper limit, may be less than what is in the service parameters
*/ */
static unsigned int static unsigned int fc_plogi_get_maxframe(struct fc_els_flogi *flp,
fc_plogi_get_maxframe(struct fc_els_flogi *flp, unsigned int maxval) unsigned int maxval)
{ {
unsigned int mfs; unsigned int mfs;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册