microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[SCSI] lpfc 8.2.2 : Style cleanups 

- Clean up all instances of mixed tab-space indentation
- Clean up sparse build errors
- Add appropriate static's

Signed-off-by: James Smart <James.Smart@emulex.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
James Smart 2007-08-02 11:10:37 -04:00 коммит произвёл James Bottomley
Родитель 51ef4c2689
Коммит 311464ec0b
11 изменённых файлов: 23 добавлений и 54 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
drivers/scsi/lpfc/lpfc.h
Просмотреть файл

@ -45,7 +45,7 @@ struct lpfc_sli2_slim;
#define LPFC_DISC_IOCB_BUFF_COUNT 20 #define LPFC_DISC_IOCB_BUFF_COUNT 20
#define LPFC_HB_MBOX_INTERVAL 5 /* Heart beat interval in seconds. */ #define LPFC_HB_MBOX_INTERVAL 5 /* Heart beat interval in seconds. */
#define LPFC_HB_MBOX_TIMEOUT 30 /* Heart beat timeout in seconds. */ #define LPFC_HB_MBOX_TIMEOUT 30 /* Heart beat timeout in seconds. */
/* Define macros for 64 bit support */ /* Define macros for 64 bit support */
#define putPaddrLow(addr) ((uint32_t) (0xffffffff & (u64)(addr))) #define putPaddrLow(addr) ((uint32_t) (0xffffffff & (u64)(addr)))
@ -381,7 +381,7 @@ struct lpfc_hba {
struct lpfc_sli sli; struct lpfc_sli sli;
uint32_t sli_rev; /* SLI2 or SLI3 */ uint32_t sli_rev; /* SLI2 or SLI3 */
uint32_t sli3_options; /* Mask of enabled SLI3 options */ uint32_t sli3_options; /* Mask of enabled SLI3 options */
#define LPFC_SLI3_ENABLED 0x01 #define LPFC_SLI3_ENABLED 0x01
#define LPFC_SLI3_HBQ_ENABLED 0x02 #define LPFC_SLI3_HBQ_ENABLED 0x02
#define LPFC_SLI3_NPIV_ENABLED 0x04 #define LPFC_SLI3_NPIV_ENABLED 0x04
#define LPFC_SLI3_VPORT_TEARDOWN 0x08 #define LPFC_SLI3_VPORT_TEARDOWN 0x08
@ -390,7 +390,7 @@ struct lpfc_hba {
enum hba_state link_state; enum hba_state link_state;
uint32_t link_flag; /* link state flags */ uint32_t link_flag; /* link state flags */
#define LS_LOOPBACK_MODE 0x1 /* NPort is in Loopback mode */ #define LS_LOOPBACK_MODE 0x1 /* NPort is in Loopback mode */
/* This flag is set while issuing */ /* This flag is set while issuing */
/* INIT_LINK mailbox command */ /* INIT_LINK mailbox command */
#define LS_NPIV_FAB_SUPPORTED 0x2 /* Fabric supports NPIV */ #define LS_NPIV_FAB_SUPPORTED 0x2 /* Fabric supports NPIV */

2
drivers/scsi/lpfc/lpfc_attr.c
Просмотреть файл

@ -430,7 +430,7 @@ lpfc_board_mode_store(struct class_device *cdev, const char *buf, size_t count)
return -EIO; return -EIO;
} }
int static int
lpfc_get_hba_info(struct lpfc_hba *phba, lpfc_get_hba_info(struct lpfc_hba *phba,
uint32_t *mxri, uint32_t *axri, uint32_t *mxri, uint32_t *axri,
uint32_t *mrpi, uint32_t *arpi, uint32_t *mrpi, uint32_t *arpi,

1
drivers/scsi/lpfc/lpfc_crtn.h
Просмотреть файл

@ -278,6 +278,7 @@ extern void lpfc_debugfs_disc_trc(struct lpfc_vport *, int, char *, uint32_t,
uint32_t, uint32_t); uint32_t, uint32_t);
extern void lpfc_debugfs_slow_ring_trc(struct lpfc_hba *, char *, uint32_t, extern void lpfc_debugfs_slow_ring_trc(struct lpfc_hba *, char *, uint32_t,
uint32_t, uint32_t); uint32_t, uint32_t);
extern struct lpfc_hbq_init *lpfc_hbq_defs[];
/* Interface exported by fabric iocb scheduler */ /* Interface exported by fabric iocb scheduler */
int lpfc_issue_fabric_iocb(struct lpfc_hba *, struct lpfc_iocbq *); int lpfc_issue_fabric_iocb(struct lpfc_hba *, struct lpfc_iocbq *);

4
drivers/scsi/lpfc/lpfc_ct.c
Просмотреть файл

@ -688,7 +688,7 @@ out:
return; return;
} }
void static void
lpfc_cmpl_ct_cmd_gff_id(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, lpfc_cmpl_ct_cmd_gff_id(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
struct lpfc_iocbq *rspiocb) struct lpfc_iocbq *rspiocb)
{ {
@ -885,7 +885,7 @@ lpfc_cmpl_ct_cmd_rff_id(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
return; return;
} }
int static int
lpfc_vport_symbolic_port_name(struct lpfc_vport *vport, char *symbol, lpfc_vport_symbolic_port_name(struct lpfc_vport *vport, char *symbol,
size_t size) size_t size)
{ {

8
drivers/scsi/lpfc/lpfc_debugfs.c
Просмотреть файл

@ -112,10 +112,8 @@ struct lpfc_debug {
int len; int len;
}; };
extern struct lpfc_hbq_init *lpfc_hbq_defs[]; static atomic_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
static unsigned long lpfc_debugfs_start_time = 0L;
atomic_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
unsigned long lpfc_debugfs_start_time = 0L;
static int static int
lpfc_debugfs_disc_trc_data(struct lpfc_vport *vport, char *buf, int size) lpfc_debugfs_disc_trc_data(struct lpfc_vport *vport, char *buf, int size)
@ -201,7 +199,7 @@ lpfc_debugfs_slow_ring_trc_data(struct lpfc_hba *phba, char *buf, int size)
return len; return len;
} }
int lpfc_debugfs_last_hbq = -1; static int lpfc_debugfs_last_hbq = -1;
static int static int
lpfc_debugfs_hbqinfo_data(struct lpfc_hba *phba, char *buf, int size) lpfc_debugfs_hbqinfo_data(struct lpfc_hba *phba, char *buf, int size)

32
drivers/scsi/lpfc/lpfc_hbadisc.c
Просмотреть файл

@ -349,7 +349,7 @@ lpfc_work_list_done(struct lpfc_hba *phba)
} }
void static void
lpfc_work_done(struct lpfc_hba *phba) lpfc_work_done(struct lpfc_hba *phba)
{ {
struct lpfc_sli_ring *pring; struct lpfc_sli_ring *pring;
@ -1591,7 +1591,7 @@ lpfc_nlp_state_name(char *buffer, size_t size, int state)
[NLP_STE_NPR_NODE] = "NPR", [NLP_STE_NPR_NODE] = "NPR",
}; };
if (state < ARRAY_SIZE(states) && states[state]) if (state < NLP_STE_MAX_STATE && states[state])
strlcpy(buffer, states[state], size); strlcpy(buffer, states[state], size);
else else
snprintf(buffer, size, "unknown (%d)", state); snprintf(buffer, size, "unknown (%d)", state);
@ -2814,32 +2814,6 @@ lpfc_findnode_wwpn(struct lpfc_vport *vport, struct lpfc_name *wwpn)
return ndlp; return ndlp;
} }
void
lpfc_dev_loss_delay(unsigned long ptr)
{
struct lpfc_nodelist *ndlp = (struct lpfc_nodelist *) ptr;
struct lpfc_vport *vport = ndlp->vport;
struct lpfc_hba *phba = vport->phba;
struct lpfc_work_evt *evtp = &ndlp->dev_loss_evt;
unsigned long flags;
evtp = &ndlp->dev_loss_evt;
spin_lock_irqsave(&phba->hbalock, flags);
if (!list_empty(&evtp->evt_listp)) {
spin_unlock_irqrestore(&phba->hbalock, flags);
return;
}
evtp->evt_arg1 = ndlp;
evtp->evt = LPFC_EVT_DEV_LOSS_DELAY;
list_add_tail(&evtp->evt_listp, &phba->work_list);
if (phba->work_wait)
lpfc_worker_wake_up(phba);
spin_unlock_irqrestore(&phba->hbalock, flags);
return;
}
void void
lpfc_nlp_init(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, lpfc_nlp_init(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
uint32_t did) uint32_t did)
@ -2863,7 +2837,7 @@ lpfc_nlp_init(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
return; return;
} }
void static void
lpfc_nlp_release(struct kref *kref) lpfc_nlp_release(struct kref *kref)
{ {
struct lpfc_nodelist *ndlp = container_of(kref, struct lpfc_nodelist, struct lpfc_nodelist *ndlp = container_of(kref, struct lpfc_nodelist,

10
drivers/scsi/lpfc/lpfc_hw.h
Просмотреть файл

@ -809,7 +809,7 @@ typedef struct _RNID { /* Structure is in Big Endian format */
} un; } un;
} RNID; } RNID;
typedef struct _RPS { /* Structure is in Big Endian format */ typedef struct _RPS { /* Structure is in Big Endian format */
union { union {
uint32_t portNum; uint32_t portNum;
struct lpfc_name portName; struct lpfc_name portName;
@ -827,7 +827,7 @@ typedef struct _RPS_RSP { /* Structure is in Big Endian format */
uint32_t crcCnt; uint32_t crcCnt;
} RPS_RSP; } RPS_RSP;
typedef struct _RPL { /* Structure is in Big Endian format */ typedef struct _RPL { /* Structure is in Big Endian format */
uint32_t maxsize; uint32_t maxsize;
uint32_t index; uint32_t index;
} RPL; } RPL;
@ -838,7 +838,7 @@ typedef struct _PORT_NUM_BLK {
struct lpfc_name portName; struct lpfc_name portName;
} PORT_NUM_BLK; } PORT_NUM_BLK;
typedef struct _RPL_RSP { /* Structure is in Big Endian format */ typedef struct _RPL_RSP { /* Structure is in Big Endian format */
uint32_t listLen; uint32_t listLen;
uint32_t index; uint32_t index;
PORT_NUM_BLK port_num_blk; PORT_NUM_BLK port_num_blk;
@ -2617,8 +2617,8 @@ typedef union {
LOAD_SM_VAR varLdSM; /* cmd = 1 (LOAD_SM) */ LOAD_SM_VAR varLdSM; /* cmd = 1 (LOAD_SM) */
READ_NV_VAR varRDnvp; /* cmd = 2 (READ_NVPARMS) */ READ_NV_VAR varRDnvp; /* cmd = 2 (READ_NVPARMS) */
WRITE_NV_VAR varWTnvp; /* cmd = 3 (WRITE_NVPARMS) */ WRITE_NV_VAR varWTnvp; /* cmd = 3 (WRITE_NVPARMS) */
BIU_DIAG_VAR varBIUdiag; /* cmd = 4 (RUN_BIU_DIAG) */ BIU_DIAG_VAR varBIUdiag; /* cmd = 4 (RUN_BIU_DIAG) */
INIT_LINK_VAR varInitLnk; /* cmd = 5 (INIT_LINK) */ INIT_LINK_VAR varInitLnk; /* cmd = 5 (INIT_LINK) */
DOWN_LINK_VAR varDwnLnk; /* cmd = 6 (DOWN_LINK) */ DOWN_LINK_VAR varDwnLnk; /* cmd = 6 (DOWN_LINK) */
CONFIG_LINK varCfgLnk; /* cmd = 7 (CONFIG_LINK) */ CONFIG_LINK varCfgLnk; /* cmd = 7 (CONFIG_LINK) */
PART_SLIM_VAR varSlim; /* cmd = 8 (PART_SLIM) */ PART_SLIM_VAR varSlim; /* cmd = 8 (PART_SLIM) */

4
drivers/scsi/lpfc/lpfc_init.c
Просмотреть файл

@ -53,10 +53,6 @@ static struct scsi_transport_template *lpfc_transport_template = NULL;
static struct scsi_transport_template *lpfc_vport_transport_template = NULL; static struct scsi_transport_template *lpfc_vport_transport_template = NULL;
static DEFINE_IDR(lpfc_hba_index); static DEFINE_IDR(lpfc_hba_index);
extern struct lpfc_hbq_init *lpfc_hbq_defs[];
/************************************************************************/ /************************************************************************/
/* */ /* */
/* lpfc_config_port_prep */ /* lpfc_config_port_prep */

4
drivers/scsi/lpfc/lpfc_sli.c
Просмотреть файл

@ -363,7 +363,7 @@ lpfc_sli_next_iotag(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq)
if (psli->iocbq_lookup) if (psli->iocbq_lookup)
memcpy(new_arr, old_arr, memcpy(new_arr, old_arr,
((psli->last_iotag + 1) * ((psli->last_iotag + 1) *
sizeof (struct lpfc_iocbq *))); sizeof (struct lpfc_iocbq *)));
psli->iocbq_lookup = new_arr; psli->iocbq_lookup = new_arr;
psli->iocbq_lookup_len = new_len; psli->iocbq_lookup_len = new_len;
psli->last_iotag = iotag; psli->last_iotag = iotag;
@ -623,7 +623,7 @@ struct lpfc_hbq_init *lpfc_hbq_defs[] = {
&lpfc_extra_hbq, &lpfc_extra_hbq,
}; };
int static int
lpfc_sli_hbqbuf_fill_hbqs(struct lpfc_hba *phba, uint32_t hbqno, uint32_t count) lpfc_sli_hbqbuf_fill_hbqs(struct lpfc_hba *phba, uint32_t hbqno, uint32_t count)
{ {
uint32_t i, start, end; uint32_t i, start, end;

2
drivers/scsi/lpfc/lpfc_sli.h
Просмотреть файл

@ -143,7 +143,7 @@ struct lpfc_sli_ring {
uint16_t numCiocb; /* number of command iocb's per ring */ uint16_t numCiocb; /* number of command iocb's per ring */
uint16_t numRiocb; /* number of rsp iocb's per ring */ uint16_t numRiocb; /* number of rsp iocb's per ring */
uint16_t sizeCiocb; /* Size of command iocb's in this ring */ uint16_t sizeCiocb; /* Size of command iocb's in this ring */
uint16_t sizeRiocb; /* Size of response iocb's in this ring */ uint16_t sizeRiocb; /* Size of response iocb's in this ring */
uint32_t fast_iotag; /* max fastlookup based iotag */ uint32_t fast_iotag; /* max fastlookup based iotag */
uint32_t iotag_ctr; /* keeps track of the next iotag to use */ uint32_t iotag_ctr; /* keeps track of the next iotag to use */

4
drivers/scsi/lpfc/lpfc_vport.c
Просмотреть файл

@ -331,7 +331,7 @@ error_out:
return rc; return rc;
} }
int static int
disable_vport(struct fc_vport *fc_vport) disable_vport(struct fc_vport *fc_vport)
{ {
struct lpfc_vport *vport = *(struct lpfc_vport **)fc_vport->dd_data; struct lpfc_vport *vport = *(struct lpfc_vport **)fc_vport->dd_data;
@ -376,7 +376,7 @@ disable_vport(struct fc_vport *fc_vport)
return VPORT_OK; return VPORT_OK;
} }
int static int
enable_vport(struct fc_vport *fc_vport) enable_vport(struct fc_vport *fc_vport)
{ {
struct lpfc_vport *vport = *(struct lpfc_vport **)fc_vport->dd_data; struct lpfc_vport *vport = *(struct lpfc_vport **)fc_vport->dd_data;