Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2ab99c9 authored by Robert Love's avatar Robert Love Committed by James Bottomley
Browse files

[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: default avatarRobert Love <robert.w.love@intel.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 34f42a07

drivers/scsi/fcoe/fc_transport_fcoe.c

+6 −5
Original line number Diff line number Diff line
@@ -62,8 +62,9 @@ struct pci_dev *fcoe_transport_pcidev(const struct net_device *netdev) 
 *

 * Returns: 0 for success

 */

static struct fcoe_transport_internal *fcoe_transport_device_lookup(

	struct fcoe_transport *t, struct net_device *netdev)

static struct fcoe_transport_internal *

fcoe_transport_device_lookup(struct fcoe_transport *t,

			     struct net_device *netdev)

{

	struct fcoe_transport_internal *ti;
@@ -217,8 +218,8 @@ static bool fcoe_transport_match(struct fcoe_transport *t, 
 *

 * TODO: return default sw transport if no other transport is found

 */

static struct fcoe_transport *fcoe_transport_lookup(

	struct net_device *netdev)

static struct fcoe_transport *

fcoe_transport_lookup(struct net_device *netdev)

{

	struct fcoe_transport *t;

drivers/scsi/fcoe/libfcoe.c

+7 −8
Original line number Diff line number Diff line
@@ -949,8 +949,8 @@ static struct net_device *fcoe_if_to_netdev(const char *buffer) 
 *

 * Returns: ptr to the struct module, NULL for failure

 */

static struct module *fcoe_netdev_to_module_owner(

	const struct net_device *netdev)

static struct module *

fcoe_netdev_to_module_owner(const struct net_device *netdev)

{

	struct device *dev;
@@ -1205,8 +1205,8 @@ EXPORT_SYMBOL_GPL(fcoe_clean_pending_queue); 
 * Returns: ptr to Scsi_Host

 * TODO: to libfc?

 */

static inline struct Scsi_Host *libfc_host_alloc(

	struct scsi_host_template *sht, int priv_size)

static inline struct Scsi_Host *

libfc_host_alloc(struct scsi_host_template *sht, int priv_size)

{

	return scsi_host_alloc(sht, sizeof(struct fc_lport) + priv_size);

}
@@ -1285,8 +1285,8 @@ EXPORT_SYMBOL_GPL(fcoe_wwn_from_mac); 
 *

 * Returns: NULL or the located fcoe_softc

 */

static struct fcoe_softc *fcoe_hostlist_lookup_softc(

	const struct net_device *dev)

static struct fcoe_softc *

fcoe_hostlist_lookup_softc(const struct net_device *dev)

{

	struct fcoe_softc *fc;
@@ -1426,7 +1426,6 @@ static int __init fcoe_init(void) 
			} else {

				fcoe_percpu[cpu] = NULL;

				kfree(p);



			}

		}

	}
@@ -1476,7 +1475,7 @@ static void __exit fcoe_exit(void) 
	 */

	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)

		fcoe_transport_release(fc->real_dev);

drivers/scsi/libfc/fc_exch.c

+5 −5
Original line number Diff line number Diff line
@@ -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

 * on the ep that should be released by the caller.

 */

static enum fc_pf_rjt_reason

fc_seq_lookup_recip(struct fc_exch_mgr *mp, struct fc_frame *fp)

static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_exch_mgr *mp,

						 struct fc_frame *fp)

{

	struct fc_frame_header *fh = fc_frame_header_get(fp);

	struct fc_exch *ep = NULL;
@@ -994,8 +994,8 @@ static void fc_seq_send_ack(struct fc_seq *sp, const struct fc_frame *rx_fp) 
 * Send BLS Reject.

 * This is for rejecting BA_ABTS only.

 */

static void

fc_exch_send_ba_rjt(struct fc_frame *rx_fp, enum fc_ba_rjt_reason reason,

static void fc_exch_send_ba_rjt(struct fc_frame *rx_fp,

				enum fc_ba_rjt_reason reason,

				enum fc_ba_rjt_explan explan)

{

	struct fc_frame *fp;

drivers/scsi/libfc/fc_rport.c

+2 −2
Original line number Diff line number Diff line
@@ -179,8 +179,8 @@ EXPORT_SYMBOL(fc_set_rport_loss_tmo); 
 * @flp: FLOGI payload structure

 * @maxval: upper limit, may be less than what is in the service parameters

 */

static unsigned int

fc_plogi_get_maxframe(struct fc_els_flogi *flp, unsigned int maxval)

static unsigned int fc_plogi_get_maxframe(struct fc_els_flogi *flp,

					  unsigned int maxval)

{

	unsigned int mfs;