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

Commit 88166242 authored by Jing Huang's avatar Jing Huang Committed by James Bottomley
Browse files

[SCSI] bfa: rename log_level to bfa_log_level 



Rename log_level to bfa_log_level to make the global variable more bfa
specific and avoid clashes with other drivers which was causing a
build failure.

Signed-off-by: default avatarJing Huang <huangj@brocade.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent b0c3844d

drivers/scsi/bfa/bfa_fcs.c

+2 −2
Original line number Diff line number Diff line
@@ -677,7 +677,7 @@ bfa_fcs_fabric_sm_isolated(struct bfa_fcs_fabric_s *fabric, 
	bfa_trc(fabric->fcs, event);

	wwn2str(pwwn_ptr, fabric->bport.port_cfg.pwwn);



	BFA_LOG(KERN_INFO, bfad, log_level,

	BFA_LOG(KERN_INFO, bfad, bfa_log_level,

		"Port is isolated due to VF_ID mismatch. "

		"PWWN: %s Port VF_ID: %04x switch port VF_ID: %04x.",

		pwwn_ptr, fabric->fcs->port_vfid,
@@ -1411,7 +1411,7 @@ bfa_fcs_fabric_set_fabric_name(struct bfa_fcs_fabric_s *fabric, 
		wwn2str(pwwn_ptr, bfa_fcs_lport_get_pwwn(&fabric->bport));

		wwn2str(fwwn_ptr,

			bfa_fcs_lport_get_fabric_name(&fabric->bport));

		BFA_LOG(KERN_WARNING, bfad, log_level,

		BFA_LOG(KERN_WARNING, bfad, bfa_log_level,

			"Base port WWN = %s Fabric WWN = %s\n",

			pwwn_ptr, fwwn_ptr);

	}

drivers/scsi/bfa/bfa_fcs_fcpim.c

+3 −3
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ bfa_fcs_itnim_sm_hcb_online(struct bfa_fcs_itnim_s *itnim, 
		bfa_fcb_itnim_online(itnim->itnim_drv);

		wwn2str(lpwwn_buf, bfa_fcs_lport_get_pwwn(itnim->rport->port));

		wwn2str(rpwwn_buf, itnim->rport->pwwn);

		BFA_LOG(KERN_INFO, bfad, log_level,

		BFA_LOG(KERN_INFO, bfad, bfa_log_level,

		"Target (WWN = %s) is online for initiator (WWN = %s)\n",

		rpwwn_buf, lpwwn_buf);

		break;
@@ -301,11 +301,11 @@ bfa_fcs_itnim_sm_online(struct bfa_fcs_itnim_s *itnim, 
		wwn2str(lpwwn_buf, bfa_fcs_lport_get_pwwn(itnim->rport->port));

		wwn2str(rpwwn_buf, itnim->rport->pwwn);

		if (bfa_fcs_lport_is_online(itnim->rport->port) == BFA_TRUE)

			BFA_LOG(KERN_ERR, bfad, log_level,

			BFA_LOG(KERN_ERR, bfad, bfa_log_level,

			"Target (WWN = %s) connectivity lost for "

			"initiator (WWN = %s)\n", rpwwn_buf, lpwwn_buf);

		else

			BFA_LOG(KERN_INFO, bfad, log_level,

			BFA_LOG(KERN_INFO, bfad, bfa_log_level,

			"Target (WWN = %s) offlined by initiator (WWN = %s)\n",

			rpwwn_buf, lpwwn_buf);

		break;

drivers/scsi/bfa/bfa_fcs_lport.c

+5 −5
Original line number Diff line number Diff line
@@ -491,7 +491,7 @@ bfa_fcs_lport_online_actions(struct bfa_fcs_lport_s *port) 
	__port_action[port->fabric->fab_type].online(port);



	wwn2str(lpwwn_buf, bfa_fcs_lport_get_pwwn(port));

	BFA_LOG(KERN_INFO, bfad, log_level,

	BFA_LOG(KERN_INFO, bfad, bfa_log_level,

		"Logical port online: WWN = %s Role = %s\n",

		lpwwn_buf, "Initiator");
@@ -512,11 +512,11 @@ bfa_fcs_lport_offline_actions(struct bfa_fcs_lport_s *port) 


	wwn2str(lpwwn_buf, bfa_fcs_lport_get_pwwn(port));

	if (bfa_fcs_fabric_is_online(port->fabric) == BFA_TRUE)

		BFA_LOG(KERN_ERR, bfad, log_level,

		BFA_LOG(KERN_ERR, bfad, bfa_log_level,

		"Logical port lost fabric connectivity: WWN = %s Role = %s\n",

		lpwwn_buf, "Initiator");

	else

		BFA_LOG(KERN_INFO, bfad, log_level,

		BFA_LOG(KERN_INFO, bfad, bfa_log_level,

		"Logical port taken offline: WWN = %s Role = %s\n",

		lpwwn_buf, "Initiator");
@@ -573,7 +573,7 @@ bfa_fcs_lport_deleted(struct bfa_fcs_lport_s *port) 
	char    lpwwn_buf[BFA_STRING_32];



	wwn2str(lpwwn_buf, bfa_fcs_lport_get_pwwn(port));

	BFA_LOG(KERN_INFO, bfad, log_level,

	BFA_LOG(KERN_INFO, bfad, bfa_log_level,

		"Logical port deleted: WWN = %s Role = %s\n",

		lpwwn_buf, "Initiator");
@@ -878,7 +878,7 @@ bfa_fcs_lport_init(struct bfa_fcs_lport_s *lport, 
					vport ? vport->vport_drv : NULL);



	wwn2str(lpwwn_buf, bfa_fcs_lport_get_pwwn(lport));

	BFA_LOG(KERN_INFO, bfad, log_level,

	BFA_LOG(KERN_INFO, bfad, bfa_log_level,

		"New logical port created: WWN = %s Role = %s\n",

		lpwwn_buf, "Initiator");

drivers/scsi/bfa/bfa_fcs_rport.c

+3 −3
Original line number Diff line number Diff line
@@ -2056,7 +2056,7 @@ bfa_fcs_rport_online_action(struct bfa_fcs_rport_s *rport) 
	wwn2str(lpwwn_buf, bfa_fcs_lport_get_pwwn(port));

	wwn2str(rpwwn_buf, rport->pwwn);

	if (!BFA_FCS_PID_IS_WKA(rport->pid))

		BFA_LOG(KERN_INFO, bfad, log_level,

		BFA_LOG(KERN_INFO, bfad, bfa_log_level,

		"Remote port (WWN = %s) online for logical port (WWN = %s)\n",

		rpwwn_buf, lpwwn_buf);

}
@@ -2075,12 +2075,12 @@ bfa_fcs_rport_offline_action(struct bfa_fcs_rport_s *rport) 
	wwn2str(rpwwn_buf, rport->pwwn);

	if (!BFA_FCS_PID_IS_WKA(rport->pid)) {

		if (bfa_fcs_lport_is_online(rport->port) == BFA_TRUE)

			BFA_LOG(KERN_ERR, bfad, log_level,

			BFA_LOG(KERN_ERR, bfad, bfa_log_level,

				"Remote port (WWN = %s) connectivity lost for "

				"logical port (WWN = %s)\n",

				rpwwn_buf, lpwwn_buf);

		else

			BFA_LOG(KERN_INFO, bfad, log_level,

			BFA_LOG(KERN_INFO, bfad, bfa_log_level,

				"Remote port (WWN = %s) offlined by "

				"logical port (WWN = %s)\n",

				rpwwn_buf, lpwwn_buf);

drivers/scsi/bfa/bfa_ioc.c

+4 −4
Original line number Diff line number Diff line
@@ -402,7 +402,7 @@ bfa_ioc_sm_op_entry(struct bfa_ioc_s *ioc) 


	ioc->cbfn->enable_cbfn(ioc->bfa, BFA_STATUS_OK);

	bfa_ioc_hb_monitor(ioc);

	BFA_LOG(KERN_INFO, bfad, log_level, "IOC enabled\n");

	BFA_LOG(KERN_INFO, bfad, bfa_log_level, "IOC enabled\n");

}



static void
@@ -444,7 +444,7 @@ bfa_ioc_sm_disabling_entry(struct bfa_ioc_s *ioc) 
{

	struct bfad_s *bfad = (struct bfad_s *)ioc->bfa->bfad;

	bfa_iocpf_disable(ioc);

	BFA_LOG(KERN_INFO, bfad, log_level, "IOC disabled\n");

	BFA_LOG(KERN_INFO, bfad, bfa_log_level, "IOC disabled\n");

}



/*
@@ -565,7 +565,7 @@ bfa_ioc_sm_fail_entry(struct bfa_ioc_s *ioc) 
		notify->cbfn(notify->cbarg);

	}



	BFA_LOG(KERN_CRIT, bfad, log_level,

	BFA_LOG(KERN_CRIT, bfad, bfa_log_level,

		"Heart Beat of IOC has failed\n");

}
@@ -1812,7 +1812,7 @@ bfa_ioc_pf_fwmismatch(struct bfa_ioc_s *ioc) 
	 * Provide enable completion callback.

	 */

	ioc->cbfn->enable_cbfn(ioc->bfa, BFA_STATUS_IOC_FAILURE);

	BFA_LOG(KERN_WARNING, bfad, log_level,

	BFA_LOG(KERN_WARNING, bfad, bfa_log_level,

		"Running firmware version is incompatible "

		"with the driver version\n");

}