Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[SCSI] libfc: Fix compilation warnings with allmodconfig

Browse source 
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: Robert Love <robert.w.love@intel.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
This commit is contained in:
Robert Love 2009-04-21 16:27:41 -07:00 committed by James Bottomley
parent dd3fd72e69
commit a29e7646f4
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/scsi/libfc/fc_elsct.c
View file

@ -41,7 +41,7 @@ static struct fc_seq *fc_elsct_send(struct fc_lport *lport,
void *arg, u32 timer_msec) void *arg, u32 timer_msec)
{ {
enum fc_rctl r_ctl; enum fc_rctl r_ctl;
u32 did; u32 did = FC_FID_NONE;
enum fc_fh_type fh_type; enum fc_fh_type fh_type;
int rc; int rc;

7
drivers/scsi/libfc/fc_fcp.c
View file

@ -713,7 +713,7 @@ static void fc_fcp_reduce_can_queue(struct fc_lport *lp)
static void fc_fcp_recv(struct fc_seq *seq, struct fc_frame *fp, void *arg) 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_fcp_pkt *fsp = (struct fc_fcp_pkt *)arg;
struct fc_lport *lp; struct fc_lport *lport = fsp->lp;
struct fc_frame_header *fh; struct fc_frame_header *fh;
struct fcp_txrdy *dd; struct fcp_txrdy *dd;
u8 r_ctl; 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); fh = fc_frame_header_get(fp);
r_ctl = fh->fh_r_ctl; r_ctl = fh->fh_r_ctl;
lp = fsp->lp;
if (!(lp->state & LPORT_ST_READY)) if (!(lport->state & LPORT_ST_READY))
goto out; goto out;
if (fc_fcp_lock_pkt(fsp)) if (fc_fcp_lock_pkt(fsp))
goto out; goto out;
@ -779,7 +778,7 @@ static void fc_fcp_recv(struct fc_seq *seq, struct fc_frame *fp, void *arg)
if (IS_ERR(fp)) if (IS_ERR(fp))
fc_fcp_error(fsp, fp); fc_fcp_error(fsp, fp);
else if (rc == -ENOMEM) 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) static void fc_fcp_resp(struct fc_fcp_pkt *fsp, struct fc_frame *fp)

2
drivers/scsi/libfc/fc_rport.c
View file

@ -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 *rport = rp_arg;
struct fc_rport_libfc_priv *rdata = rport->dd_data; struct fc_rport_libfc_priv *rdata = rport->dd_data;
struct fc_lport *lport = rdata->local_port; struct fc_lport *lport = rdata->local_port;
struct fc_els_flogi *plp; struct fc_els_flogi *plp = NULL;
unsigned int tov; unsigned int tov;
u16 csp_seq; u16 csp_seq;
u16 cssp_seq; u16 cssp_seq;

1
include/scsi/fc/fc_fs.h
View file

@ -149,6 +149,7 @@ enum fc_rctl {
* Well-known fabric addresses. * Well-known fabric addresses.
*/ */
enum fc_well_known_fid { enum fc_well_known_fid {
FC_FID_NONE = 0x000000, /* No destination */
FC_FID_BCAST = 0xffffff, /* broadcast */ FC_FID_BCAST = 0xffffff, /* broadcast */
FC_FID_FLOGI = 0xfffffe, /* fabric login */ FC_FID_FLOGI = 0xfffffe, /* fabric login */
FC_FID_FCTRL = 0xfffffd, /* fabric controller */ FC_FID_FCTRL = 0xfffffd, /* fabric controller */