mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
[SCSI] bfa: fix regular sparse check warnings.
Fix all sparse check warnings from make C=2. Signed-off-by: Maggie <xmzhang@brocade.com> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
This commit is contained in:
parent
3db86353ab
commit
52f94b6fd0
9 changed files with 52 additions and 28 deletions
|
@ -2103,7 +2103,7 @@ bfa_fcs_lport_fdmi_timeout(void *arg)
|
|||
bfa_sm_send_event(fdmi, FDMISM_EVENT_TIMEOUT);
|
||||
}
|
||||
|
||||
void
|
||||
static void
|
||||
bfa_fcs_fdmi_get_hbaattr(struct bfa_fcs_lport_fdmi_s *fdmi,
|
||||
struct bfa_fcs_fdmi_hba_attr_s *hba_attr)
|
||||
{
|
||||
|
@ -2147,7 +2147,7 @@ bfa_fcs_fdmi_get_hbaattr(struct bfa_fcs_lport_fdmi_s *fdmi,
|
|||
hba_attr->max_ct_pyld = cpu_to_be32(FC_MAX_PDUSZ);
|
||||
}
|
||||
|
||||
void
|
||||
static void
|
||||
bfa_fcs_fdmi_get_portattr(struct bfa_fcs_lport_fdmi_s *fdmi,
|
||||
struct bfa_fcs_fdmi_port_attr_s *port_attr)
|
||||
{
|
||||
|
@ -4150,7 +4150,7 @@ bfa_fcs_lport_ns_query(struct bfa_fcs_lport_s *port)
|
|||
bfa_sm_send_event(ns, NSSM_EVENT_NS_QUERY);
|
||||
}
|
||||
|
||||
void
|
||||
static void
|
||||
bfa_fcs_lport_ns_boot_target_disc(bfa_fcs_lport_t *port)
|
||||
{
|
||||
|
||||
|
|
|
@ -2359,14 +2359,6 @@ bfa_fcs_rport_itnim_ack(struct bfa_fcs_rport_s *rport)
|
|||
bfa_sm_send_event(rport, RPSM_EVENT_FC4_OFFLINE);
|
||||
}
|
||||
|
||||
/*
|
||||
* Called by fcptm to notify that the ITN cleanup is done.
|
||||
*/
|
||||
void
|
||||
bfa_fcs_rport_tin_ack(struct bfa_fcs_rport_s *rport)
|
||||
{
|
||||
bfa_sm_send_event(rport, RPSM_EVENT_FC4_OFFLINE);
|
||||
}
|
||||
|
||||
/*
|
||||
* brief
|
||||
|
|
|
@ -421,7 +421,7 @@ bfa_cb_image_get_chunk(int type, u32 off)
|
|||
return bfi_image_ct_cna_get_chunk(off); break;
|
||||
case BFI_IMAGE_CB_FC:
|
||||
return bfi_image_cb_fc_get_chunk(off); break;
|
||||
default: return 0;
|
||||
default: return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -32,7 +32,7 @@ static void bfa_ioc_cb_isr_mode_set(struct bfa_ioc_s *ioc, bfa_boolean_t msix);
|
|||
static void bfa_ioc_cb_notify_hbfail(struct bfa_ioc_s *ioc);
|
||||
static void bfa_ioc_cb_ownership_reset(struct bfa_ioc_s *ioc);
|
||||
|
||||
struct bfa_ioc_hwif_s hwif_cb;
|
||||
static struct bfa_ioc_hwif_s hwif_cb;
|
||||
|
||||
/*
|
||||
* Called from bfa_ioc_attach() to map asic specific calls.
|
||||
|
|
|
@ -32,7 +32,7 @@ static void bfa_ioc_ct_isr_mode_set(struct bfa_ioc_s *ioc, bfa_boolean_t msix);
|
|||
static void bfa_ioc_ct_notify_hbfail(struct bfa_ioc_s *ioc);
|
||||
static void bfa_ioc_ct_ownership_reset(struct bfa_ioc_s *ioc);
|
||||
|
||||
struct bfa_ioc_hwif_s hwif_ct;
|
||||
static struct bfa_ioc_hwif_s hwif_ct;
|
||||
|
||||
/*
|
||||
* Called from bfa_ioc_attach() to map asic specific calls.
|
||||
|
|
|
@ -61,12 +61,12 @@ int msix_disable_cb = 0, msix_disable_ct = 0;
|
|||
u32 bfi_image_ct_fc_size, bfi_image_ct_cna_size, bfi_image_cb_fc_size;
|
||||
u32 *bfi_image_ct_fc, *bfi_image_ct_cna, *bfi_image_cb_fc;
|
||||
|
||||
const char *msix_name_ct[] = {
|
||||
static const char *msix_name_ct[] = {
|
||||
"cpe0", "cpe1", "cpe2", "cpe3",
|
||||
"rme0", "rme1", "rme2", "rme3",
|
||||
"ctrl" };
|
||||
|
||||
const char *msix_name_cb[] = {
|
||||
static const char *msix_name_cb[] = {
|
||||
"cpe0", "cpe1", "cpe2", "cpe3",
|
||||
"rme0", "rme1", "rme2", "rme3",
|
||||
"eemc", "elpu0", "elpu1", "epss", "mlpu" };
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
/*
|
||||
* FC transport template entry, get SCSI target port ID.
|
||||
*/
|
||||
void
|
||||
static void
|
||||
bfad_im_get_starget_port_id(struct scsi_target *starget)
|
||||
{
|
||||
struct Scsi_Host *shost;
|
||||
|
@ -51,7 +51,7 @@ bfad_im_get_starget_port_id(struct scsi_target *starget)
|
|||
/*
|
||||
* FC transport template entry, get SCSI target nwwn.
|
||||
*/
|
||||
void
|
||||
static void
|
||||
bfad_im_get_starget_node_name(struct scsi_target *starget)
|
||||
{
|
||||
struct Scsi_Host *shost;
|
||||
|
@ -77,7 +77,7 @@ bfad_im_get_starget_node_name(struct scsi_target *starget)
|
|||
/*
|
||||
* FC transport template entry, get SCSI target pwwn.
|
||||
*/
|
||||
void
|
||||
static void
|
||||
bfad_im_get_starget_port_name(struct scsi_target *starget)
|
||||
{
|
||||
struct Scsi_Host *shost;
|
||||
|
@ -103,7 +103,7 @@ bfad_im_get_starget_port_name(struct scsi_target *starget)
|
|||
/*
|
||||
* FC transport template entry, get SCSI host port ID.
|
||||
*/
|
||||
void
|
||||
static void
|
||||
bfad_im_get_host_port_id(struct Scsi_Host *shost)
|
||||
{
|
||||
struct bfad_im_port_s *im_port =
|
||||
|
|
|
@ -208,7 +208,7 @@ bfad_debugfs_read(struct file *file, char __user *buf,
|
|||
if (!debug || !debug->debug_buffer)
|
||||
return 0;
|
||||
|
||||
return memory_read_from_buffer(buf, nbytes, pos,
|
||||
return simple_read_from_buffer(buf, nbytes, pos,
|
||||
debug->debug_buffer, debug->buffer_len);
|
||||
}
|
||||
|
||||
|
@ -254,7 +254,7 @@ bfad_debugfs_read_regrd(struct file *file, char __user *buf,
|
|||
if (!bfad->regdata)
|
||||
return 0;
|
||||
|
||||
rc = memory_read_from_buffer(buf, nbytes, pos,
|
||||
rc = simple_read_from_buffer(buf, nbytes, pos,
|
||||
bfad->regdata, bfad->reglen);
|
||||
|
||||
if ((*pos + nbytes) >= bfad->reglen) {
|
||||
|
@ -279,15 +279,31 @@ bfad_debugfs_write_regrd(struct file *file, const char __user *buf,
|
|||
u32 *regbuf;
|
||||
void __iomem *rb, *reg_addr;
|
||||
unsigned long flags;
|
||||
void *kern_buf;
|
||||
|
||||
rc = sscanf(buf, "%x:%x", &addr, &len);
|
||||
kern_buf = kzalloc(nbytes, GFP_KERNEL);
|
||||
|
||||
if (!kern_buf) {
|
||||
printk(KERN_INFO "bfad[%d]: Failed to allocate buffer\n",
|
||||
bfad->inst_no);
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
if (copy_from_user(kern_buf, (void __user *)buf, nbytes)) {
|
||||
kfree(kern_buf);
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
rc = sscanf(kern_buf, "%x:%x", &addr, &len);
|
||||
if (rc < 2) {
|
||||
printk(KERN_INFO
|
||||
"bfad[%d]: %s failed to read user buf\n",
|
||||
bfad->inst_no, __func__);
|
||||
kfree(kern_buf);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
kfree(kern_buf);
|
||||
kfree(bfad->regdata);
|
||||
bfad->regdata = NULL;
|
||||
bfad->reglen = 0;
|
||||
|
@ -339,14 +355,30 @@ bfad_debugfs_write_regwr(struct file *file, const char __user *buf,
|
|||
int addr, val, rc;
|
||||
void __iomem *reg_addr;
|
||||
unsigned long flags;
|
||||
void *kern_buf;
|
||||
|
||||
rc = sscanf(buf, "%x:%x", &addr, &val);
|
||||
kern_buf = kzalloc(nbytes, GFP_KERNEL);
|
||||
|
||||
if (!kern_buf) {
|
||||
printk(KERN_INFO "bfad[%d]: Failed to allocate buffer\n",
|
||||
bfad->inst_no);
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
if (copy_from_user(kern_buf, (void __user *)buf, nbytes)) {
|
||||
kfree(kern_buf);
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
rc = sscanf(kern_buf, "%x:%x", &addr, &val);
|
||||
if (rc < 2) {
|
||||
printk(KERN_INFO
|
||||
"bfad[%d]: %s failed to read user buf\n",
|
||||
bfad->inst_no, __func__);
|
||||
kfree(kern_buf);
|
||||
return -EINVAL;
|
||||
}
|
||||
kfree(kern_buf);
|
||||
|
||||
addr &= BFA_REG_ADDRMSK(bfa); /* offset only 17 bit and word align */
|
||||
|
||||
|
@ -359,7 +391,7 @@ bfad_debugfs_write_regwr(struct file *file, const char __user *buf,
|
|||
return -EINVAL;
|
||||
}
|
||||
|
||||
reg_addr = (u32 *) ((u8 *) bfa_ioc_bar0(ioc) + addr);
|
||||
reg_addr = (bfa_ioc_bar0(ioc)) + addr;
|
||||
spin_lock_irqsave(&bfad->bfad_lock, flags);
|
||||
writel(val, reg_addr);
|
||||
spin_unlock_irqrestore(&bfad->bfad_lock, flags);
|
||||
|
|
|
@ -263,10 +263,10 @@ struct bfad_hal_comp {
|
|||
*/
|
||||
#define nextLowerInt(x) \
|
||||
do { \
|
||||
int i; \
|
||||
int __i; \
|
||||
(*x)--; \
|
||||
for (i = 1; i < (sizeof(int)*8); i <<= 1) \
|
||||
(*x) = (*x) | (*x) >> i; \
|
||||
for (__i = 1; __i < (sizeof(int)*8); __i <<= 1) \
|
||||
(*x) = (*x) | (*x) >> __i; \
|
||||
(*x)++; \
|
||||
(*x) = (*x) >> 1; \
|
||||
} while (0)
|
||||
|
|
Loading…
Reference in a new issue