diff --git a/qla2x00t/qla_dbg.c b/qla2x00t/qla_dbg.c index 4ce10d7c3..0a96d1e09 100644 --- a/qla2x00t/qla_dbg.c +++ b/qla2x00t/qla_dbg.c @@ -2265,11 +2265,11 @@ ql_dbg(uint32_t level, scsi_qla_host_t *vha, int32_t id, const char *fmt, ...) if (vha != NULL) { const struct pci_dev *pdev = vha->hw->pdev; /* : Message */ - pr_warning("%s [%s]-%04x:%ld: ", + pr_warn("%s [%s]-%04x:%ld: ", QL_MSGHDR, dev_name(&(pdev->dev)), id + ql_dbg_offset, vha->host_no); } else { - pr_warning("%s [%s]-%04x: ", + pr_warn("%s [%s]-%04x: ", QL_MSGHDR, "0000:00:00.0", id + ql_dbg_offset); } @@ -2306,7 +2306,7 @@ ql_dbg_pci(uint32_t level, struct pci_dev *pdev, int32_t id, va_start(va, fmt); /* : Message */ - pr_warning("%s [%s]-%04x: ", + pr_warn("%s [%s]-%04x: ", QL_MSGHDR, dev_name(&(pdev->dev)), id + ql_dbg_offset); vprintk(fmt, va); @@ -2356,7 +2356,7 @@ ql_log(uint32_t level, scsi_qla_host_t *vha, int32_t id, const char *fmt, ...) pr_err("%s", pbuf); break; case ql_log_info: - pr_warning("%s", pbuf); + pr_warn("%s", pbuf); break; default: pr_info("%s", pbuf); @@ -2406,7 +2406,7 @@ ql_log_pci(uint32_t level, struct pci_dev *pdev, int32_t id, pr_err("%s", pbuf); break; case ql_log_info: - pr_warning("%s", pbuf); + pr_warn("%s", pbuf); break; default: pr_info("%s", pbuf); diff --git a/scst/include/backport.h b/scst/include/backport.h index 2be9912bd..32d624d5d 100644 --- a/scst/include/backport.h +++ b/scst/include/backport.h @@ -1159,7 +1159,7 @@ static inline bool percpu_ref_is_zero(struct percpu_ref *ref) #define pr_alert(fmt, ...) printk(KERN_ALERT pr_fmt(fmt), ##__VA_ARGS__) #define pr_crit(fmt, ...) printk(KERN_CRIT pr_fmt(fmt), ##__VA_ARGS__) #define pr_err(fmt, ...) printk(KERN_ERR pr_fmt(fmt), ##__VA_ARGS__) -#define pr_warning(fmt, ...) printk(KERN_WARNING pr_fmt(fmt), ##__VA_ARGS__) +#define pr_warn(fmt, ...) printk(KERN_WARNING pr_fmt(fmt), ##__VA_ARGS__) #define pr_notice(fmt, ...) printk(KERN_NOTICE pr_fmt(fmt), ##__VA_ARGS__) #endif /* pr_emerg */