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

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

[SCSI] libfc: Fix compilation warnings with allmodconfig 



When building with a .config generated from 'make allmodconfig'
some build warnings are generated. This patch corrects the warnings,
adds a FC_FID_NONE (= 0) enumeration for FC-IDs and cleans up one
variable naming to meet our variable naming conventions. For example,
fc_lport's should be named "lport," not "lp."

Signed-off-by: default avatarRobert Love <robert.w.love@intel.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent dd3fd72e

drivers/scsi/libfc/fc_elsct.c

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ static struct fc_seq *fc_elsct_send(struct fc_lport *lport, 
				    void *arg, u32 timer_msec)

{

	enum fc_rctl r_ctl;

	u32 did;

	u32 did = FC_FID_NONE;

	enum fc_fh_type fh_type;

	int rc;

drivers/scsi/libfc/fc_fcp.c

+3 −4
Original line number Diff line number Diff line
@@ -713,7 +713,7 @@ done: 
static void fc_fcp_recv(struct fc_seq *seq, struct fc_frame *fp, void *arg)

{

	struct fc_fcp_pkt *fsp = (struct fc_fcp_pkt *)arg;

	struct fc_lport *lp;

	struct fc_lport *lport = fsp->lp;

	struct fc_frame_header *fh;

	struct fcp_txrdy *dd;

	u8 r_ctl;
@@ -724,9 +724,8 @@ static void fc_fcp_recv(struct fc_seq *seq, struct fc_frame *fp, void *arg) 


	fh = fc_frame_header_get(fp);

	r_ctl = fh->fh_r_ctl;

	lp = fsp->lp;



	if (!(lp->state & LPORT_ST_READY))

	if (!(lport->state & LPORT_ST_READY))

		goto out;

	if (fc_fcp_lock_pkt(fsp))

		goto out;
@@ -779,7 +778,7 @@ errout: 
	if (IS_ERR(fp))

		fc_fcp_error(fsp, fp);

	else if (rc == -ENOMEM)

		fc_fcp_reduce_can_queue(lp);

		fc_fcp_reduce_can_queue(lport);

}



static void fc_fcp_resp(struct fc_fcp_pkt *fsp, struct fc_frame *fp)

drivers/scsi/libfc/fc_rport.c

+1 −1
Original line number Diff line number Diff line
@@ -509,7 +509,7 @@ static void fc_rport_plogi_resp(struct fc_seq *sp, struct fc_frame *fp, 
	struct fc_rport *rport = rp_arg;

	struct fc_rport_libfc_priv *rdata = rport->dd_data;

	struct fc_lport *lport = rdata->local_port;

	struct fc_els_flogi *plp;

	struct fc_els_flogi *plp = NULL;

	unsigned int tov;

	u16 csp_seq;

	u16 cssp_seq;

include/scsi/fc/fc_fs.h

+1 −0
Original line number Diff line number Diff line
@@ -149,6 +149,7 @@ enum fc_rctl { 
 * Well-known fabric addresses.

 */

enum fc_well_known_fid {

	FC_FID_NONE =           0x000000,       /* No destination */

	FC_FID_BCAST =		0xffffff,	/* broadcast */

	FC_FID_FLOGI =		0xfffffe,	/* fabric login */

	FC_FID_FCTRL =		0xfffffd,	/* fabric controller */