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

Commit 4305f183 authored by James Smart's avatar James Smart Committed by James Bottomley
Browse files

[SCSI] lpfc 8.3.33: Change Naming convention for SLI4 Interrupt vector 



Signed-off-by: default avatarJames Smart <james.smart@emulex.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent bf8dae83

drivers/scsi/lpfc/lpfc_init.c

+5 −1
Original line number Diff line number Diff line
@@ -8105,11 +8105,15 @@ lpfc_sli4_enable_msix(struct lpfc_hba *phba) 
	 * Assign MSI-X vectors to interrupt handlers

	 */

	for (index = 0; index < vectors; index++) {

		memset(&phba->sli4_hba.handler_name[index], 0, 16);

		sprintf((char *)&phba->sli4_hba.handler_name[index],

			 LPFC_DRIVER_HANDLER_NAME"%d", index);



		phba->sli4_hba.fcp_eq_hdl[index].idx = index;

		phba->sli4_hba.fcp_eq_hdl[index].phba = phba;

		rc = request_irq(phba->sli4_hba.msix_entries[index].vector,

				 &lpfc_sli4_hba_intr_handler, IRQF_SHARED,

				 LPFC_FP_DRIVER_HANDLER_NAME,

				 (char *)&phba->sli4_hba.handler_name[index],

				 &phba->sli4_hba.fcp_eq_hdl[index]);

		if (rc) {

			lpfc_printf_log(phba, KERN_WARNING, LOG_INIT,

drivers/scsi/lpfc/lpfc_sli4.h

+3 −0
Original line number Diff line number Diff line
@@ -430,6 +430,8 @@ struct lpfc_sli4_lnk_info { 
	uint8_t lnk_no;

};



#define LPFC_SLI4_HANDLER_NAME_SZ	16



/* SLI4 HBA data structure entries */

struct lpfc_sli4_hba {

	void __iomem *conf_regs_memmap_p; /* Kernel memory mapped address for
@@ -486,6 +488,7 @@ struct lpfc_sli4_hba { 
	struct lpfc_register sli_intf;

	struct lpfc_pc_sli4_params pc_sli4_params;

	struct msix_entry *msix_entries;

	uint8_t handler_name[LPFC_FCP_IO_CHAN_MAX][LPFC_SLI4_HANDLER_NAME_SZ];

	uint32_t cfg_eqn;

	uint32_t msix_vec_nr;

	struct lpfc_fcp_eq_hdl *fcp_eq_hdl; /* FCP per-WQ handle */

drivers/scsi/lpfc/lpfc_version.h

+5 −0
Original line number Diff line number Diff line
@@ -20,9 +20,14 @@ 


#define LPFC_DRIVER_VERSION "8.3.32"

#define LPFC_DRIVER_NAME		"lpfc"



/* Used for SLI 2/3 */

#define LPFC_SP_DRIVER_HANDLER_NAME	"lpfc:sp"

#define LPFC_FP_DRIVER_HANDLER_NAME	"lpfc:fp"



/* Used for SLI4 */

#define LPFC_DRIVER_HANDLER_NAME	"lpfc:"



#define LPFC_MODULE_DESC "Emulex LightPulse Fibre Channel SCSI driver " \

		LPFC_DRIVER_VERSION

#define LPFC_COPYRIGHT "Copyright(c) 2004-2009 Emulex.  All rights reserved."