@@ -108,7 +108,7 @@ __bfa_trc32(struct bfa_trc_mod_s *trcm, int fileno, int line, u32 data);
#define bfa_sm_fault(__mod, __event) do { \
bfa_trc(__mod, (((u32)0xDEAD << 16) | __event)); \
- printk(KERN_ERR "Assertion failure: %s:%d: %d", \
+ dev_err(&(__mod)->bfad->pcidev->dev, "Assertion failure: %s:%d: %d", \
__FILE__, __LINE__, (__event)); \
} while (0)
@@ -272,7 +272,7 @@ bfa_ioc_sm_uninit(struct bfa_ioc_s *ioc, enum ioc_event event)
break;
default:
- bfa_sm_fault(ioc, event);
+ bfa_sm_fault(ioc->bfa, event);
}
}
/*
@@ -290,7 +290,7 @@ bfa_ioc_sm_reset_entry(struct bfa_ioc_s *ioc)
static void
bfa_ioc_sm_reset(struct bfa_ioc_s *ioc, enum ioc_event event)
{
- bfa_trc(ioc, event);
+ bfa_trc(ioc->bfa, event);
switch (event) {
case IOC_E_ENABLE:
@@ -306,7 +306,7 @@ bfa_ioc_sm_reset(struct bfa_ioc_s *ioc, enum ioc_event event)
break;
default:
- bfa_sm_fault(ioc, event);
+ bfa_sm_fault(ioc->bfa, event);
}
}
@@ -358,7 +358,7 @@ bfa_ioc_sm_enabling(struct bfa_ioc_s *ioc, enum ioc_event event)
break;
default:
- bfa_sm_fault(ioc, event);
+ bfa_sm_fault(ioc->bfa, event);
}
}
@@ -404,7 +404,7 @@ bfa_ioc_sm_getattr(struct bfa_ioc_s *ioc, enum ioc_event event)
break;
default:
- bfa_sm_fault(ioc, event);
+ bfa_sm_fault(ioc->bfa, event);
}
}
@@ -451,7 +451,7 @@ bfa_ioc_sm_op(struct bfa_ioc_s *ioc, enum ioc_event event)
break;
default:
- bfa_sm_fault(ioc, event);
+ bfa_sm_fault(ioc->bfa, event);
}
}
@@ -493,7 +493,7 @@ bfa_ioc_sm_disabling(struct bfa_ioc_s *ioc, enum ioc_event event)
break;
default:
- bfa_sm_fault(ioc, event);
+ bfa_sm_fault(ioc->bfa, event);
}
}
@@ -526,7 +526,7 @@ bfa_ioc_sm_disabled(struct bfa_ioc_s *ioc, enum ioc_event event)
break;
default:
- bfa_sm_fault(ioc, event);
+ bfa_sm_fault(ioc->bfa, event);
}
}
@@ -579,7 +579,7 @@ bfa_ioc_sm_fail_retry(struct bfa_ioc_s *ioc, enum ioc_event event)
break;
default:
- bfa_sm_fault(ioc, event);
+ bfa_sm_fault(ioc->bfa, event);
}
}
@@ -620,7 +620,7 @@ bfa_ioc_sm_fail(struct bfa_ioc_s *ioc, enum ioc_event event)
*/
break;
default:
- bfa_sm_fault(ioc, event);
+ bfa_sm_fault(ioc->bfa, event);
}
}
@@ -653,7 +653,7 @@ bfa_ioc_sm_hwfail(struct bfa_ioc_s *ioc, enum ioc_event event)
break;
default:
- bfa_sm_fault(ioc, event);
+ bfa_sm_fault(ioc->bfa, event);
}
}
@@ -690,7 +690,7 @@ bfa_iocpf_sm_reset(struct bfa_iocpf_s *iocpf, enum iocpf_event event)
break;
default:
- bfa_sm_fault(ioc, event);
+ bfa_sm_fault(ioc->bfa, event);
}
}
@@ -801,7 +801,7 @@ bfa_iocpf_sm_fwcheck(struct bfa_iocpf_s *iocpf, enum iocpf_event event)
break;
default:
- bfa_sm_fault(ioc, event);
+ bfa_sm_fault(ioc->bfa, event);
}
}
@@ -848,7 +848,7 @@ bfa_iocpf_sm_mismatch(struct bfa_iocpf_s *iocpf, enum iocpf_event event)
break;
default:
- bfa_sm_fault(ioc, event);
+ bfa_sm_fault(ioc->bfa, event);
}
}
@@ -893,7 +893,7 @@ bfa_iocpf_sm_semwait(struct bfa_iocpf_s *iocpf, enum iocpf_event event)
break;
default:
- bfa_sm_fault(ioc, event);
+ bfa_sm_fault(ioc->bfa, event);
}
}
@@ -934,7 +934,7 @@ bfa_iocpf_sm_hwinit(struct bfa_iocpf_s *iocpf, enum iocpf_event event)
break;
default:
- bfa_sm_fault(ioc, event);
+ bfa_sm_fault(ioc->bfa, event);
}
}
@@ -985,7 +985,7 @@ bfa_iocpf_sm_enabling(struct bfa_iocpf_s *iocpf, enum iocpf_event event)
break;
default:
- bfa_sm_fault(ioc, event);
+ bfa_sm_fault(ioc->bfa, event);
}
}
@@ -1016,7 +1016,7 @@ bfa_iocpf_sm_ready(struct bfa_iocpf_s *iocpf, enum iocpf_event event)
break;
default:
- bfa_sm_fault(ioc, event);
+ bfa_sm_fault(ioc->bfa, event);
}
}
@@ -1056,7 +1056,7 @@ bfa_iocpf_sm_disabling(struct bfa_iocpf_s *iocpf, enum iocpf_event event)
break;
default:
- bfa_sm_fault(ioc, event);
+ bfa_sm_fault(ioc->bfa, event);
}
}
@@ -1092,7 +1092,7 @@ bfa_iocpf_sm_disabling_sync(struct bfa_iocpf_s *iocpf, enum iocpf_event event)
break;
default:
- bfa_sm_fault(ioc, event);
+ bfa_sm_fault(ioc->bfa, event);
}
}
@@ -1124,7 +1124,7 @@ bfa_iocpf_sm_disabled(struct bfa_iocpf_s *iocpf, enum iocpf_event event)
break;
default:
- bfa_sm_fault(ioc, event);
+ bfa_sm_fault(ioc->bfa, event);
}
}
@@ -1174,7 +1174,7 @@ bfa_iocpf_sm_initfail_sync(struct bfa_iocpf_s *iocpf, enum iocpf_event event)
break;
default:
- bfa_sm_fault(ioc, event);
+ bfa_sm_fault(ioc->bfa, event);
}
}
@@ -1205,7 +1205,7 @@ bfa_iocpf_sm_initfail(struct bfa_iocpf_s *iocpf, enum iocpf_event event)
break;
default:
- bfa_sm_fault(ioc, event);
+ bfa_sm_fault(ioc->bfa, event);
}
}
@@ -1265,7 +1265,7 @@ bfa_iocpf_sm_fail_sync(struct bfa_iocpf_s *iocpf, enum iocpf_event event)
break;
default:
- bfa_sm_fault(ioc, event);
+ bfa_sm_fault(ioc->bfa, event);
}
}
@@ -1291,7 +1291,7 @@ bfa_iocpf_sm_fail(struct bfa_iocpf_s *iocpf, enum iocpf_event event)
break;
default:
- bfa_sm_fault(ioc, event);
+ bfa_sm_fault(ioc->bfa, event);
}
}
@@ -181,7 +181,7 @@ bfad_sm_uninit(struct bfad_s *bfad, enum bfad_sm_event event)
break;
default:
- bfa_sm_fault(bfad, event);
+ bfa_sm_fault(&bfad->bfa, event);
}
}
@@ -256,7 +256,7 @@ bfad_sm_created(struct bfad_s *bfad, enum bfad_sm_event event)
break;
default:
- bfa_sm_fault(bfad, event);
+ bfa_sm_fault(&bfad->bfa, event);
}
}
@@ -295,7 +295,7 @@ bfad_sm_initializing(struct bfad_s *bfad, enum bfad_sm_event event)
bfa_sm_set_state(bfad, bfad_sm_failed);
break;
default:
- bfa_sm_fault(bfad, event);
+ bfa_sm_fault(&bfad->bfa, event);
}
}
@@ -326,7 +326,7 @@ bfad_sm_failed(struct bfad_s *bfad, enum bfad_sm_event event)
break;
default:
- bfa_sm_fault(bfad, event);
+ bfa_sm_fault(&bfad->bfa, event);
}
}
@@ -342,7 +342,7 @@ bfad_sm_operational(struct bfad_s *bfad, enum bfad_sm_event event)
break;
default:
- bfa_sm_fault(bfad, event);
+ bfa_sm_fault(&bfad->bfa, event);
}
}
@@ -358,7 +358,7 @@ bfad_sm_fcs_exit(struct bfad_s *bfad, enum bfad_sm_event event)
break;
default:
- bfa_sm_fault(bfad, event);
+ bfa_sm_fault(&bfad->bfa, event);
}
}
@@ -378,7 +378,7 @@ bfad_sm_stopping(struct bfad_s *bfad, enum bfad_sm_event event)
break;
default:
- bfa_sm_fault(bfad, event);
+ bfa_sm_fault(&bfad->bfa, event);
break;
}
}
Move bfa_sm_fault() to use dev_err() instead of a raw printk(); this also allows for better type-checking and related fixes to the calls to bfa_sm_fault() in bfa_ioc.c Signed-off-by: Hannes Reinecke <hare@suse.de> --- drivers/scsi/bfa/bfa_cs.h | 2 +- drivers/scsi/bfa/bfa_ioc.c | 50 +++++++++++++++++++++++----------------------- drivers/scsi/bfa/bfad.c | 14 ++++++------- 3 files changed, 33 insertions(+), 33 deletions(-)