Remove the ERRDRV() macro family and use pr_err directly everywhere it was used.
Completely remove any error messages that used the macro but are redundant, for
example, several of the messages were from memory allocation failures.
Signed-off-by: Ken Depro <kenneth.de...@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.ro...@unisys.com>
---
drivers/staging/unisys/include/timskmod.h | 9 +-
drivers/staging/unisys/include/uisutils.h | 4 +-
drivers/staging/unisys/include/uniklog.h | 38 ------
drivers/staging/unisys/uislib/uislib.c | 120 +++++++++---------
drivers/staging/unisys/uislib/uisqueue.c | 4 +-
drivers/staging/unisys/uislib/uisthread.c | 4 +-
drivers/staging/unisys/uislib/uisutils.c | 24 ++--
drivers/staging/unisys/virthba/virthba.c | 87 ++++++-------
drivers/staging/unisys/virtpci/virtpci.c | 71 ++++++-----
.../unisys/visorchannel/visorchannel_funcs.c | 41 +++---
drivers/staging/unisys/visorchipset/file.c | 16 +--
drivers/staging/unisys/visorchipset/parser.c | 39 +++---
.../unisys/visorchipset/visorchipset_main.c | 140 ++++++++++-----------
drivers/staging/unisys/visorutil/charqueue.c | 2 +-
drivers/staging/unisys/visorutil/easyproc.c | 25 ++--
.../staging/unisys/visorutil/memregion_direct.c | 18 ++-
drivers/staging/unisys/visorutil/periodic_work.c | 8 +-
drivers/staging/unisys/visorutil/procobjecttree.c | 30 +++--
18 files changed, 308 insertions(+), 372 deletions(-)
diff --git a/drivers/staging/unisys/include/timskmod.h
b/drivers/staging/unisys/include/timskmod.h
index cff7983..7831dbc 100644
--- a/drivers/staging/unisys/include/timskmod.h
+++ b/drivers/staging/unisys/include/timskmod.h
@@ -73,7 +73,7 @@
*/
#define ASSERT(cond) \
do { if (!(cond)) \
- HUHDRV("ASSERT failed - %s", \
+ pr_err("ASSERT failed - %s", \
__stringify(cond)); \
} while (0)
@@ -88,19 +88,12 @@
} while (0)
#define PRINTKDRV(fmt, args...) LOGINF(fmt, ## args)
-#define TBDDRV(fmt, args...) LOGERR(fmt, ## args)
-#define HUHDRV(fmt, args...) LOGERR(fmt, ## args)
-#define ERRDRV(fmt, args...) LOGERR(fmt, ## args)
#define WARNDRV(fmt, args...) LOGWRN(fmt, ## args)
#define SECUREDRV(fmt, args...) LOGWRN(fmt, ## args)
#define INFODRV(fmt, args...) LOGINF(fmt, ## args)
#define DEBUGDRV(fmt, args...) DBGINF(fmt, ## args)
#define PRINTKDEV(devname, fmt, args...) LOGINFDEV(devname, fmt, ## args)
-#define TBDDEV(devname, fmt, args...) LOGERRDEV(devname, fmt, ## args)
-#define HUHDEV(devname, fmt, args...) LOGERRDEV(devname, fmt, ## args)
-#define ERRDEV(devname, fmt, args...) LOGERRDEV(devname, fmt, ## args)
-#define ERRDEVX(devno, fmt, args...) LOGERRDEVX(devno, fmt, ## args)
#define WARNDEV(devname, fmt, args...) LOGWRNDEV(devname, fmt, ## args)
#define SECUREDEV(devname, fmt, args...) LOGWRNDEV(devname, fmt, ## args)
#define INFODEV(devname, fmt, args...) LOGINFDEV(devname, fmt, ## args)
diff --git a/drivers/staging/unisys/include/uisutils.h
b/drivers/staging/unisys/include/uisutils.h
index 7414220..f937892 100644
--- a/drivers/staging/unisys/include/uisutils.h
+++ b/drivers/staging/unisys/include/uisutils.h
@@ -206,10 +206,10 @@ wait_for_valid_guid(uuid_le __iomem *guid)
(void __iomem *)guid, sizeof(uuid_le));
if (uuid_le_cmp(tmpguid, NULL_UUID_LE) != 0)
break;
- LOGERR("Waiting for non-0 GUID (why???)...\n");
+ pr_err("Waiting for non-0 GUID (why???)...\n");
UIS_THREAD_WAIT_SEC(5);
}
- LOGERR("OK... GUID is non-0 now\n");
+ pr_err("OK... GUID is non-0 now\n");
}
/* CopyFragsInfoFromSkb returns the number of entries added to frags array
diff --git a/drivers/staging/unisys/include/uniklog.h
b/drivers/staging/unisys/include/uniklog.h
index ecd1bdb..e94120b 100644
--- a/drivers/staging/unisys/include/uniklog.h
+++ b/drivers/staging/unisys/include/uniklog.h
@@ -122,44 +122,6 @@
} while (0)
/*
- * # LOGERR
- *
- * \brief Log error message - logs a message at the LOG_ERR level,
- * including source line number information
- *
- * \param devname the device name of the device reporting this message, or
- * NULL if this message is NOT device-related.
- * \param fmt printf()-style format string containing the message to log.
- * \param args Optional arguments to be formatted and inserted into the format
- * \param string.
- * \return nothing
- *
- * Logs the specified error message at the LOG_ERR level. It will also
- * include the file, line number, and function name of where the error
- * originated in the log message.
- */
-#define LOGERR(fmt, args...) pr_err(fmt, ## args)
-#define LOGERRDEV(devname, fmt, args...) \
- pr_err("%s " fmt, devname, ## args)
-#define LOGERRDEVX(devno, fmt, args...) \
- pr_err("dev%d " fmt, devno, ## args)
-#define LOGERRNAME(vnic, fmt, args...) \
- do { \
- if (vnic != NULL) { \
- pr_err("%s " fmt, vnic->name, ## args); \
- } else { \
- pr_err(fmt, ## args); \
- } \
- } while (0)
-#define LOGORDUMPERR(seqfile, fmt, args...) do { \
- if (seqfile) { \
- seq_printf(seqfile, fmt, ## args); \
- } else { \
- LOGERR(fmt, ## args); \
- } \
- } while (0)
-
-/*
* # LOGWRN
*
* \brief Log warning message - Logs a message at the LOG_WARNING level,
diff --git a/drivers/staging/unisys/uislib/uislib.c
b/drivers/staging/unisys/uislib/uislib.c
index a9eedde..eb58449 100644
--- a/drivers/staging/unisys/uislib/uislib.c
+++ b/drivers/staging/unisys/uislib/uislib.c
@@ -133,13 +133,13 @@ static __iomem void *init_vbus_channel(u64 ch_addr, u32
ch_bytes)
void __iomem *ch = uislib_ioremap_cache(ch_addr, ch_bytes);
if (!ch) {
- LOGERR("CONTROLVM_BUS_CREATE error: ioremap_cache of
channelAddr:%Lx for channelBytes:%llu failed",
+ pr_err("CONTROLVM_BUS_CREATE error: ioremap_cache of
channelAddr:%Lx for channelBytes:%llu failed",
(unsigned long long)ch_addr,
(unsigned long long)ch_bytes);
return NULL;
}
if (!SPAR_VBUS_CHANNEL_OK_CLIENT(ch)) {
- ERRDRV("%s channel cannot be used", __func__);
+ pr_err("%s channel cannot be used", __func__);
uislib_iounmap(ch);
return NULL;
}
@@ -154,7 +154,7 @@ create_bus(struct controlvm_message *msg, char *buf)
size_t size;
if (max_bus_count == bus_list_count) {
- LOGERR("CONTROLVM_BUS_CREATE Failed: max buses:%d already
created\n",
+ pr_err("CONTROLVM_BUS_CREATE Failed: max buses:%d already
created\n",
max_bus_count);
POSTCODE_LINUX_3(BUS_CREATE_FAILURE_PC, max_bus_count,
POSTCODE_SEVERITY_ERR);
@@ -172,7 +172,6 @@ create_bus(struct controlvm_message *msg, char *buf)
(dev_count * sizeof(struct device_info *));
bus = kzalloc(size, GFP_ATOMIC);
if (!bus) {
- LOGERR("CONTROLVM_BUS_CREATE Failed: kmalloc for bus
failed.\n");
POSTCODE_LINUX_3(BUS_CREATE_FAILURE_PC, bus_no,
POSTCODE_SEVERITY_ERR);
return CONTROLVM_RESP_ERROR_KMALLOC_FAILED;
@@ -209,7 +208,7 @@ create_bus(struct controlvm_message *msg, char *buf)
/* found a bus already in the list with same bus_no -
* reject add
*/
- LOGERR("CONTROLVM_BUS_CREATE Failed: bus %d already exists.\n",
+ pr_err("CONTROLVM_BUS_CREATE Failed: bus %d already exists.\n",
bus->bus_no);
POSTCODE_LINUX_3(BUS_CREATE_FAILURE_PC, bus->bus_no,
POSTCODE_SEVERITY_ERR);
@@ -234,14 +233,14 @@ create_bus(struct controlvm_message *msg, char *buf)
cmd.add_vbus.bus_uuid = msg->cmd.create_bus.bus_data_type_uuid;
cmd.add_vbus.instance_uuid = msg->cmd.create_bus.bus_inst_uuid;
if (!virt_control_chan_func) {
- LOGERR("CONTROLVM_BUS_CREATE Failed: virtpci callback
not registered.");
+ pr_err("CONTROLVM_BUS_CREATE Failed: virtpci callback
not registered.");
POSTCODE_LINUX_3(BUS_CREATE_FAILURE_PC, bus->bus_no,
POSTCODE_SEVERITY_ERR);
kfree(bus);
return CONTROLVM_RESP_ERROR_VIRTPCI_DRIVER_FAILURE;
}
if (!virt_control_chan_func(&cmd)) {
- LOGERR("CONTROLVM_BUS_CREATE Failed: virtpci
GUEST_ADD_VBUS returned error.");
+ pr_err("CONTROLVM_BUS_CREATE Failed: virtpci
GUEST_ADD_VBUS returned error.");
POSTCODE_LINUX_3(BUS_CREATE_FAILURE_PC, bus->bus_no,
POSTCODE_SEVERITY_ERR);
kfree(bus);
@@ -287,7 +286,7 @@ destroy_bus(struct controlvm_message *msg, char *buf)
}
if (!bus) {
- LOGERR("CONTROLVM_BUS_DESTROY Failed: failed to find bus %d.\n",
+ pr_err("CONTROLVM_BUS_DESTROY Failed: failed to find bus %d.\n",
bus_no);
read_unlock(&bus_list_lock);
return CONTROLVM_RESP_ERROR_ALREADY_DONE;
@@ -296,7 +295,7 @@ destroy_bus(struct controlvm_message *msg, char *buf)
/* verify that this bus has no devices. */
for (i = 0; i < bus->device_count; i++) {
if (bus->device[i] != NULL) {
- LOGERR("CONTROLVM_BUS_DESTROY Failed: device %i
attached to bus %d.",
+ pr_err("CONTROLVM_BUS_DESTROY Failed: device %i
attached to bus %d.",
i, bus_no);
read_unlock(&bus_list_lock);
return CONTROLVM_RESP_ERROR_BUS_DEVICE_ATTACHED;
@@ -312,11 +311,11 @@ destroy_bus(struct controlvm_message *msg, char *buf)
cmd.msgtype = GUEST_DEL_VBUS;
cmd.del_vbus.bus_no = bus_no;
if (!virt_control_chan_func) {
- LOGERR("CONTROLVM_BUS_DESTROY Failed: virtpci callback not
registered.");
+ pr_err("CONTROLVM_BUS_DESTROY Failed: virtpci callback not
registered.");
return CONTROLVM_RESP_ERROR_VIRTPCI_DRIVER_FAILURE;
}
if (!virt_control_chan_func(&cmd)) {
- LOGERR("CONTROLVM_BUS_DESTROY Failed: virtpci GUEST_DEL_VBUS
returned error.");
+ pr_err("CONTROLVM_BUS_DESTROY Failed: virtpci GUEST_DEL_VBUS
returned error.");
return CONTROLVM_RESP_ERROR_VIRTPCI_DRIVER_CALLBACK_ERROR;
}
@@ -357,7 +356,6 @@ static int create_device(struct controlvm_message *msg,
char *buf)
dev = kzalloc(sizeof(*dev), GFP_ATOMIC);
if (!dev) {
- LOGERR("CONTROLVM_DEVICE_CREATE Failed: kmalloc for dev
failed.\n");
POSTCODE_LINUX_4(DEVICE_CREATE_FAILURE_PC, dev_no, bus_no,
POSTCODE_SEVERITY_ERR);
return CONTROLVM_RESP_ERROR_KMALLOC_FAILED;
@@ -381,7 +379,7 @@ static int create_device(struct controlvm_message *msg,
char *buf)
*/
min_size = req_handler->min_channel_bytes;
if (min_size > msg->cmd.create_device.channel_bytes) {
- LOGERR("CONTROLVM_DEVICE_CREATE Failed: channel size is
too small, channel size:0x%lx, required size:0x%lx",
+ pr_err("CONTROLVM_DEVICE_CREATE Failed: channel size is
too small, channel size:0x%lx, required size:0x%lx",
(ulong)msg->cmd.create_device.channel_bytes,
(ulong)min_size);
POSTCODE_LINUX_4(DEVICE_CREATE_FAILURE_PC, dev_no,
@@ -393,7 +391,7 @@ static int create_device(struct controlvm_message *msg,
char *buf)
uislib_ioremap_cache(dev->channel_addr,
msg->cmd.create_device.channel_bytes);
if (!dev->chanptr) {
- LOGERR("CONTROLVM_DEVICE_CREATE Failed: ioremap_cache
of channelAddr:%Lx for channelBytes:%llu failed",
+ pr_err("CONTROLVM_DEVICE_CREATE Failed: ioremap_cache
of channelAddr:%Lx for channelBytes:%llu failed",
dev->channel_addr,
msg->cmd.create_device.channel_bytes);
result = CONTROLVM_RESP_ERROR_IOREMAP_FAILED;
@@ -411,7 +409,7 @@ static int create_device(struct controlvm_message *msg,
char *buf)
continue;
/* make sure the device number is valid */
if (dev_no >= bus->device_count) {
- LOGERR("CONTROLVM_DEVICE_CREATE Failed: device (%d) >=
deviceCount (%d).",
+ pr_err("CONTROLVM_DEVICE_CREATE Failed: device (%d) >=
deviceCount (%d).",
dev_no, bus->device_count);
result = CONTROLVM_RESP_ERROR_MAX_DEVICES;
POSTCODE_LINUX_4(DEVICE_CREATE_FAILURE_PC, dev_no,
@@ -421,7 +419,7 @@ static int create_device(struct controlvm_message *msg,
char *buf)
}
/* make sure this device is not already set */
if (bus->device[dev_no]) {
- LOGERR("CONTROLVM_DEVICE_CREATE Failed: device %d is
already exists.",
+ pr_err("CONTROLVM_DEVICE_CREATE Failed: device %d is
already exists.",
dev_no);
POSTCODE_LINUX_4(DEVICE_CREATE_FAILURE_PC,
dev_no, bus_no,
@@ -445,8 +443,8 @@ static int create_device(struct controlvm_message *msg,
char *buf)
wait_for_valid_guid(&((struct channel_header __iomem *)
(dev->chanptr))->chtype);
if (!SPAR_VHBA_CHANNEL_OK_CLIENT(dev->chanptr)) {
- LOGERR("CONTROLVM_DEVICE_CREATE
Failed:[CLIENT]VHBA dev %d chan invalid.",
- dev_no);
+ pr_err("CONTROLVM_DEVICE_CREATE Failed: device
(%d) >= deviceCount (%d).",
+ dev_no, bus->device_count);
POSTCODE_LINUX_4(DEVICE_CREATE_FAILURE_PC,
dev_no, bus_no,
POSTCODE_SEVERITY_ERR);
@@ -464,7 +462,7 @@ static int create_device(struct controlvm_message *msg,
char *buf)
wait_for_valid_guid(&((struct channel_header __iomem *)
(dev->chanptr))->chtype);
if (!SPAR_VNIC_CHANNEL_OK_CLIENT(dev->chanptr)) {
- LOGERR("CONTROLVM_DEVICE_CREATE Failed:
VNIC[CLIENT] dev %d chan invalid.",
+ pr_err("CONTROLVM_DEVICE_CREATE Failed: device
%d is already exists.",
dev_no);
POSTCODE_LINUX_4(DEVICE_CREATE_FAILURE_PC,
dev_no, bus_no,
@@ -479,7 +477,7 @@ static int create_device(struct controlvm_message *msg,
char *buf)
cmd.add_vnic.instance_uuid = dev->instance_uuid;
cmd.add_vhba.intr = dev->intr;
} else {
- LOGERR("CONTROLVM_DEVICE_CREATE Failed: unknown
channelTypeGuid.\n");
+ pr_err("CONTROLVM_DEVICE_CREATE Failed: unknown
channelTypeGuid.\n");
POSTCODE_LINUX_4(DEVICE_CREATE_FAILURE_PC, dev_no,
bus_no, POSTCODE_SEVERITY_ERR);
result = CONTROLVM_RESP_ERROR_CHANNEL_TYPE_UNKNOWN;
@@ -487,7 +485,7 @@ static int create_device(struct controlvm_message *msg,
char *buf)
}
if (!virt_control_chan_func) {
- LOGERR("CONTROLVM_DEVICE_CREATE Failed: virtpci
callback not registered.");
+ pr_err("CONTROLVM_DEVICE_CREATE Failed: virtpci
callback not registered.");
POSTCODE_LINUX_4(DEVICE_CREATE_FAILURE_PC, dev_no,
bus_no, POSTCODE_SEVERITY_ERR);
result = CONTROLVM_RESP_ERROR_VIRTPCI_DRIVER_FAILURE;
@@ -495,7 +493,7 @@ static int create_device(struct controlvm_message *msg,
char *buf)
}
if (!virt_control_chan_func(&cmd)) {
- LOGERR("CONTROLVM_DEVICE_CREATE Failed: virtpci
GUEST_ADD_[VHBA||VNIC] returned error.");
+ pr_err("CONTROLVM_DEVICE_CREATE Failed: virtpci
GUEST_ADD_[VHBA||VNIC] returned error.");
POSTCODE_LINUX_4(DEVICE_CREATE_FAILURE_PC, dev_no,
bus_no, POSTCODE_SEVERITY_ERR);
result =
@@ -510,7 +508,7 @@ static int create_device(struct controlvm_message *msg,
char *buf)
}
read_unlock(&bus_list_lock);
- LOGERR("CONTROLVM_DEVICE_CREATE Failed: failed to find bus %d.",
+ pr_err("CONTROLVM_DEVICE_CREATE Failed: failed to find bus %d.",
bus_no);
POSTCODE_LINUX_4(DEVICE_CREATE_FAILURE_PC, dev_no, bus_no,
POSTCODE_SEVERITY_ERR);
@@ -542,14 +540,14 @@ static int pause_device(struct controlvm_message *msg)
if (bus->bus_no == bus_no) {
/* make sure the device number is valid */
if (dev_no >= bus->device_count) {
- LOGERR("CONTROLVM_DEVICE_CHANGESTATE:pause
Failed: device(%d) >= deviceCount(%d).",
+ pr_err("CONTROLVM_DEVICE_CHANGESTATE:pause
Failed: device(%d) >= deviceCount(%d).",
dev_no, bus->device_count);
retval = CONTROLVM_RESP_ERROR_DEVICE_INVALID;
} else {
/* make sure this device exists */
dev = bus->device[dev_no];
if (!dev) {
-
LOGERR("CONTROLVM_DEVICE_CHANGESTATE:pause Failed: device %d does not exist.",
+
pr_err("CONTROLVM_DEVICE_CHANGESTATE:pause Failed: device %d does not exist.",
dev_no);
retval =
CONTROLVM_RESP_ERROR_ALREADY_DONE;
@@ -559,7 +557,7 @@ static int pause_device(struct controlvm_message *msg)
}
}
if (!bus) {
- LOGERR("CONTROLVM_DEVICE_CHANGESTATE:pause Failed: bus %d does
not exist",
+ pr_err("CONTROLVM_DEVICE_CHANGESTATE:pause Failed: bus %d does
not exist",
bus_no);
retval = CONTROLVM_RESP_ERROR_BUS_INVALID;
}
@@ -577,15 +575,15 @@ static int pause_device(struct controlvm_message *msg)
cmd.msgtype = GUEST_PAUSE_VNIC;
cmd.pause_vnic.chanptr = dev->chanptr;
} else {
- LOGERR("CONTROLVM_DEVICE_CHANGESTATE:pause Failed:
unknown channelTypeGuid.\n");
+ pr_err("CONTROLVM_DEVICE_CHANGESTATE:pause Failed:
unknown channelTypeGuid.\n");
return CONTROLVM_RESP_ERROR_CHANNEL_TYPE_UNKNOWN;
}
if (!virt_control_chan_func) {
- LOGERR("CONTROLVM_DEVICE_CHANGESTATE Failed: virtpci
callback not registered.");
+ pr_err("CONTROLVM_DEVICE_CHANGESTATE Failed: virtpci
callback not registered.");
return CONTROLVM_RESP_ERROR_VIRTPCI_DRIVER_FAILURE;
}
if (!virt_control_chan_func(&cmd)) {
- LOGERR("CONTROLVM_DEVICE_CHANGESTATE:pause Failed:
virtpci GUEST_PAUSE_[VHBA||VNIC] returned error.");
+ pr_err("CONTROLVM_DEVICE_CHANGESTATE:pause Failed:
virtpci GUEST_PAUSE_[VHBA||VNIC] returned error.");
return
CONTROLVM_RESP_ERROR_VIRTPCI_DRIVER_CALLBACK_ERROR;
}
@@ -609,14 +607,14 @@ static int resume_device(struct controlvm_message *msg)
if (bus->bus_no == bus_no) {
/* make sure the device number is valid */
if (dev_no >= bus->device_count) {
- LOGERR("CONTROLVM_DEVICE_CHANGESTATE:resume
Failed: device(%d) >= deviceCount(%d).",
+ pr_err("CONTROLVM_DEVICE_CHANGESTATE:resume
Failed: device(%d) >= deviceCount(%d).",
dev_no, bus->device_count);
retval = CONTROLVM_RESP_ERROR_DEVICE_INVALID;
} else {
/* make sure this device exists */
dev = bus->device[dev_no];
if (!dev) {
-
LOGERR("CONTROLVM_DEVICE_CHANGESTATE:resume Failed: device %d does not exist.",
+
pr_err("CONTROLVM_DEVICE_CHANGESTATE:resume Failed: device %d does not exist.",
dev_no);
retval =
CONTROLVM_RESP_ERROR_ALREADY_DONE;
@@ -627,7 +625,7 @@ static int resume_device(struct controlvm_message *msg)
}
if (!bus) {
- LOGERR("CONTROLVM_DEVICE_CHANGESTATE:resume Failed: bus %d does
not exist",
+ pr_err("CONTROLVM_DEVICE_CHANGESTATE:resume Failed: bus %d does
not exist",
bus_no);
retval = CONTROLVM_RESP_ERROR_BUS_INVALID;
}
@@ -645,15 +643,15 @@ static int resume_device(struct controlvm_message *msg)
cmd.msgtype = GUEST_RESUME_VNIC;
cmd.resume_vnic.chanptr = dev->chanptr;
} else {
- LOGERR("CONTROLVM_DEVICE_CHANGESTATE:resume Failed:
unknown channelTypeGuid.\n");
+ pr_err("CONTROLVM_DEVICE_CHANGESTATE:resume Failed:
unknown channelTypeGuid.\n");
return CONTROLVM_RESP_ERROR_CHANNEL_TYPE_UNKNOWN;
}
if (!virt_control_chan_func) {
- LOGERR("CONTROLVM_DEVICE_CHANGESTATE Failed: virtpci
callback not registered.");
+ pr_err("CONTROLVM_DEVICE_CHANGESTATE Failed: virtpci
callback not registered.");
return CONTROLVM_RESP_ERROR_VIRTPCI_DRIVER_FAILURE;
}
if (!virt_control_chan_func(&cmd)) {
- LOGERR("CONTROLVM_DEVICE_CHANGESTATE:resume Failed:
virtpci GUEST_RESUME_[VHBA||VNIC] returned error.");
+ pr_err("CONTROLVM_DEVICE_CHANGESTATE:resume Failed:
virtpci GUEST_RESUME_[VHBA||VNIC] returned error.");
return
CONTROLVM_RESP_ERROR_VIRTPCI_DRIVER_CALLBACK_ERROR;
}
@@ -679,14 +677,14 @@ static int destroy_device(struct controlvm_message *msg,
char *buf)
if (bus->bus_no == bus_no) {
/* make sure the device number is valid */
if (dev_no >= bus->device_count) {
- LOGERR("CONTROLVM_DEVICE_DESTROY Failed:
device(%d) >= device_count(%d).",
+ pr_err("CONTROLVM_DEVICE_DESTROY Failed:
device(%d) >= device_count(%d).",
dev_no, bus->device_count);
retval = CONTROLVM_RESP_ERROR_DEVICE_INVALID;
} else {
/* make sure this device exists */
dev = bus->device[dev_no];
if (!dev) {
- LOGERR("CONTROLVM_DEVICE_DESTROY
Failed: device %d does not exist.",
+ pr_err("CONTROLVM_DEVICE_DESTROY
Failed: device %d does not exist.",
dev_no);
retval =
CONTROLVM_RESP_ERROR_ALREADY_DONE;
@@ -697,7 +695,7 @@ static int destroy_device(struct controlvm_message *msg,
char *buf)
}
if (!bus) {
- LOGERR("CONTROLVM_DEVICE_DESTROY Failed: bus %d does not exist",
+ pr_err("CONTROLVM_DEVICE_DESTROY Failed: bus %d does not exist",
bus_no);
retval = CONTROLVM_RESP_ERROR_BUS_INVALID;
}
@@ -715,17 +713,17 @@ static int destroy_device(struct controlvm_message *msg,
char *buf)
cmd.msgtype = GUEST_DEL_VNIC;
cmd.del_vnic.chanptr = dev->chanptr;
} else {
- LOGERR("CONTROLVM_DEVICE_DESTROY Failed: unknown
channelTypeGuid.\n");
+ pr_err("CONTROLVM_DEVICE_DESTROY Failed: unknown
channelTypeGuid.\n");
return
CONTROLVM_RESP_ERROR_CHANNEL_TYPE_UNKNOWN;
}
if (!virt_control_chan_func) {
- LOGERR("CONTROLVM_DEVICE_DESTROY Failed: virtpci
callback not registered.");
+ pr_err("CONTROLVM_DEVICE_DESTROY Failed: virtpci
callback not registered.");
return
CONTROLVM_RESP_ERROR_VIRTPCI_DRIVER_FAILURE;
}
if (!virt_control_chan_func(&cmd)) {
- LOGERR("CONTROLVM_DEVICE_DESTROY Failed: virtpci
GUEST_DEL_[VHBA||VNIC] returned error.");
+ pr_err("CONTROLVM_DEVICE_DESTROY Failed: virtpci
GUEST_DEL_[VHBA||VNIC] returned error.");
return
CONTROLVM_RESP_ERROR_VIRTPCI_DRIVER_CALLBACK_ERROR;
}
@@ -781,7 +779,7 @@ static int delete_bus_glue(u32 bus_no)
init_msg_header(&msg, CONTROLVM_BUS_DESTROY, 0, 0);
msg.cmd.destroy_bus.bus_no = bus_no;
if (destroy_bus(&msg, NULL) != CONTROLVM_RESP_SUCCESS) {
- LOGERR("destroy_bus failed. bus_no=0x%x\n", bus_no);
+ pr_err("destroy_bus failed. bus_no=0x%x\n", bus_no);
return 0;
}
return 1;
@@ -795,7 +793,7 @@ static int delete_device_glue(u32 bus_no, u32 dev_no)
msg.cmd.destroy_device.bus_no = bus_no;
msg.cmd.destroy_device.dev_no = dev_no;
if (destroy_device(&msg, NULL) != CONTROLVM_RESP_SUCCESS) {
- LOGERR("destroy_device failed. bus_no=0x%x dev_no=0x%x\n",
+ pr_err("destroy_device failed. bus_no=0x%x dev_no=0x%x\n",
bus_no, dev_no);
return 0;
}
@@ -825,7 +823,7 @@ uislib_client_inject_add_bus(u32 bus_no, uuid_le inst_uuid,
msg.cmd.init_chipset.bus_count = 23;
msg.cmd.init_chipset.switch_count = 0;
if (init_chipset(&msg, NULL) != CONTROLVM_RESP_SUCCESS) {
- LOGERR("init_chipset failed.\n");
+ pr_err("init_chipset failed.\n");
return 0;
}
LOGINF("chipset initialized\n");
@@ -842,7 +840,7 @@ uislib_client_inject_add_bus(u32 bus_no, uuid_le inst_uuid,
msg.cmd.create_bus.channel_addr = channel_addr;
msg.cmd.create_bus.channel_bytes = n_channel_bytes;
if (create_bus(&msg, NULL) != CONTROLVM_RESP_SUCCESS) {
- LOGERR("create_bus failed.\n");
+ pr_err("create_bus failed.\n");
POSTCODE_LINUX_3(BUS_CREATE_FAILURE_PC, bus_no,
POSTCODE_SEVERITY_ERR);
return 0;
@@ -872,7 +870,7 @@ uislib_client_inject_pause_vhba(u32 bus_no, u32 dev_no)
msg.cmd.device_change_state.state = segment_state_standby;
rc = pause_device(&msg);
if (rc != CONTROLVM_RESP_SUCCESS) {
- LOGERR("VHBA pause_device failed. busNo=0x%x devNo=0x%x\n",
+ pr_err("VHBA pause_device failed. busNo=0x%x devNo=0x%x\n",
bus_no, dev_no);
return rc;
}
@@ -892,7 +890,7 @@ uislib_client_inject_resume_vhba(u32 bus_no, u32 dev_no)
msg.cmd.device_change_state.state = segment_state_running;
rc = resume_device(&msg);
if (rc != CONTROLVM_RESP_SUCCESS) {
- LOGERR("VHBA resume_device failed. busNo=0x%x devNo=0x%x\n",
+ pr_err("VHBA resume_device failed. busNo=0x%x devNo=0x%x\n",
bus_no, dev_no);
return rc;
}
@@ -932,7 +930,7 @@ uislib_client_inject_add_vhba(u32 bus_no, u32 dev_no,
sizeof(struct irq_info));
msg.cmd.create_device.channel_addr = phys_chan_addr;
if (chan_bytes < MIN_IO_CHANNEL_SIZE) {
- LOGERR("wrong channel size.chan_bytes = 0x%x IO_CHANNEL_SIZE=
0x%x\n",
+ pr_err("wrong channel size.chan_bytes = 0x%x IO_CHANNEL_SIZE=
0x%x\n",
chan_bytes, (unsigned int)MIN_IO_CHANNEL_SIZE);
POSTCODE_LINUX_4(VHBA_CREATE_FAILURE_PC, chan_bytes,
MIN_IO_CHANNEL_SIZE, POSTCODE_SEVERITY_ERR);
@@ -941,7 +939,7 @@ uislib_client_inject_add_vhba(u32 bus_no, u32 dev_no,
msg.cmd.create_device.channel_bytes = chan_bytes;
msg.cmd.create_device.data_type_uuid = spar_vhba_channel_protocol_uuid;
if (create_device(&msg, NULL) != CONTROLVM_RESP_SUCCESS) {
- LOGERR("VHBA create_device failed.\n");
+ pr_err("VHBA create_device failed.\n");
POSTCODE_LINUX_4(VHBA_CREATE_FAILURE_PC, dev_no, bus_no,
POSTCODE_SEVERITY_ERR);
return 0;
@@ -991,7 +989,7 @@ uislib_client_inject_add_vnic(u32 bus_no, u32 dev_no,
sizeof(struct irq_info));
msg.cmd.create_device.channel_addr = phys_chan_addr;
if (chan_bytes < MIN_IO_CHANNEL_SIZE) {
- LOGERR("wrong channel size.chan_bytes = 0x%x IO_CHANNEL_SIZE=
0x%x\n",
+ pr_err("wrong channel size.chan_bytes = 0x%x IO_CHANNEL_SIZE=
0x%x\n",
chan_bytes, (unsigned int)MIN_IO_CHANNEL_SIZE);
POSTCODE_LINUX_4(VNIC_CREATE_FAILURE_PC, chan_bytes,
MIN_IO_CHANNEL_SIZE, POSTCODE_SEVERITY_ERR);
@@ -1000,7 +998,7 @@ uislib_client_inject_add_vnic(u32 bus_no, u32 dev_no,
msg.cmd.create_device.channel_bytes = chan_bytes;
msg.cmd.create_device.data_type_uuid = spar_vnic_channel_protocol_uuid;
if (create_device(&msg, NULL) != CONTROLVM_RESP_SUCCESS) {
- LOGERR("VNIC create_device failed.\n");
+ pr_err("VNIC create_device failed.\n");
POSTCODE_LINUX_4(VNIC_CREATE_FAILURE_PC, dev_no, bus_no,
POSTCODE_SEVERITY_ERR);
return 0;
@@ -1024,7 +1022,7 @@ uislib_client_inject_pause_vnic(u32 bus_no, u32 dev_no)
msg.cmd.device_change_state.state = segment_state_standby;
rc = pause_device(&msg);
if (rc != CONTROLVM_RESP_SUCCESS) {
- LOGERR("VNIC pause_device failed. busNo=0x%x devNo=0x%x\n",
+ pr_err("VNIC pause_device failed. busNo=0x%x devNo=0x%x\n",
bus_no, dev_no);
return -1;
}
@@ -1044,7 +1042,7 @@ uislib_client_inject_resume_vnic(u32 bus_no, u32 dev_no)
msg.cmd.device_change_state.state = segment_state_running;
rc = resume_device(&msg);
if (rc != CONTROLVM_RESP_SUCCESS) {
- LOGERR("VNIC resume_device failed. busNo=0x%x devNo=0x%x\n",
+ pr_err("VNIC resume_device failed. busNo=0x%x devNo=0x%x\n",
bus_no, dev_no);
return -1;
}
@@ -1070,7 +1068,7 @@ uislib_cache_alloc(struct kmem_cache *cur_pool, char *fn,
int ln)
void *p = kmem_cache_alloc(cur_pool, GFP_ATOMIC | __GFP_NORETRY);
if (p == NULL) {
- LOGERR("uislib_malloc failed to alloc uiscmdrsp @%s:%d",
+ pr_err("uislib_malloc failed to alloc uiscmdrsp @%s:%d",
fn, ln);
return NULL;
}
@@ -1082,7 +1080,7 @@ void
uislib_cache_free(struct kmem_cache *cur_pool, void *p, char *fn, int ln)
{
if (p == NULL) {
- LOGERR("uislib_free NULL pointer @%s:%d", fn, ln);
+ pr_err("uislib_free NULL pointer @%s:%d", fn, ln);
return;
}
kmem_cache_free(cur_pool, p);
@@ -1167,7 +1165,7 @@ static ssize_t info_debugfs_read(struct file *file, char
__user *buf,
debug_buf = vmalloc(PROC_READ_BUFFER_SIZE);
if (debug_buf == NULL) {
- LOGERR("failed to allocate buffer to provide proc
data.\n");
+ pr_err("failed to allocate buffer to provide proc
data.\n");
return -ENOMEM;
}
}
@@ -1197,14 +1195,14 @@ static struct device_info *find_dev(u32 bus_no, u32
dev_no)
if (bus->bus_no == bus_no) {
/* make sure the device number is valid */
if (dev_no >= bus->device_count) {
- LOGERR("%s bad bus_no, dev_no=%d,%d",
+ pr_err("%s bad bus_no, dev_no=%d,%d",
__func__,
(int)bus_no, (int)dev_no);
break;
}
dev = bus->device[dev_no];
if (!dev)
- LOGERR("%s bad bus_no, dev_no=%d,%d",
+ pr_err("%s bad bus_no, dev_no=%d,%d",
__func__,
(int)bus_no, (int)dev_no);
break;
@@ -1346,7 +1344,7 @@ initialize_incoming_thread(void)
return TRUE;
if (!uisthread_start(&incoming_ti,
&process_incoming, NULL, "dev_incoming")) {
- LOGERR("uisthread_start initialize_incoming_thread ****FAILED");
+ pr_err("uisthread_start initialize_incoming_thread ****FAILED");
return FALSE;
}
incoming_started = TRUE;
@@ -1368,7 +1366,7 @@ uislib_enable_channel_interrupts(u32 bus_no, u32 dev_no,
dev = find_dev(bus_no, dev_no);
if (!dev) {
- LOGERR("%s busNo=%d, devNo=%d", __func__, (int)(bus_no),
+ pr_err("%s busNo=%d, devNo=%d", __func__, (int)(bus_no),
(int)(dev_no));
return;
}
@@ -1393,7 +1391,7 @@ uislib_disable_channel_interrupts(u32 bus_no, u32 dev_no)
dev = find_dev(bus_no, dev_no);
if (!dev) {
- LOGERR("%s busNo=%d, devNo=%d", __func__, (int)(bus_no),
+ pr_err("%s busNo=%d, devNo=%d", __func__, (int)(bus_no),
(int)(dev_no));
return;
}
diff --git a/drivers/staging/unisys/uislib/uisqueue.c
b/drivers/staging/unisys/uislib/uisqueue.c
index 71bb7b6..c74aa14 100644
--- a/drivers/staging/unisys/uislib/uisqueue.c
+++ b/drivers/staging/unisys/uislib/uisqueue.c
@@ -296,11 +296,11 @@ uisqueue_put_cmdrsp_with_lock_client(struct uisqueue_info
*queueinfo,
(spinlock_t *)insertlock,
channel_id)) {
if (oktowait != OK_TO_WAIT) {
- LOGERR("****FAILED visor_signal_insert failed; cannot
wait; insert aborted\n");
+ pr_err("****FAILED visor_signal_insert failed; cannot
wait; insert aborted\n");
return 0; /* failed to queue */
}
/* try again */
- LOGERR("****FAILED visor_signal_insert failed; waiting to try
again\n");
+ pr_err("****FAILED visor_signal_insert failed; waiting to try
again\n");
set_current_state(TASK_INTERRUPTIBLE);
schedule_timeout(msecs_to_jiffies(10));
}
diff --git a/drivers/staging/unisys/uislib/uisthread.c
b/drivers/staging/unisys/uislib/uisthread.c
index 25adf1a..1cc93b4 100644
--- a/drivers/staging/unisys/uislib/uisthread.c
+++ b/drivers/staging/unisys/uislib/uisthread.c
@@ -69,13 +69,13 @@ uisthread_stop(struct uisthread_info *thrinfo)
thrinfo->should_stop = 1;
ret = KILL(thrinfo->id, SIGHUP, 1);
if (ret) {
- LOGERR("unable to signal thread %d\n", ret);
+ pr_err("unable to signal thread %d\n", ret);
} else {
/* give up if the thread has NOT died in 1 minute */
if (wait_for_completion_timeout(&thrinfo->has_stopped, 60 * HZ))
stopped = 1;
else
- LOGERR("timed out trying to signal thread\n");
+ pr_err("timed out trying to signal thread\n");
}
if (stopped) {
LOGINF("uisthread_stop stopped id:%d\n", thrinfo->id);
diff --git a/drivers/staging/unisys/uislib/uisutils.c
b/drivers/staging/unisys/uislib/uisutils.c
index d9f527d..b4e5907 100644
--- a/drivers/staging/unisys/uislib/uisutils.c
+++ b/drivers/staging/unisys/uislib/uisutils.c
@@ -60,7 +60,7 @@ uisutil_add_proc_line_ex(int *total, char **buffer, int
*buffer_remaining,
*buffer += *buffer_remaining;
*total += *buffer_remaining;
*buffer_remaining = 0;
- LOGERR("bytes remaining is too small!\n");
+ pr_err("bytes remaining is too small!\n");
return -1;
}
*buffer_remaining -= len;
@@ -90,7 +90,7 @@ uisctrl_register_req_handler(int type, void *fptr,
break;
default:
- LOGERR("invalid type %d.\n", type);
+ pr_err("invalid type %d.\n", type);
return 0;
}
if (chipset_driver_info)
@@ -117,16 +117,16 @@ uisctrl_register_req_handler_ex(uuid_le switch_uuid,
LOGINF("type=%pUL, controlfunc=0x%p.\n",
&switch_uuid, controlfunc);
if (!controlfunc) {
- LOGERR("%pUL: controlfunc must be supplied\n", &switch_uuid);
+ pr_err("%pUL: controlfunc must be supplied\n", &switch_uuid);
return 0;
}
if (!server_channel_ok) {
- LOGERR("%pUL: Server_Channel_Ok must be supplied\n",
+ pr_err("%pUL: Server_Channel_Ok must be supplied\n",
&switch_uuid);
return 0;
}
if (!server_channel_init) {
- LOGERR("%pUL: Server_Channel_Init must be supplied\n",
+ pr_err("%pUL: Server_Channel_Init must be supplied\n",
&switch_uuid);
return 0;
}
@@ -136,7 +136,7 @@ uisctrl_register_req_handler_ex(uuid_le switch_uuid,
min_channel_bytes,
server_channel_ok, server_channel_init);
if (!req_handler) {
- LOGERR("failed to add %pUL to server list\n", &switch_uuid);
+ pr_err("failed to add %pUL to server list\n", &switch_uuid);
return 0;
}
@@ -147,7 +147,7 @@ uisctrl_register_req_handler_ex(uuid_le switch_uuid,
return 1;
}
- LOGERR("failed to register type %pUL.\n", &switch_uuid);
+ pr_err("failed to register type %pUL.\n", &switch_uuid);
return 0;
}
EXPORT_SYMBOL_GPL(uisctrl_register_req_handler_ex);
@@ -157,7 +157,7 @@ uisctrl_unregister_req_handler_ex(uuid_le switch_uuid)
{
LOGINF("type=%pUL.\n", &switch_uuid);
if (req_handler_del(switch_uuid) < 0) {
- LOGERR("failed to remove %pUL from server list\n",
+ pr_err("failed to remove %pUL from server list\n",
&switch_uuid);
return 0;
}
@@ -197,7 +197,7 @@ uisutil_copy_fragsinfo_from_skb(unsigned char *calling_ctx,
void *skb_in,
while (firstfraglen) {
if (count == frags_max) {
- LOGERR("%s frags array too small: max:%d count:%d\n",
+ pr_err("%s frags array too small: max:%d count:%d\n",
calling_ctx, frags_max, count);
return -1; /* failure */
}
@@ -220,7 +220,7 @@ uisutil_copy_fragsinfo_from_skb(unsigned char *calling_ctx,
void *skb_in,
goto dolist;
if ((count + numfrags) > frags_max) {
- LOGERR("**** FAILED %s frags array too small: max:%d
count+nr_frags:%d\n",
+ pr_err("**** FAILED %s frags array too small: max:%d
count+nr_frags:%d\n",
calling_ctx, frags_max, count + numfrags);
return -1; /* failure */
}
@@ -234,7 +234,7 @@ uisutil_copy_fragsinfo_from_skb(unsigned char *calling_ctx,
void *skb_in,
size, count, frags_max,
frags);
if (count == 0) {
- LOGERR("**** FAILED to add physinfo entries\n");
+ pr_err("**** FAILED to add physinfo entries\n");
return -1; /* failure */
}
}
@@ -251,7 +251,7 @@ dolist: if (skb_shinfo(skb)->frag_list) {
frags_max - count,
&frags[count]);
if (c == -1) {
- LOGERR("**** FAILED recursive call failed\n");
+ pr_err("**** FAILED recursive call failed\n");
return -1;
}
count += c;
diff --git a/drivers/staging/unisys/virthba/virthba.c
b/drivers/staging/unisys/virthba/virthba.c
index d7a629b..a424f96 100644
--- a/drivers/staging/unisys/virthba/virthba.c
+++ b/drivers/staging/unisys/virthba/virthba.c
@@ -261,7 +261,7 @@ add_scsipending_entry(struct virthba_info *vhbainfo, char
cmdtype, void *new)
while (vhbainfo->pending[insert_location].sent != NULL) {
insert_location = (insert_location + 1) % MAX_PENDING_REQUESTS;
if (insert_location == (int) vhbainfo->nextinsert) {
- LOGERR("Queue should be full. insert_location<<%d>>
Unable to find open slot for pending commands.\n",
+ pr_err("Queue should be full. insert_location<<%d>>
Unable to find open slot for pending commands.\n",
insert_location);
spin_unlock_irqrestore(&vhbainfo->privlock, flags);
return -1;
@@ -283,7 +283,7 @@ add_scsipending_entry_with_wait(struct virthba_info
*vhbainfo, char cmdtype,
int insert_location = add_scsipending_entry(vhbainfo, cmdtype, new);
while (insert_location == -1) {
- LOGERR("Failed to find empty queue slot. Waiting to try
again\n");
+ pr_err("Failed to find empty queue slot. Waiting to try
again\n");
set_current_state(TASK_INTERRUPTIBLE);
schedule_timeout(msecs_to_jiffies(10));
insert_location = add_scsipending_entry(vhbainfo, cmdtype, new);
@@ -299,13 +299,13 @@ del_scsipending_entry(struct virthba_info *vhbainfo,
uintptr_t del)
void *sent = NULL;
if (del >= MAX_PENDING_REQUESTS) {
- LOGERR("Invalid queue position <<%lu>> given to delete.
MAX_PENDING_REQUESTS <<%d>>\n",
+ pr_err("Invalid queue position <<%lu>> given to delete.
MAX_PENDING_REQUESTS <<%d>>\n",
(unsigned long) del, MAX_PENDING_REQUESTS);
} else {
spin_lock_irqsave(&vhbainfo->privlock, flags);
if (vhbainfo->pending[del].sent == NULL)
- LOGERR("Deleting already cleared queue entry at
<<%lu>>.\n",
+ pr_err("Deleting already cleared queue entry at
<<%lu>>.\n",
(unsigned long) del);
sent = vhbainfo->pending[del].sent;
@@ -355,11 +355,11 @@ SendDiskAddRemove(struct diskaddremove *dar)
scsi_add_device(dar->shost, dar->channel, dar->id,
dar->lun);
if (error)
- LOGERR("Failed scsi_add_device:
host_no=%d[chan=%d:id=%d:lun=%d]\n",
+ pr_err("Failed scsi_add_device:
host_no=%d[chan=%d:id=%d:lun=%d]\n",
dar->shost->host_no, dar->channel, dar->id,
dar->lun);
} else
- LOGERR("Failed scsi_device_lookup:[chan=%d:id=%d:lun=%d]\n",
+ pr_err("Failed scsi_device_lookup:[chan=%d:id=%d:lun=%d]\n",
dar->channel, dar->id, dar->lun);
kfree(dar);
}
@@ -406,7 +406,7 @@ process_disk_notify(struct Scsi_Host *shost, struct
uiscmdrsp *cmdrsp)
dar->lun = cmdrsp->disknotify.lun;
QUEUE_DISKADDREMOVE(dar);
} else {
- LOGERR("kmalloc failed for dar.
host_no=%d[chan=%d:id=%d:lun=%d]\n",
+ pr_err("kmalloc failed for dar.
host_no=%d[chan=%d:id=%d:lun=%d]\n",
shost->host_no, cmdrsp->disknotify.channel,
cmdrsp->disknotify.id, cmdrsp->disknotify.lun);
}
@@ -535,7 +535,7 @@ virthba_probe(struct virtpci_dev *virtpcidev, const struct
pci_device_id *id)
*/
error = scsi_add_host(scsihost, &virtpcidev->generic_dev);
if (error) {
- LOGERR("scsi_add_host ****FAILED 0x%x TBD - RECOVER\n", error);
+ pr_err("scsi_add_host ****FAILED 0x%x TBD - RECOVER\n", error);
POSTCODE_LINUX_2(VHBA_PROBE_FAILURE_PC, POSTCODE_SEVERITY_ERR);
/* decr refcount on scsihost which was incremented by
* scsi_add_host so the scsi_host gets deleted
@@ -593,7 +593,7 @@ virthba_probe(struct virtpci_dev *virtpcidev, const struct
pci_device_id *id)
if (!uisthread_start(&virthbainfo->chinfo.threadinfo,
process_incoming_rsps,
virthbainfo, "vhba_incoming")) {
- LOGERR("uisthread_start rsp ****FAILED\n");
+ pr_err("uisthread_start rsp ****FAILED\n");
/* decr refcount on scsihost which was incremented by
* scsi_add_host so the scsi_host gets deleted
*/
@@ -615,14 +615,14 @@ virthba_probe(struct virtpci_dev *virtpcidev, const
struct pci_device_id *id)
rsp = request_irq(virthbainfo->interrupt_vector, handler, IRQF_SHARED,
scsihost->hostt->name, virthbainfo);
if (rsp != 0) {
- LOGERR("request_irq(%d) uislib_virthba_ISR request failed with
rsp=%d\n",
+ pr_err("request_irq(%d) uislib_virthba_ISR request failed with
rsp=%d\n",
virthbainfo->interrupt_vector, rsp);
virthbainfo->interrupt_vector = -1;
POSTCODE_LINUX_2(VHBA_PROBE_FAILURE_PC, POSTCODE_SEVERITY_ERR);
} else {
u64 __iomem *Features_addr =
&virthbainfo->chinfo.queueinfo->chan->features;
- LOGERR("request_irq(%d) uislib_virthba_ISR request succeeded\n",
+ pr_err("request_irq(%d) uislib_virthba_ISR request succeeded\n",
virthbainfo->interrupt_vector);
mask = ~(ULTRA_IO_CHANNEL_IS_POLLING |
ULTRA_IO_DRIVER_DISABLES_INTS);
@@ -692,10 +692,8 @@ forward_vdiskmgmt_command(enum vdisk_mgmt_types
vdiskcmdtype,
}
cmdrsp = kzalloc(SIZEOF_CMDRSP, GFP_ATOMIC);
- if (cmdrsp == NULL) {
- LOGERR("kmalloc of cmdrsp failed.\n");
+ if (cmdrsp == NULL)
return FAILED; /* reject */
- }
init_waitqueue_head(¬ifyevent);
@@ -755,10 +753,8 @@ forward_taskmgmt_command(enum task_mgmt_types tasktype,
}
cmdrsp = kzalloc(SIZEOF_CMDRSP, GFP_ATOMIC);
- if (cmdrsp == NULL) {
- LOGERR("kmalloc of cmdrsp failed.\n");
+ if (cmdrsp == NULL)
return FAILED; /* reject */
- }
init_waitqueue_head(¬ifyevent);
@@ -879,7 +875,7 @@ static int
virthba_host_reset_handler(struct scsi_cmnd *scsicmd)
{
/* issue TASK_MGMT_TARGET_RESET for each target on each bus for host */
- LOGERR("virthba_host_reset_handler Not yet implemented\n");
+ pr_err("virthba_host_reset_handler Not yet implemented\n");
return SUCCESS;
}
@@ -926,10 +922,8 @@ virthba_queue_command_lck(struct scsi_cmnd *scsicmd,
}
cmdrsp = kzalloc(SIZEOF_CMDRSP, GFP_ATOMIC);
- if (cmdrsp == NULL) {
- LOGERR("kmalloc of cmdrsp failed.\n");
+ if (cmdrsp == NULL)
return 1; /* reject the command */
- }
/* now saving everything we need from scsi_cmd into cmdrsp
* before we queue cmdrsp set type to command - as opposed to
@@ -944,7 +938,7 @@ virthba_queue_command_lck(struct scsi_cmnd *scsicmd,
if (insert_location != -1) {
cmdrsp->scsi.scsicmd = (void *) (uintptr_t) insert_location;
} else {
- LOGERR("Queue is full. Returning busy.\n");
+ pr_err("Queue is full. Returning busy.\n");
kfree(cmdrsp);
return SCSI_MLQUEUE_DEVICE_BUSY;
}
@@ -965,7 +959,7 @@ virthba_queue_command_lck(struct scsi_cmnd *scsicmd,
MaxBuffLen = cmdrsp->scsi.bufflen;
if (scsi_sg_count(scsicmd) > MAX_PHYS_INFO) {
- LOGERR("scsicmd use_sg:%d greater than MAX:%d\n",
+ pr_err("scsicmd use_sg:%d greater than MAX:%d\n",
scsi_sg_count(scsicmd), MAX_PHYS_INFO);
del_scsipending_entry(virthbainfo, (uintptr_t) insert_location);
kfree(cmdrsp);
@@ -979,7 +973,7 @@ virthba_queue_command_lck(struct scsi_cmnd *scsicmd,
/* convert buffer to phys information */
if (scsi_sg_count(scsicmd) == 0) {
if (scsi_bufflen(scsicmd) > 0) {
- LOGERR("**** FAILED No scatter list for bufflen > 0\n");
+ pr_err("**** FAILED No scatter list for bufflen > 0\n");
BUG_ON(scsi_sg_count(scsicmd) == 0);
}
DBGINF("No sg; buffer:0x%p bufflen:%d\n",
@@ -998,15 +992,15 @@ virthba_queue_command_lck(struct scsi_cmnd *scsicmd,
}
if (sg_failed) {
- LOGERR("Start sg_list dump (entries %d, bufflen
%d)...\n",
+ pr_err("Start sg_list dump (entries %d, bufflen
%d)...\n",
scsi_sg_count(scsicmd), cmdrsp->scsi.bufflen);
for_each_sg(sgl, sg, scsi_sg_count(scsicmd), i) {
- LOGERR(" Entry(%d): page->[0x%p],
phys->[0x%Lx], off(%d), len(%d)\n",
+ pr_err(" Entry(%d): page->[0x%p],
phys->[0x%Lx], off(%d), len(%d)\n",
i, sg_page(sg),
(unsigned long long) sg_phys(sg),
sg->offset, sg->length);
}
- LOGERR("Done sg_list dump.\n");
+ pr_err("Done sg_list dump.\n");
/* BUG(); ***** For now, let it fail in uissd
* if it is a problem, as it might just
* work
@@ -1025,7 +1019,7 @@ virthba_queue_command_lck(struct scsi_cmnd *scsicmd,
(u64) NULL, DONT_WAIT, "vhba");
if (i == 0) {
/* queue must be full - and we said don't wait - return busy */
- LOGERR("uisqueue_put_cmdrsp_with_lock ****FAILED\n");
+ pr_err("uisqueue_put_cmdrsp_with_lock ****FAILED\n");
kfree(cmdrsp);
del_scsipending_entry(virthbainfo, (uintptr_t) insert_location);
return SCSI_MLQUEUE_DEVICE_BUSY;
@@ -1051,7 +1045,7 @@ virthba_slave_alloc(struct scsi_device *scsidev)
virthbainfo = (struct virthba_info *) scsihost->hostdata;
if (!virthbainfo) {
- LOGERR("Could not find virthba_info for scsihost\n");
+ pr_err("Could not find virthba_info for scsihost\n");
return 0; /* even though we errored, treat as success */
}
for (vdisk = &virthbainfo->head; vdisk->next; vdisk = vdisk->next) {
@@ -1062,10 +1056,8 @@ virthba_slave_alloc(struct scsi_device *scsidev)
return 0;
}
tmpvdisk = kzalloc(sizeof(struct virtdisk_info), GFP_ATOMIC);
- if (!tmpvdisk) { /* error allocating */
- LOGERR("Could not allocate memory for disk\n");
+ if (!tmpvdisk)
return 0;
- }
tmpvdisk->channel = scsidev->channel;
tmpvdisk->id = scsidev->id;
@@ -1093,7 +1085,7 @@ virthba_slave_destroy(struct scsi_device *scsidev)
virthbainfo = (struct virthba_info *) scsihost->hostdata;
if (!virthbainfo)
- LOGERR("Could not find virthba_info for scsihost\n");
+ pr_err("Could not find virthba_info for scsihost\n");
for (vdisk = &virthbainfo->head; vdisk->next; vdisk = vdisk->next) {
if (vdisk->next->valid &&
(vdisk->next->channel == scsidev->channel) &&
@@ -1138,7 +1130,7 @@ do_scsi_linuxstat(struct uiscmdrsp *cmdrsp, struct
scsi_cmnd *scsicmd)
if (atomic_read(&vdisk->error_count) < VIRTHBA_ERROR_COUNT) {
atomic_inc(&vdisk->error_count);
- LOGERR("SCSICMD ****FAILED scsicmd:0x%p op:0x%x
<%d:%d:%d:%llu> 0x%x-0x%x-0x%x-0x%x-0x%x.\n",
+ pr_err("SCSICMD ****FAILED scsicmd:0x%p op:0x%x
<%d:%d:%d:%llu> 0x%x-0x%x-0x%x-0x%x-0x%x.\n",
scsicmd, cmdrsp->scsi.cmnd[0],
scsidev->host->host_no, scsidev->id,
scsidev->channel, scsidev->lun,
@@ -1147,7 +1139,7 @@ do_scsi_linuxstat(struct uiscmdrsp *cmdrsp, struct
scsi_cmnd *scsicmd)
sd->additional_sense_code_qualifier);
if (atomic_read(&vdisk->error_count) ==
VIRTHBA_ERROR_COUNT) {
- LOGERR("Throtling SCSICMD errors disk
<%d:%d:%d:%llu>\n",
+ pr_err("Throtling SCSICMD errors disk
<%d:%d:%d:%llu>\n",
scsidev->host->host_no, scsidev->id,
scsidev->channel, scsidev->lun);
}
@@ -1186,7 +1178,7 @@ do_scsi_nolinuxstat(struct uiscmdrsp *cmdrsp, struct
scsi_cmnd *scsicmd)
if (scsi_sg_count(scsicmd) == 0) {
if (scsi_bufflen(scsicmd) > 0) {
- LOGERR("**** FAILED No scatter list for bufflen
> 0\n");
+ pr_err("**** FAILED No scatter list for bufflen
> 0\n");
BUG_ON(scsi_sg_count(scsicmd) ==
0);
}
@@ -1218,7 +1210,7 @@ do_scsi_nolinuxstat(struct uiscmdrsp *cmdrsp, struct
scsi_cmnd *scsicmd)
if (atomic_read(&vdisk->ios_threshold) > 0) {
atomic_dec(&vdisk->ios_threshold);
if (atomic_read(&vdisk->ios_threshold) == 0) {
- LOGERR("Resetting error count for
disk\n");
+ pr_err("Resetting error count for
disk\n");
atomic_set(&vdisk->error_count, 0);
}
}
@@ -1317,7 +1309,7 @@ drain_queue(struct virthba_info *virthbainfo, struct
chaninfo *dc,
break;
complete_vdiskmgmt_command(cmdrsp);
} else
- LOGERR("Invalid cmdtype %d\n", cmdrsp->cmdtype);
+ pr_err("Invalid cmdtype %d\n", cmdrsp->cmdtype);
/* cmdrsp is now available for reuse */
}
}
@@ -1339,7 +1331,6 @@ process_incoming_rsps(void *v)
/* alloc once and reuse */
cmdrsp = kmalloc(SZ, GFP_ATOMIC);
if (cmdrsp == NULL) {
- LOGERR("process_incoming_rsps ****FAILED to malloc - thread
exiting\n");
complete_and_exit(&dc->threadinfo.has_stopped, 0);
return 0;
}
@@ -1433,7 +1424,7 @@ static ssize_t enable_ints_write(struct file *file,
buf[count] = '\0';
if (copy_from_user(buf, buffer, count)) {
- LOGERR("copy_from_user failed. buf<<%.*s>> count<<%lu>>\n",
+ pr_err("copy_from_user failed. buf<<%.*s>> count<<%lu>>\n",
(int) count, buf, count);
return -EFAULT;
}
@@ -1441,7 +1432,7 @@ static ssize_t enable_ints_write(struct file *file,
i = kstrtoint(buf, 10 , &new_value);
if (i != 0) {
- LOGERR("Failed to scan value for enable_ints, buf<<%.*s>>",
+ pr_err("Failed to scan value for enable_ints, buf<<%.*s>>",
(int) count, buf);
return -EFAULT;
}
@@ -1488,7 +1479,7 @@ virthba_serverup(struct virtpci_dev *virtpcidev)
return 1;
}
if (virthbainfo->serverchangingstate) {
- LOGERR("Server already processing change state message\n");
+ pr_err("Server already processing change state message\n");
return 0;
}
@@ -1504,7 +1495,7 @@ virthba_serverup(struct virtpci_dev *virtpcidev)
if (!uisthread_start(&virthbainfo->chinfo.threadinfo,
process_incoming_rsps,
virthbainfo, "vhba_incoming")) {
- LOGERR("uisthread_start rsp ****FAILED\n");
+ pr_err("uisthread_start rsp ****FAILED\n");
return 0;
}
virthbainfo->serverdown = false;
@@ -1561,7 +1552,7 @@ virthba_serverdown_complete(struct work_struct *work)
break;
default:
if (pendingdel->sent != NULL)
- LOGERR("Unknown command type: 0x%x. Only
freeing list structure.\n",
+ pr_err("Unknown command type: 0x%x. Only
freeing list structure.\n",
pendingdel->cmdtype);
}
pendingdel->cmdtype = 0;
@@ -1597,10 +1588,10 @@ virthba_serverdown(struct virtpci_dev *virtpcidev, u32
state)
queue_work(virthba_serverdown_workqueue,
&virthbainfo->serverdown_completion);
} else if (virthbainfo->serverchangingstate) {
- LOGERR("Server already processing change state message\n");
+ pr_err("Server already processing change state message\n");
return 0;
} else
- LOGERR("Server already down, but another server down message
received.");
+ pr_err("Server already down, but another server down message
received.");
return 1;
}
@@ -1651,7 +1642,7 @@ virthba_mod_init(void)
error = virtpci_register_driver(&virthba_driver);
if (error < 0) {
- LOGERR("register ****FAILED 0x%x\n", error);
+ pr_err("register ****FAILED 0x%x\n", error);
POSTCODE_LINUX_3(VHBA_CREATE_FAILURE_PC, error,
POSTCODE_SEVERITY_ERR);
} else {
@@ -1676,7 +1667,7 @@ virthba_mod_init(void)
virthba_serverdown_workqueue =
create_singlethread_workqueue("virthba_serverdown");
if (virthba_serverdown_workqueue == NULL) {
- LOGERR("**** FAILED virthba_serverdown_workqueue
creation\n");
+ pr_err("**** FAILED virthba_serverdown_workqueue
creation\n");
POSTCODE_LINUX_2(VHBA_CREATE_FAILURE_PC,
POSTCODE_SEVERITY_ERR);
error = -1;
diff --git a/drivers/staging/unisys/virtpci/virtpci.c
b/drivers/staging/unisys/virtpci/virtpci.c
index 39b828d..eb73919 100644
--- a/drivers/staging/unisys/virtpci/virtpci.c
+++ b/drivers/staging/unisys/virtpci/virtpci.c
@@ -192,12 +192,12 @@ static int write_vbus_chp_info(struct
spar_vbus_channel_protocol *chan,
int off;
if (!chan) {
- LOGERR("vbus channel not present");
+ pr_err("vbus channel not present");
return -1;
}
off = sizeof(struct channel_header) + chan->hdr_info.chp_info_offset;
if (chan->hdr_info.chp_info_offset == 0) {
- LOGERR("vbus channel not used, because chp_info_offset == 0");
+ pr_err("vbus channel not used, because chp_info_offset == 0");
return -1;
}
memcpy(((u8 *)(chan)) + off, info, sizeof(*info));
@@ -211,12 +211,12 @@ static int write_vbus_bus_info(struct
spar_vbus_channel_protocol *chan,
int off;
if (!chan) {
- LOGERR("vbus channel not present");
+ pr_err("vbus channel not present");
return -1;
}
off = sizeof(struct channel_header) + chan->hdr_info.bus_info_offset;
if (chan->hdr_info.bus_info_offset == 0) {
- LOGERR("vbus channel not used, because bus_info_offset == 0");
+ pr_err("vbus channel not used, because bus_info_offset == 0");
return -1;
}
memcpy(((u8 *)(chan)) + off, info, sizeof(*info));
@@ -233,7 +233,7 @@ write_vbus_dev_info(struct spar_vbus_channel_protocol *chan,
int off;
if (!chan) {
- LOGERR("vbus channel not present");
+ pr_err("vbus channel not present");
return -1;
}
off =
@@ -241,7 +241,7 @@ write_vbus_dev_info(struct spar_vbus_channel_protocol *chan,
chan->hdr_info.dev_info_offset) +
(chan->hdr_info.device_info_struct_bytes * devix);
if (chan->hdr_info.dev_info_offset == 0) {
- LOGERR("vbus channel not used, because dev_info_offset == 0");
+ pr_err("vbus channel not used, because dev_info_offset == 0");
return -1;
}
memcpy(((u8 *)(chan)) + off, info, sizeof(*info));
@@ -275,7 +275,7 @@ static int add_vbus(struct add_vbus_guestpart *addparams)
*/
ret = device_register(vbus);
if (ret) {
- LOGERR("device_register FAILED:%d\n", ret);
+ pr_err("device_register FAILED:%d\n", ret);
POSTCODE_LINUX_2(VPCI_CREATE_FAILURE_PC, POSTCODE_SEVERITY_ERR);
return 0;
}
@@ -316,7 +316,7 @@ static int add_vhba(struct add_virt_guestpart *addparams)
POSTCODE_LINUX_2(VPCI_CREATE_ENTRY_PC, POSTCODE_SEVERITY_INFO);
if (!WAIT_FOR_IO_CHANNEL
((struct spar_io_channel_protocol __iomem *)addparams->chanptr)) {
- LOGERR("Timed out. Channel not ready\n");
+ pr_err("Timed out. Channel not ready\n");
POSTCODE_LINUX_2(VPCI_CREATE_FAILURE_PC, POSTCODE_SEVERITY_ERR);
return 0;
}
@@ -328,7 +328,7 @@ static int add_vhba(struct add_virt_guestpart *addparams)
vbus = bus_find_device(&virtpci_bus_type, NULL,
(void *)busid, match_busid);
if (!vbus) {
- LOGERR("**** FAILED to find vbus %s\n", busid);
+ pr_err("**** FAILED to find vbus %s\n", busid);
return 0;
}
@@ -379,7 +379,7 @@ add_vnic(struct add_virt_guestpart *addparams)
POSTCODE_LINUX_2(VPCI_CREATE_ENTRY_PC, POSTCODE_SEVERITY_INFO);
if (!WAIT_FOR_IO_CHANNEL
((struct spar_io_channel_protocol __iomem *)addparams->chanptr)) {
- LOGERR("Timed out, channel not ready\n");
+ pr_err("Timed out, channel not ready\n");
POSTCODE_LINUX_2(VPCI_CREATE_FAILURE_PC, POSTCODE_SEVERITY_ERR);
return 0;
}
@@ -391,7 +391,7 @@ add_vnic(struct add_virt_guestpart *addparams)
vbus = bus_find_device(&virtpci_bus_type, NULL,
(void *)busid, match_busid);
if (!vbus) {
- LOGERR("**** FAILED to find vbus %s\n", busid);
+ pr_err("**** FAILED to find vbus %s\n", busid);
return 0;
}
@@ -425,7 +425,7 @@ delete_vbus(struct del_vbus_guestpart *delparams)
vbus = bus_find_device(&virtpci_bus_type, NULL,
(void *)busid, match_busid);
if (!vbus) {
- LOGERR("**** FAILED to find vbus %s\n", busid);
+ pr_err("**** FAILED to find vbus %s\n", busid);
return 0;
}
@@ -619,7 +619,7 @@ static void delete_all(void)
/* now delete each vbus */
if (bus_for_each_dev
(&virtpci_bus_type, NULL, (void *)1, delete_vbus_device))
- LOGERR("delete of all vbus failed\n");
+ pr_err("delete of all vbus failed\n");
}
/* deletes all vnics or vhbas
@@ -637,12 +637,12 @@ static int delete_all_virt(enum virtpci_dev_type devtype,
vbus = bus_find_device(&virtpci_bus_type, NULL,
(void *)busid, match_busid);
if (!vbus) {
- LOGERR("**** FAILED to find vbus %s\n", busid);
+ pr_err("**** FAILED to find vbus %s\n", busid);
return 0;
}
if ((devtype != VIRTHBA_TYPE) && (devtype != VIRTNIC_TYPE)) {
- LOGERR("**** FAILED to delete all devices; devtype:%d not
vhba:%d or vnic:%d\n",
+ pr_err("**** FAILED to delete all devices; devtype:%d not
vhba:%d or vnic:%d\n",
devtype, VIRTHBA_TYPE, VIRTNIC_TYPE);
return 0;
}
@@ -688,7 +688,7 @@ static int virtpci_ctrlchan_func(struct guest_msgs *msg)
case GUEST_RESUME_VNIC:
return resume_vnic(&msg->resume_vnic);
default:
- LOGERR("invalid message type %d.\n", msg->msgtype);
+ pr_err("invalid message type %d.\n", msg->msgtype);
return 0;
}
}
@@ -783,21 +783,21 @@ static void fix_vbus_dev_info(struct device *dev, int
dev_no, int dev_type,
const char *stype;
if (!dev) {
- LOGERR("%s dev is NULL", __func__);
+ pr_err("%s dev is NULL", __func__);
return;
}
if (!virtpcidrv) {
- LOGERR("%s driver is NULL", __func__);
+ pr_err("%s driver is NULL", __func__);
return;
}
vbus = dev->parent;
if (!vbus) {
- LOGERR("%s dev has no parent bus", __func__);
+ pr_err("%s dev has no parent bus", __func__);
return;
}
chan = vbus->platform_data;
if (!chan) {
- LOGERR("%s dev bus has no channel", __func__);
+ pr_err("%s dev bus has no channel", __func__);
return;
}
switch (dev_type) {
@@ -937,7 +937,7 @@ static int virtpci_device_add(struct device *parentbus, int
devtype,
POSTCODE_LINUX_2(VPCI_CREATE_ENTRY_PC, POSTCODE_SEVERITY_INFO);
if ((devtype != VIRTHBA_TYPE) && (devtype != VIRTNIC_TYPE)) {
- LOGERR("**** FAILED to add device; devtype:%d not vhba:%d or
vnic:%d\n",
+ pr_err("**** FAILED to add device; devtype:%d not vhba:%d or
vnic:%d\n",
devtype, VIRTHBA_TYPE, VIRTNIC_TYPE);
POSTCODE_LINUX_3(VPCI_CREATE_FAILURE_PC, devtype,
POSTCODE_SEVERITY_ERR);
@@ -947,7 +947,6 @@ static int virtpci_device_add(struct device *parentbus, int
devtype,
/* add a Virtual Device */
virtpcidev = kzalloc(sizeof(*virtpcidev), GFP_ATOMIC);
if (virtpcidev == NULL) {
- LOGERR("can't add device - malloc FALLED\n");
POSTCODE_LINUX_2(MALLOC_FAILURE_PC, POSTCODE_SEVERITY_ERR);
return 0;
}
@@ -1009,7 +1008,7 @@ static int virtpci_device_add(struct device *parentbus,
int devtype,
*/
write_unlock_irqrestore(&vpcidev_list_lock, flags);
kfree(virtpcidev);
- LOGERR("**** FAILED vhba/vnic already exists in the list\n");
+ pr_err("**** FAILED vhba/vnic already exists in the list\n");
POSTCODE_LINUX_2(VPCI_CREATE_FAILURE_PC, POSTCODE_SEVERITY_ERR);
return 0;
}
@@ -1053,7 +1052,7 @@ static int virtpci_device_add(struct device *parentbus,
int devtype,
* virtpci_device_probe is successful
*/
if (ret) {
- LOGERR("device_register returned %d\n", ret);
+ pr_err("device_register returned %d\n", ret);
dev = &virtpcidev->generic_dev;
SPAR_CHANNEL_CLIENT_TRANSITION(addparams->chanptr,
BUS_ID(dev),
@@ -1097,7 +1096,7 @@ static int virtpci_device_serverdown(struct device
*parentbus,
int rc = 0;
if ((devtype != VIRTHBA_TYPE) && (devtype != VIRTNIC_TYPE)) {
- LOGERR("**** FAILED to pause device; devtype:%d not vhba:%d or
vnic:%d\n",
+ pr_err("**** FAILED to pause device; devtype:%d not vhba:%d or
vnic:%d\n",
devtype, VIRTHBA_TYPE, VIRTNIC_TYPE);
return 0;
}
@@ -1136,7 +1135,7 @@ static int virtpci_device_serverdown(struct device
*parentbus,
write_unlock_irqrestore(&vpcidev_list_lock, flags);
if (!found) {
- LOGERR("**** FAILED to find vhba/vnic in the list\n");
+ pr_err("**** FAILED to find vhba/vnic in the list\n");
return 0;
}
@@ -1156,7 +1155,7 @@ static int virtpci_device_serverup(struct device
*parentbus,
int rc = 0;
if ((devtype != VIRTHBA_TYPE) && (devtype != VIRTNIC_TYPE)) {
- LOGERR("**** FAILED to resume device; devtype:%d not vhba:%d or
vnic:%d\n",
+ pr_err("**** FAILED to resume device; devtype:%d not vhba:%d or
vnic:%d\n",
devtype, VIRTHBA_TYPE, VIRTNIC_TYPE);
return 0;
}
@@ -1204,7 +1203,7 @@ static int virtpci_device_serverup(struct device
*parentbus,
write_unlock_irqrestore(&vpcidev_list_lock, flags);
if (!found) {
- LOGERR("**** FAILED to find vhba/vnic in the list\n");
+ pr_err("**** FAILED to find vhba/vnic in the list\n");
return 0;
}
@@ -1226,7 +1225,7 @@ static int virtpci_device_del(struct device *parentbus,
}
if ((devtype != VIRTHBA_TYPE) && (devtype != VIRTNIC_TYPE)) {
- LOGERR("**** FAILED to delete device; devtype:%d not vhba:%d or
vnic:%d\n",
+ pr_err("**** FAILED to delete device; devtype:%d not vhba:%d or
vnic:%d\n",
devtype, VIRTHBA_TYPE, VIRTNIC_TYPE);
return 0;
}
@@ -1297,7 +1296,7 @@ static int virtpci_device_del(struct device *parentbus,
write_unlock_irqrestore(&vpcidev_list_lock, flags);
if (!all && (count == 0)) {
- LOGERR("**** FAILED to find vhba/vnic in the list\n");
+ pr_err("**** FAILED to find vhba/vnic in the list\n");
return 0;
}
@@ -1385,7 +1384,7 @@ int virtpci_register_driver(struct virtpci_driver *drv)
DBGINF("In virtpci_register_driver\n");
if (drv->id_table == NULL) {
- LOGERR("id_table missing\n");
+ pr_err("id_table missing\n");
return 1;
}
/* initialize core driver fields needed to call driver_register */
@@ -1471,7 +1470,7 @@ static ssize_t info_debugfs_read(struct file *file, char
__user *buf,
printparam.len = &len;
if (bus_for_each_dev(&virtpci_bus_type, NULL,
(void *)&printparam, print_vbus))
- LOGERR("Failed to find bus\n");
+ pr_err("Failed to find bus\n");
str_pos += scnprintf(vbuf + str_pos, len - str_pos,
"\n Virtual PCI devices\n");
@@ -1534,7 +1533,7 @@ static int __init virtpci_mod_init(void)
* drivers directory
*/
if (ret) {
- LOGERR("bus_register ****FAILED:%d\n", ret);
+ pr_err("bus_register ****FAILED:%d\n", ret);
POSTCODE_LINUX_3(VPCI_CREATE_FAILURE_PC, ret,
POSTCODE_SEVERITY_ERR);
return ret;
@@ -1546,7 +1545,7 @@ static int __init virtpci_mod_init(void)
/* create a root bus used to parent all the virtpci buses. */
ret = device_register(&virtpci_rootbus_device);
if (ret) {
- LOGERR("device_register FAILED:%d\n", ret);
+ pr_err("device_register FAILED:%d\n", ret);
bus_unregister(&virtpci_bus_type);
POSTCODE_LINUX_3(VPCI_CREATE_FAILURE_PC, ret,
POSTCODE_SEVERITY_ERR);
@@ -1556,7 +1555,7 @@ static int __init virtpci_mod_init(void)
if (!uisctrl_register_req_handler(2, (void *)&virtpci_ctrlchan_func,
&chipset_driver_info)) {
- LOGERR("uisctrl_register_req_handler ****FAILED.\n");
+ pr_err("uisctrl_register_req_handler ****FAILED.\n");
POSTCODE_LINUX_2(VPCI_CREATE_FAILURE_PC, POSTCODE_SEVERITY_ERR);
device_unregister(&virtpci_rootbus_device);
bus_unregister(&virtpci_bus_type);
@@ -1580,7 +1579,7 @@ static void __exit virtpci_mod_exit(void)
/* unregister the callback function */
if (!uisctrl_register_req_handler(2, NULL, NULL))
- LOGERR("uisctrl_register_req_handler ****FAILED.\n");
+ pr_err("uisctrl_register_req_handler ****FAILED.\n");
device_unregister(&virtpci_rootbus_device);
bus_unregister(&virtpci_bus_type);
diff --git a/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
b/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
index 6c48ba1..70b6cf2 100644
--- a/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
+++ b/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
@@ -59,7 +59,6 @@ visorchannel_create_guts(HOSTADDRESS physaddr, ulong
channel_bytes,
p = kmalloc(sizeof(*p), GFP_KERNEL|__GFP_NORETRY);
if (p == NULL) {
- ERRDRV("allocation failed: (status=0)\n");
rc = NULL;
goto cleanup;
}
@@ -78,13 +77,13 @@ visorchannel_create_guts(HOSTADDRESS physaddr, ulong
channel_bytes,
visor_memregion_create_overlapped(parent->memregion,
off, sizeof(struct channel_header));
if (p->memregion == NULL) {
- ERRDRV("visor_memregion_create failed failed: (status=0)\n");
+ pr_err("visor_memregion_create failed failed: (status=0)\n");
rc = NULL;
goto cleanup;
}
if (visor_memregion_read(p->memregion, 0, &p->chan_hdr,
sizeof(struct channel_header)) < 0) {
- ERRDRV("visor_memregion_read failed: (status=0)\n");
+ pr_err("visor_memregion_read failed: (status=0)\n");
rc = NULL;
goto cleanup;
}
@@ -95,7 +94,7 @@ visorchannel_create_guts(HOSTADDRESS physaddr, ulong
channel_bytes,
/* we had better be a CLIENT of this channel */
guid = p->chan_hdr.chtype;
if (visor_memregion_resize(p->memregion, channel_bytes) < 0) {
- ERRDRV("visor_memregion_resize failed: (status=0)\n");
+ pr_err("visor_memregion_resize failed: (status=0)\n");
rc = NULL;
goto cleanup;
}
@@ -257,7 +256,7 @@ visorchannel_clear(struct visorchannel *channel, ulong
offset, u8 ch,
u8 *buf = vmalloc(bufsize);
if (buf == NULL) {
- ERRDRV("%s failed memory allocation", __func__);
+ pr_err("%s failed memory allocation", __func__);
goto cleanup;
}
memset(buf, ch, bufsize);
@@ -325,7 +324,7 @@ sig_read_header(struct visorchannel *channel, u32 queue,
BOOL rc = FALSE;
if (channel->chan_hdr.ch_space_offset < sizeof(struct channel_header)) {
- ERRDRV("oChannelSpace too small: (status=%d)\n", rc);
+ pr_err("oChannelSpace too small: (status=%d)\n", rc);
goto cleanup;
}
@@ -335,9 +334,9 @@ sig_read_header(struct visorchannel *channel, u32 queue,
SIG_QUEUE_OFFSET(&channel->chan_hdr, queue),
sig_hdr,
sizeof(struct signal_queue_header)) < 0) {
- ERRDRV("queue=%d SIG_QUEUE_OFFSET=%d",
+ pr_err("queue=%d SIG_QUEUE_OFFSET=%d",
queue, (int)SIG_QUEUE_OFFSET(&channel->chan_hdr, queue));
- ERRDRV("visor_memregion_read of signal queue failed:
(status=%d)\n",
+ pr_err("visor_memregion_read of signal queue failed:
(status=%d)\n",
rc);
goto cleanup;
}
@@ -358,14 +357,14 @@ sig_do_data(struct visorchannel *channel, u32 queue,
if (visor_memregion_write(channel->memregion,
signal_data_offset,
data, sig_hdr->signal_size) < 0) {
- ERRDRV("visor_memregion_write of signal data failed:
(status=%d)\n",
+ pr_err("visor_memregion_write of signal data failed:
(status=%d)\n",
rc);
goto cleanup;
}
} else {
if (visor_memregion_read(channel->memregion, signal_data_offset,
data, sig_hdr->signal_size) < 0) {
- ERRDRV("visor_memregion_read of signal data failed:
(status=%d)\n",
+ pr_err("visor_memregion_read of signal data failed:
(status=%d)\n",
rc);
goto cleanup;
}
@@ -404,7 +403,7 @@ safe_sig_queue_validate(struct signal_queue_header
*psafe_sqh,
punsafe_sqh->head = *phead;
punsafe_sqh->tail = *ptail;
- ERRDRV("safe_sig_queue_validate: head = 0x%x, tail = 0x%x,
MaxSlots = 0x%x",
+ pr_err("safe_sig_queue_validate: head = 0x%x, tail = 0x%x,
MaxSlots = 0x%x",
*phead, *ptail, psafe_sqh->max_slots);
return 0;
}
@@ -430,7 +429,7 @@ visorchannel_signalremove(struct visorchannel *channel, u32
queue, void *msg)
}
sig_hdr.tail = (sig_hdr.tail + 1) % sig_hdr.max_slots;
if (!sig_read_data(channel, queue, &sig_hdr, sig_hdr.tail, msg)) {
- ERRDRV("sig_read_data failed: (status=%d)\n", rc);
+ pr_err("sig_read_data failed: (status=%d)\n", rc);
goto cleanup;
}
sig_hdr.num_received++;
@@ -440,12 +439,12 @@ visorchannel_signalremove(struct visorchannel *channel,
u32 queue, void *msg)
*/
mb(); /* required for channel synch */
if (!SIG_WRITE_FIELD(channel, queue, &sig_hdr, tail)) {
- ERRDRV("visor_memregion_write of Tail failed: (status=%d)\n",
+ pr_err("visor_memregion_write of Tail failed: (status=%d)\n",
rc);
goto cleanup;
}
if (!SIG_WRITE_FIELD(channel, queue, &sig_hdr, num_received)) {
- ERRDRV("visor_memregion_write of NumSignalsReceived failed:
(status=%d)\n",
+ pr_err("visor_memregion_write of NumSignalsReceived failed:
(status=%d)\n",
rc);
goto cleanup;
}
@@ -476,7 +475,7 @@ visorchannel_signalinsert(struct visorchannel *channel, u32
queue, void *msg)
if (sig_hdr.head == sig_hdr.tail) {
sig_hdr.num_overflows++;
if (!SIG_WRITE_FIELD(channel, queue, &sig_hdr, num_overflows)) {
- ERRDRV("visor_memregion_write of NumOverflows failed:
(status=%d)\n",
+ pr_err("visor_memregion_write of NumOverflows failed:
(status=%d)\n",
rc);
goto cleanup;
}
@@ -485,7 +484,7 @@ visorchannel_signalinsert(struct visorchannel *channel, u32
queue, void *msg)
}
if (!sig_write_data(channel, queue, &sig_hdr, sig_hdr.head, msg)) {
- ERRDRV("sig_write_data failed: (status=%d)\n", rc);
+ pr_err("sig_write_data failed: (status=%d)\n", rc);
goto cleanup;
}
sig_hdr.num_sent++;
@@ -495,12 +494,12 @@ visorchannel_signalinsert(struct visorchannel *channel,
u32 queue, void *msg)
*/
mb(); /* required for channel synch */
if (!SIG_WRITE_FIELD(channel, queue, &sig_hdr, head)) {
- ERRDRV("visor_memregion_write of Head failed: (status=%d)\n",
+ pr_err("visor_memregion_write of Head failed: (status=%d)\n",
rc);
goto cleanup;
}
if (!SIG_WRITE_FIELD(channel, queue, &sig_hdr, num_sent)) {
- ERRDRV("visor_memregion_write of NumSignalsSent failed:
(status=%d)\n",
+ pr_err("visor_memregion_write of NumSignalsSent failed:
(status=%d)\n",
rc);
goto cleanup;
}
@@ -580,12 +579,12 @@ visorchannel_debug(struct visorchannel *channel, int
num_queues,
int errcode = 0;
if (channel == NULL) {
- ERRDRV("%s no channel", __func__);
+ pr_err("%s no channel", __func__);
return;
}
memregion = channel->memregion;
if (memregion == NULL) {
- ERRDRV("%s no memregion", __func__);
+ pr_err("%s no memregion", __func__);
return;
}
addr = visor_memregion_get_physaddr(memregion);
@@ -668,7 +667,7 @@ visorchannel_dump_section(struct visorchannel *chan, char
*s,
errcode = visorchannel_read(chan, off, buf, len);
if (errcode < 0) {
- ERRDRV("%s failed to read %s from channel errcode=%d",
+ pr_err("%s failed to read %s from channel errcode=%d",
s, __func__, errcode);
goto read_failed;
}
diff --git a/drivers/staging/unisys/visorchipset/file.c
b/drivers/staging/unisys/visorchipset/file.c
index e51fd4e..24ffd92 100644
--- a/drivers/staging/unisys/visorchipset/file.c
+++ b/drivers/staging/unisys/visorchipset/file.c
@@ -60,7 +60,7 @@ visorchipset_file_init(dev_t major_dev, struct visorchannel
**controlvm_channel)
if (MAJOR(majordev) == 0) {
/* dynamic major device number registration required */
if (alloc_chrdev_region(&majordev, 0, 1, MYDRVNAME) < 0) {
- ERRDRV("Unable to allocate+register char device %s",
+ pr_err("Unable to allocate+register char device %s",
MYDRVNAME);
return -1;
}
@@ -69,7 +69,7 @@ visorchipset_file_init(dev_t major_dev, struct visorchannel
**controlvm_channel)
} else {
/* static major device number registration required */
if (register_chrdev_region(majordev, 1, MYDRVNAME) < 0) {
- ERRDRV("Unable to register char device %s", MYDRVNAME);
+ pr_err("Unable to register char device %s", MYDRVNAME);
return -1;
}
registered = TRUE;
@@ -77,7 +77,7 @@ visorchipset_file_init(dev_t major_dev, struct visorchannel
**controlvm_channel)
}
rc = cdev_add(&file_cdev, MKDEV(MAJOR(majordev), 0), 1);
if (rc < 0) {
- ERRDRV("failed to create char device: (status=%d)\n", rc);
+ pr_err("failed to create char device: (status=%d)\n", rc);
return -1;
}
INFODRV("Registered char device for %s (major=%d)",
@@ -129,14 +129,14 @@ visorchipset_mmap(struct file *file, struct
vm_area_struct *vma)
/* sv_enable_dfp(); */
DEBUGDRV("%s", __func__);
if (offset & (PAGE_SIZE - 1)) {
- ERRDRV("%s virtual address NOT page-aligned!", __func__);
+ pr_err("%s virtual address NOT page-aligned!", __func__);
return -ENXIO; /* need aligned offsets */
}
switch (offset) {
case VISORCHIPSET_MMAP_CONTROLCHANOFFSET:
vma->vm_flags |= VM_IO;
if (*file_controlvm_channel == NULL) {
- ERRDRV("%s no controlvm channel yet", __func__);
+ pr_err("%s no controlvm channel yet", __func__);
return -ENXIO;
}
visorchannel_read(*file_controlvm_channel,
@@ -144,7 +144,7 @@ visorchipset_mmap(struct file *file, struct vm_area_struct
*vma)
gp_control_channel),
&addr, sizeof(addr));
if (addr == 0) {
- ERRDRV("%s control channel address is 0", __func__);
+ pr_err("%s control channel address is 0", __func__);
return -ENXIO;
}
physaddr = (ulong)addr;
@@ -154,7 +154,7 @@ visorchipset_mmap(struct file *file, struct vm_area_struct
*vma)
vma->vm_end - vma->vm_start,
/*pgprot_noncached */
(vma->vm_page_prot))) {
- ERRDRV("%s remap_pfn_range failed", __func__);
+ pr_err("%s remap_pfn_range failed", __func__);
return -EAGAIN;
}
break;
@@ -191,7 +191,7 @@ long visorchipset_ioctl(struct file *file, unsigned int
cmd, unsigned long arg)
adjustment);
return issue_vmcall_update_physical_time(adjustment);
default:
- LOGERR("visorchipset_ioctl received invalid command");
+ pr_err("visorchipset_ioctl received invalid command");
return -EFAULT;
}
}
diff --git a/drivers/staging/unisys/visorchipset/parser.c
b/drivers/staging/unisys/visorchipset/parser.c
index 9edbd3b..aded3b44 100644
--- a/drivers/staging/unisys/visorchipset/parser.c
+++ b/drivers/staging/unisys/visorchipset/parser.c
@@ -59,7 +59,7 @@ parser_init_guts(u64 addr, u32 bytes, BOOL isLocal,
allocbytes++;
if ((Controlvm_Payload_Bytes_Buffered + bytes)
> MAX_CONTROLVM_PAYLOAD_BYTES) {
- ERRDRV("%s (%s:%d) - prevented allocation of %d bytes to
prevent exceeding throttling max (%d)",
+ pr_err("%s (%s:%d) - prevented allocation of %d bytes to
prevent exceeding throttling max (%d)",
__func__, __FILE__, __LINE__, allocbytes,
MAX_CONTROLVM_PAYLOAD_BYTES);
if (tryAgain)
@@ -69,8 +69,6 @@ parser_init_guts(u64 addr, u32 bytes, BOOL isLocal,
}
ctx = kzalloc(allocbytes, GFP_KERNEL|__GFP_NORETRY);
if (ctx == NULL) {
- ERRDRV("%s (%s:%d) - failed to allocate %d bytes",
- __func__, __FILE__, __LINE__, allocbytes);
if (tryAgain)
*tryAgain = TRUE;
rc = NULL;
@@ -86,7 +84,7 @@ parser_init_guts(u64 addr, u32 bytes, BOOL isLocal,
void *p;
if (addr > virt_to_phys(high_memory - 1)) {
- ERRDRV("%s - bad local address (0x%-16.16Lx for %lu)",
+ pr_err("%s - bad local address (0x%-16.16Lx for %lu)",
__func__,
(unsigned long long) addr, (ulong) bytes);
rc = NULL;
@@ -112,14 +110,14 @@ parser_init_guts(u64 addr, u32 bytes, BOOL isLocal,
}
phdr = (struct spar_controlvm_parameters_header *)(ctx->data);
if (phdr->total_length != bytes) {
- ERRDRV("%s - bad total length %lu (should be %lu)",
+ pr_err("%s - bad total length %lu (should be %lu)",
__func__,
(ulong) (phdr->total_length), (ulong) (bytes));
rc = NULL;
goto Away;
}
if (phdr->total_length < phdr->header_length) {
- ERRDRV("%s - total length < header length (%lu < %lu)",
+ pr_err("%s - total length < header length (%lu < %lu)",
__func__,
(ulong) (phdr->total_length),
(ulong) (phdr->header_length));
@@ -128,7 +126,7 @@ parser_init_guts(u64 addr, u32 bytes, BOOL isLocal,
}
if (phdr->header_length <
sizeof(struct spar_controlvm_parameters_header)) {
- ERRDRV("%s - header is too small (%lu < %lu)",
+ pr_err("%s - header is too small (%lu < %lu)",
__func__,
(ulong) (phdr->header_length),
(ulong)(sizeof(
@@ -201,7 +199,7 @@ parser_id_get(PARSER_CONTEXT *ctx)
struct spar_controlvm_parameters_header *phdr = NULL;
if (ctx == NULL) {
- ERRDRV("%s (%s:%d) - no context",
+ pr_err("%s (%s:%d) - no context",
__func__, __FILE__, __LINE__);
return NULL_UUID_LE;
}
@@ -215,7 +213,7 @@ parser_param_start(PARSER_CONTEXT *ctx, PARSER_WHICH_STRING
which_string)
struct spar_controlvm_parameters_header *phdr = NULL;
if (ctx == NULL) {
- ERRDRV("%s (%s:%d) - no context",
+ pr_err("%s (%s:%d) - no context",
__func__, __FILE__, __LINE__);
goto Away;
}
@@ -238,7 +236,7 @@ parser_param_start(PARSER_CONTEXT *ctx, PARSER_WHICH_STRING
which_string)
ctx->bytes_remaining = phdr->name_length;
break;
default:
- ERRDRV("%s - bad which_string %d", __func__, which_string);
+ pr_err("%s - bad which_string %d", __func__, which_string);
break;
}
@@ -322,7 +320,7 @@ parser_param_get(PARSER_CONTEXT *ctx, char *nam, int
namesize)
while (*pscan != ':') {
if (namesize <= 0) {
- ERRDRV("%s - name too big", __func__);
+ pr_err("%s - name too big", __func__);
return NULL;
}
*pnam = toupper(*pscan);
@@ -331,13 +329,13 @@ parser_param_get(PARSER_CONTEXT *ctx, char *nam, int
namesize)
pscan++;
nscan--;
if (nscan == 0) {
- ERRDRV("%s - unexpected end of input parsing name",
+ pr_err("%s - unexpected end of input parsing name",
__func__);
return NULL;
}
}
if (namesize <= 0) {
- ERRDRV("%s - name too big", __func__);
+ pr_err("%s - name too big", __func__);
return NULL;
}
*pnam = '\0';
@@ -351,13 +349,13 @@ parser_param_get(PARSER_CONTEXT *ctx, char *nam, int
namesize)
pscan++;
nscan--;
if (nscan == 0) {
- ERRDRV("%s - unexpected end of input looking for value",
+ pr_err("%s - unexpected end of input looking for value",
__func__);
return NULL;
}
}
if (nscan == 0) {
- ERRDRV("%s - unexpected end of input looking for value",
+ pr_err("%s - unexpected end of input looking for value",
__func__);
return NULL;
}
@@ -366,7 +364,7 @@ parser_param_get(PARSER_CONTEXT *ctx, char *nam, int
namesize)
pscan++;
nscan--;
if (nscan == 0) {
- ERRDRV("%s - unexpected end of input after %c",
+ pr_err("%s - unexpected end of input after %c",
__func__, closing_quote);
return NULL;
}
@@ -378,7 +376,8 @@ parser_param_get(PARSER_CONTEXT *ctx, char *nam, int
namesize)
for (i = 0, value_length = -1; i < nscan; i++) {
if (closing_quote) {
if (pscan[i] == '\0') {
- ERRDRV("%s - unexpected end of input parsing
quoted value", __func__);
+ pr_err("%s - unexpected end of input parsing
quoted value",
+ __func__);
return NULL;
}
if (pscan[i] == closing_quote) {
@@ -394,7 +393,8 @@ parser_param_get(PARSER_CONTEXT *ctx, char *nam, int
namesize)
}
if (value_length < 0) {
if (closing_quote) {
- ERRDRV("%s - unexpected end of input parsing quoted
value", __func__);
+ pr_err("%s - unexpected end of input parsing quoted
value",
+ __func__);
return NULL;
}
value_length = nscan;
@@ -433,7 +433,8 @@ parser_param_get(PARSER_CONTEXT *ctx, char *nam, int
namesize)
pscan++;
nscan--;
} else if (*pscan != '\0') {
- ERRDRV("%s - missing separator after quoted
string", __func__);
+ pr_err("%s - missing separator after quoted
string",
+ __func__);
kfree(value);
value = NULL;
return NULL;
diff --git a/drivers/staging/unisys/visorchipset/visorchipset_main.c
b/drivers/staging/unisys/visorchipset/visorchipset_main.c
index 82e259d..b13eed7 100644
--- a/drivers/staging/unisys/visorchipset/visorchipset_main.c
+++ b/drivers/staging/unisys/visorchipset/visorchipset_main.c
@@ -664,7 +664,7 @@ chipset_init(struct controlvm_message *inmsg)
POSTCODE_LINUX_2(CHIPSET_INIT_ENTRY_PC, POSTCODE_SEVERITY_INFO);
if (chipset_inited) {
- LOGERR("CONTROLVM_CHIPSET_INIT Failed: Already Done.");
+ pr_err("CONTROLVM_CHIPSET_INIT Failed: Already Done.");
rc = -CONTROLVM_RESP_ERROR_ALREADY_DONE;
goto Away;
}
@@ -724,7 +724,7 @@ controlvm_respond(struct controlvm_message_header *msgHdr,
int response)
}
if (!visorchannel_signalinsert(ControlVm_channel,
CONTROLVM_QUEUE_REQUEST, &outmsg)) {
- LOGERR("signalinsert failed!");
+ pr_err("signalinsert failed!");
return;
}
}
@@ -740,7 +740,7 @@ controlvm_respond_chipset_init(struct
controlvm_message_header *msgHdr,
outmsg.cmd.init_chipset.features = features;
if (!visorchannel_signalinsert(ControlVm_channel,
CONTROLVM_QUEUE_REQUEST, &outmsg)) {
- LOGERR("signalinsert failed!");
+ pr_err("signalinsert failed!");
return;
}
}
@@ -756,7 +756,7 @@ static void controlvm_respond_physdev_changestate(
outmsg.cmd.device_change_state.flags.phys_device = 1;
if (!visorchannel_signalinsert(ControlVm_channel,
CONTROLVM_QUEUE_REQUEST, &outmsg)) {
- LOGERR("signalinsert failed!");
+ pr_err("signalinsert failed!");
return;
}
}
@@ -773,14 +773,14 @@ visorchipset_save_message(struct controlvm_message *msg,
offsetof(struct spar_controlvm_channel_protocol,
saved_crash_message_count),
&localSavedCrashMsgCount, sizeof(u16)) < 0) {
- LOGERR("failed to get Saved Message Count");
+ pr_err("failed to get Saved Message Count");
POSTCODE_LINUX_2(CRASH_DEV_CTRL_RD_FAILURE_PC,
POSTCODE_SEVERITY_ERR);
return;
}
if (localSavedCrashMsgCount != CONTROLVM_CRASHMSG_MAX) {
- LOGERR("Saved Message Count incorrect %d",
+ pr_err("Saved Message Count incorrect %d",
localSavedCrashMsgCount);
POSTCODE_LINUX_3(CRASH_DEV_COUNT_FAILURE_PC,
localSavedCrashMsgCount,
@@ -793,7 +793,7 @@ visorchipset_save_message(struct controlvm_message *msg,
offsetof(struct spar_controlvm_channel_protocol,
saved_crash_message_offset),
&localSavedCrashMsgOffset, sizeof(u32)) < 0) {
- LOGERR("failed to get Saved Message Offset");
+ pr_err("failed to get Saved Message Offset");
POSTCODE_LINUX_2(CRASH_DEV_CTRL_RD_FAILURE_PC,
POSTCODE_SEVERITY_ERR);
return;
@@ -804,7 +804,7 @@ visorchipset_save_message(struct controlvm_message *msg,
localSavedCrashMsgOffset,
msg,
sizeof(struct controlvm_message)) < 0) {
- LOGERR("SAVE_MSG_BUS_FAILURE: Failed to write
CrashCreateBusMsg!");
+ pr_err("SAVE_MSG_BUS_FAILURE: Failed to write
CrashCreateBusMsg!");
POSTCODE_LINUX_2(SAVE_MSG_BUS_FAILURE_PC,
POSTCODE_SEVERITY_ERR);
return;
@@ -814,7 +814,7 @@ visorchipset_save_message(struct controlvm_message *msg,
localSavedCrashMsgOffset +
sizeof(struct controlvm_message), msg,
sizeof(struct controlvm_message)) < 0) {
- LOGERR("SAVE_MSG_DEV_FAILURE: Failed to write
CrashCreateDevMsg!");
+ pr_err("SAVE_MSG_DEV_FAILURE: Failed to write
CrashCreateDevMsg!");
POSTCODE_LINUX_2(SAVE_MSG_DEV_FAILURE_PC,
POSTCODE_SEVERITY_ERR);
return;
@@ -831,7 +831,7 @@ bus_responder(enum controlvm_id cmdId, ulong busNo, int
response)
p = findbus(&BusInfoList, busNo);
if (!p) {
- LOGERR("internal error busNo=%lu", busNo);
+ pr_err("internal error busNo=%lu", busNo);
return;
}
if (response < 0) {
@@ -847,11 +847,11 @@ bus_responder(enum controlvm_id cmdId, ulong busNo, int
response)
}
if (p->pending_msg_hdr.id == CONTROLVM_INVALID) {
- LOGERR("bus_responder no pending msg");
+ pr_err("bus_responder no pending msg");
return; /* no controlvm response needed */
}
if (p->pending_msg_hdr.id != (u32) cmdId) {
- LOGERR("expected=%d, found=%d", cmdId, p->pending_msg_hdr.id);
+ pr_err("expected=%d, found=%d", cmdId, p->pending_msg_hdr.id);
return;
}
controlvm_respond(&p->pending_msg_hdr, response);
@@ -872,15 +872,15 @@ device_changestate_responder(enum controlvm_id cmdId,
p = finddevice(&DevInfoList, busNo, devNo);
if (!p) {
- LOGERR("internal error; busNo=%lu, devNo=%lu", busNo, devNo);
+ pr_err("internal error; busNo=%lu, devNo=%lu", busNo, devNo);
return;
}
if (p->pending_msg_hdr.id == CONTROLVM_INVALID) {
- LOGERR("device_responder no pending msg");
+ pr_err("device_responder no pending msg");
return; /* no controlvm response needed */
}
if (p->pending_msg_hdr.id != cmdId) {
- LOGERR("expected=%d, found=%d", cmdId, p->pending_msg_hdr.id);
+ pr_err("expected=%d, found=%d", cmdId, p->pending_msg_hdr.id);
return;
}
@@ -892,7 +892,7 @@ device_changestate_responder(enum controlvm_id cmdId,
if (!visorchannel_signalinsert(ControlVm_channel,
CONTROLVM_QUEUE_REQUEST, &outmsg)) {
- LOGERR("signalinsert failed!");
+ pr_err("signalinsert failed!");
return;
}
@@ -908,7 +908,7 @@ device_responder(enum controlvm_id cmdId, ulong busNo,
ulong devNo,
p = finddevice(&DevInfoList, busNo, devNo);
if (!p) {
- LOGERR("internal error; busNo=%lu, devNo=%lu", busNo, devNo);
+ pr_err("internal error; busNo=%lu, devNo=%lu", busNo, devNo);
return;
}
if (response >= 0) {
@@ -919,11 +919,11 @@ device_responder(enum controlvm_id cmdId, ulong busNo,
ulong devNo,
}
if (p->pending_msg_hdr.id == CONTROLVM_INVALID) {
- LOGERR("device_responder no pending msg");
+ pr_err("device_responder no pending msg");
return; /* no controlvm response needed */
}
if (p->pending_msg_hdr.id != (u32) cmdId) {
- LOGERR("expected=%d, found=%d", cmdId, p->pending_msg_hdr.id);
+ pr_err("expected=%d, found=%d", cmdId, p->pending_msg_hdr.id);
return;
}
controlvm_respond(&p->pending_msg_hdr, response);
@@ -942,7 +942,7 @@ bus_epilog(u32 busNo,
struct visorchipset_bus_info *pBusInfo = findbus(&BusInfoList, busNo);
if (!pBusInfo) {
- LOGERR("HUH? bad busNo=%d", busNo);
+ pr_err("HUH? bad busNo=%d", busNo);
return;
}
if (needResponse) {
@@ -1015,7 +1015,7 @@ device_epilog(u32 busNo, u32 devNo, struct
spar_segment_state state, u32 cmd,
};
if (!pDevInfo) {
- LOGERR("HUH? bad busNo=%d, devNo=%d", busNo, devNo);
+ pr_err("HUH? bad busNo=%d, devNo=%d", busNo, devNo);
return;
}
if (for_visorbus)
@@ -1109,7 +1109,7 @@ bus_create(struct controlvm_message *inmsg)
pBusInfo = findbus(&BusInfoList, busNo);
if (pBusInfo && (pBusInfo->state.created == 1)) {
- LOGERR("CONTROLVM_BUS_CREATE Failed: bus %lu already exists",
+ pr_err("CONTROLVM_BUS_CREATE Failed: bus %lu already exists",
busNo);
POSTCODE_LINUX_3(BUS_CREATE_FAILURE_PC, busNo,
POSTCODE_SEVERITY_ERR);
@@ -1118,8 +1118,6 @@ bus_create(struct controlvm_message *inmsg)
}
pBusInfo = kzalloc(sizeof(struct visorchipset_bus_info), GFP_KERNEL);
if (pBusInfo == NULL) {
- LOGERR("CONTROLVM_BUS_CREATE Failed: bus %lu kzalloc failed",
- busNo);
POSTCODE_LINUX_3(BUS_CREATE_FAILURE_PC, busNo,
POSTCODE_SEVERITY_ERR);
rc = -CONTROLVM_RESP_ERROR_KMALLOC_FAILED;
@@ -1163,12 +1161,12 @@ bus_destroy(struct controlvm_message *inmsg)
pBusInfo = findbus(&BusInfoList, busNo);
if (!pBusInfo) {
- LOGERR("CONTROLVM_BUS_DESTROY Failed: bus %lu invalid", busNo);
+ pr_err("CONTROLVM_BUS_DESTROY Failed: bus %lu invalid", busNo);
rc = -CONTROLVM_RESP_ERROR_BUS_INVALID;
goto Away;
}
if (pBusInfo->state.created == 0) {
- LOGERR("CONTROLVM_BUS_DESTROY Failed: bus %lu already
destroyed",
+ pr_err("CONTROLVM_BUS_DESTROY Failed: bus %lu already
destroyed",
busNo);
rc = -CONTROLVM_RESP_ERROR_ALREADY_DONE;
goto Away;
@@ -1193,7 +1191,7 @@ bus_configure(struct controlvm_message *inmsg,
PARSER_CONTEXT *parser_ctx)
pBusInfo = findbus(&BusInfoList, busNo);
if (!pBusInfo) {
- LOGERR("CONTROLVM_BUS_CONFIGURE Failed: bus %lu invalid",
+ pr_err("CONTROLVM_BUS_CONFIGURE Failed: bus %lu invalid",
busNo);
POSTCODE_LINUX_3(BUS_CONFIGURE_FAILURE_PC, busNo,
POSTCODE_SEVERITY_ERR);
@@ -1201,7 +1199,7 @@ bus_configure(struct controlvm_message *inmsg,
PARSER_CONTEXT *parser_ctx)
goto Away;
}
if (pBusInfo->state.created == 0) {
- LOGERR("CONTROLVM_BUS_CONFIGURE Failed: Invalid bus %lu - not
created yet",
+ pr_err("CONTROLVM_BUS_CONFIGURE Failed: Invalid bus %lu - not
created yet",
busNo);
POSTCODE_LINUX_3(BUS_CONFIGURE_FAILURE_PC, busNo,
POSTCODE_SEVERITY_ERR);
@@ -1210,7 +1208,7 @@ bus_configure(struct controlvm_message *inmsg,
PARSER_CONTEXT *parser_ctx)
}
/* TBD - add this check to other commands also... */
if (pBusInfo->pending_msg_hdr.id != CONTROLVM_INVALID) {
- LOGERR("CONTROLVM_BUS_CONFIGURE Failed: bus %lu MsgId=%u
outstanding",
+ pr_err("CONTROLVM_BUS_CONFIGURE Failed: bus %lu MsgId=%u
outstanding",
busNo, (uint) pBusInfo->pending_msg_hdr.id);
POSTCODE_LINUX_3(BUS_CONFIGURE_FAILURE_PC, busNo,
POSTCODE_SEVERITY_ERR);
@@ -1242,7 +1240,7 @@ my_device_create(struct controlvm_message *inmsg)
pDevInfo = finddevice(&DevInfoList, busNo, devNo);
if (pDevInfo && (pDevInfo->state.created == 1)) {
- LOGERR("CONTROLVM_DEVICE_CREATE Failed: busNo=%lu, devNo=%lu
already exists",
+ pr_err("CONTROLVM_DEVICE_CREATE Failed: busNo=%lu, devNo=%lu
already exists",
busNo, devNo);
POSTCODE_LINUX_4(DEVICE_CREATE_FAILURE_PC, devNo, busNo,
POSTCODE_SEVERITY_ERR);
@@ -1251,7 +1249,7 @@ my_device_create(struct controlvm_message *inmsg)
}
pBusInfo = findbus(&BusInfoList, busNo);
if (!pBusInfo) {
- LOGERR("CONTROLVM_DEVICE_CREATE Failed: Invalid bus %lu - out
of range",
+ pr_err("CONTROLVM_DEVICE_CREATE Failed: Invalid bus %lu - out
of range",
busNo);
POSTCODE_LINUX_4(DEVICE_CREATE_FAILURE_PC, devNo, busNo,
POSTCODE_SEVERITY_ERR);
@@ -1259,7 +1257,7 @@ my_device_create(struct controlvm_message *inmsg)
goto Away;
}
if (pBusInfo->state.created == 0) {
- LOGERR("CONTROLVM_DEVICE_CREATE Failed: Invalid bus %lu - not
created yet",
+ pr_err("CONTROLVM_DEVICE_CREATE Failed: Invalid bus %lu - not
created yet",
busNo);
POSTCODE_LINUX_4(DEVICE_CREATE_FAILURE_PC, devNo, busNo,
POSTCODE_SEVERITY_ERR);
@@ -1268,8 +1266,6 @@ my_device_create(struct controlvm_message *inmsg)
}
pDevInfo = kzalloc(sizeof(struct visorchipset_device_info), GFP_KERNEL);
if (pDevInfo == NULL) {
- LOGERR("CONTROLVM_DEVICE_CREATE Failed: busNo=%lu, devNo=%lu
kmaloc failed",
- busNo, devNo);
POSTCODE_LINUX_4(DEVICE_CREATE_FAILURE_PC, devNo, busNo,
POSTCODE_SEVERITY_ERR);
rc = -CONTROLVM_RESP_ERROR_KMALLOC_FAILED;
@@ -1322,7 +1318,7 @@ my_device_changestate(struct controlvm_message *inmsg)
pDevInfo = finddevice(&DevInfoList, busNo, devNo);
if (!pDevInfo) {
- LOGERR("CONTROLVM_DEVICE_CHANGESTATE Failed: busNo=%lu,
devNo=%lu invalid (doesn't exist)",
+ pr_err("CONTROLVM_DEVICE_CHANGESTATE Failed: busNo=%lu,
devNo=%lu invalid (doesn't exist)",
busNo, devNo);
POSTCODE_LINUX_4(DEVICE_CHANGESTATE_FAILURE_PC, devNo, busNo,
POSTCODE_SEVERITY_ERR);
@@ -1330,7 +1326,7 @@ my_device_changestate(struct controlvm_message *inmsg)
goto Away;
}
if (pDevInfo->state.created == 0) {
- LOGERR("CONTROLVM_DEVICE_CHANGESTATE Failed: busNo=%lu,
devNo=%lu invalid (not created)",
+ pr_err("CONTROLVM_DEVICE_CHANGESTATE Failed: busNo=%lu,
devNo=%lu invalid (not created)",
busNo, devNo);
POSTCODE_LINUX_4(DEVICE_CHANGESTATE_FAILURE_PC, devNo, busNo,
POSTCODE_SEVERITY_ERR);
@@ -1356,13 +1352,13 @@ my_device_destroy(struct controlvm_message *inmsg)
pDevInfo = finddevice(&DevInfoList, busNo, devNo);
if (!pDevInfo) {
- LOGERR("CONTROLVM_DEVICE_DESTROY Failed: busNo=%lu, devNo=%lu
invalid",
+ pr_err("CONTROLVM_DEVICE_DESTROY Failed: busNo=%lu, devNo=%lu
invalid",
busNo, devNo);
rc = -CONTROLVM_RESP_ERROR_DEVICE_INVALID;
goto Away;
}
if (pDevInfo->state.created == 0) {
- LOGERR("CONTROLVM_DEVICE_DESTROY Failed: busNo=%lu, devNo=%lu
already destroyed",
+ pr_err("CONTROLVM_DEVICE_DESTROY Failed: busNo=%lu, devNo=%lu
already destroyed",
busNo, devNo);
rc = -CONTROLVM_RESP_ERROR_ALREADY_DONE;
}
@@ -1390,21 +1386,21 @@ initialize_controlvm_payload_info(HOSTADDRESS
phys_addr, u64 offset, u32 bytes,
int rc = CONTROLVM_RESP_SUCCESS;
if (info == NULL) {
- LOGERR("HUH ? CONTROLVM_PAYLOAD_INIT Failed : Programmer check
at %s:%d",
+ pr_err("HUH ? CONTROLVM_PAYLOAD_INIT Failed : Programmer check
at %s:%d",
__FILE__, __LINE__);
rc = -CONTROLVM_RESP_ERROR_PAYLOAD_INVALID;
goto Away;
}
memset(info, 0, sizeof(CONTROLVM_PAYLOAD_INFO));
if ((offset == 0) || (bytes == 0)) {
- LOGERR("CONTROLVM_PAYLOAD_INIT Failed:
request_payload_offset=%llu request_payload_bytes=%llu!",
+ pr_err("CONTROLVM_PAYLOAD_INIT Failed:
request_payload_offset=%llu request_payload_bytes=%llu!",
(u64) offset, (u64) bytes);
rc = -CONTROLVM_RESP_ERROR_PAYLOAD_INVALID;
goto Away;
}
payload = ioremap_cache(phys_addr + offset, bytes);
if (payload == NULL) {
- LOGERR("CONTROLVM_PAYLOAD_INIT Failed: ioremap_cache %llu for
%llu bytes failed",
+ pr_err("CONTROLVM_PAYLOAD_INIT Failed: ioremap_cache %llu for
%llu bytes failed",
(u64) offset, (u64) bytes);
rc = -CONTROLVM_RESP_ERROR_IOREMAP_FAILED;
goto Away;
@@ -1447,7 +1443,7 @@ initialize_controlvm_payload(void)
offsetof(struct spar_controlvm_channel_protocol,
request_payload_offset),
&payloadOffset, sizeof(payloadOffset)) < 0) {
- LOGERR("CONTROLVM_PAYLOAD_INIT Failed to read controlvm
channel!");
+ pr_err("CONTROLVM_PAYLOAD_INIT Failed to read controlvm
channel!");
POSTCODE_LINUX_2(CONTROLVM_INIT_FAILURE_PC,
POSTCODE_SEVERITY_ERR);
return;
@@ -1456,7 +1452,7 @@ initialize_controlvm_payload(void)
offsetof(struct spar_controlvm_channel_protocol,
request_payload_bytes),
&payloadBytes, sizeof(payloadBytes)) < 0) {
- LOGERR("CONTROLVM_PAYLOAD_INIT Failed to read controlvm
channel!");
+ pr_err("CONTROLVM_PAYLOAD_INIT Failed to read controlvm
channel!");
POSTCODE_LINUX_2(CONTROLVM_INIT_FAILURE_PC,
POSTCODE_SEVERITY_ERR);
return;
@@ -1551,7 +1547,7 @@ read_controlvm_event(struct controlvm_message *msg)
CONTROLVM_QUEUE_EVENT, msg)) {
/* got a message */
if (msg->hdr.flags.test_message == 1) {
- LOGERR("ignoring bad CONTROLVM_QUEUE_EVENT msg with
controlvm_msg_id=0x%x because Flags.testMessage is nonsensical (=1)",
+ pr_err("ignoring bad CONTROLVM_QUEUE_EVENT msg with
controlvm_msg_id=0x%x because Flags.testMessage is nonsensical (=1)",
msg->hdr.id);
return FALSE;
}
@@ -1739,7 +1735,7 @@ parahotplug_process_message(struct controlvm_message
*inmsg)
req = parahotplug_request_create(inmsg);
if (req == NULL) {
- LOGERR("parahotplug_process_message: couldn't allocate
request");
+ pr_err("parahotplug_process_message: couldn't allocate
request");
return;
}
@@ -1796,7 +1792,7 @@ handle_command(struct controlvm_message inmsg,
HOSTADDRESS channel_addr)
/* create parsing context if necessary */
isLocalAddr = (inmsg.hdr.flags.test_message == 1);
if (channel_addr == 0) {
- LOGERR("HUH? channel_addr is 0!");
+ pr_err("HUH? channel_addr is 0!");
return TRUE;
}
parametersAddr = channel_addr + inmsg.hdr.payload_vm_offset;
@@ -1908,7 +1904,7 @@ handle_command(struct controlvm_message inmsg,
HOSTADDRESS channel_addr)
chipset_notready(&inmsg.hdr);
break;
default:
- LOGERR("unrecognized controlvm cmd=%d", (int) inmsg.hdr.id);
+ pr_err("unrecognized controlvm cmd=%d", (int) inmsg.hdr.id);
if (inmsg.hdr.flags.response_expected)
controlvm_respond(&inmsg.hdr,
-CONTROLVM_RESP_ERROR_MESSAGE_ID_UNKNOWN);
@@ -1928,7 +1924,7 @@ static HOSTADDRESS controlvm_get_channel_address(void)
u32 size = 0;
if (!VMCALL_SUCCESSFUL(issue_vmcall_io_controlvm_addr(&addr, &size))) {
- ERRDRV("%s - vmcall to determine controlvm channel addr failed",
+ pr_err("%s - vmcall to determine controlvm channel addr failed",
__func__);
return 0;
}
@@ -1977,7 +1973,7 @@ controlvm_periodic_work(struct work_struct *work)
CONTROLVM_QUEUE_RESPONSE,
&inmsg)) {
if (inmsg.hdr.payload_max_bytes != 0) {
- LOGERR("Payload of size %lu returned @%lu with
unexpected message id %d.",
+ pr_err("Payload of size %lu returned @%lu with
unexpected message id %d.",
(ulong) inmsg.hdr.payload_max_bytes,
(ulong) inmsg.hdr.payload_vm_offset,
inmsg.hdr.id);
@@ -2076,14 +2072,14 @@ setup_crash_devices_work_queue(struct work_struct *work)
offsetof(struct spar_controlvm_channel_protocol,
saved_crash_message_count),
&localSavedCrashMsgCount, sizeof(u16)) < 0) {
- LOGERR("failed to get Saved Message Count");
+ pr_err("failed to get Saved Message Count");
POSTCODE_LINUX_2(CRASH_DEV_CTRL_RD_FAILURE_PC,
POSTCODE_SEVERITY_ERR);
return;
}
if (localSavedCrashMsgCount != CONTROLVM_CRASHMSG_MAX) {
- LOGERR("Saved Message Count incorrect %d",
+ pr_err("Saved Message Count incorrect %d",
localSavedCrashMsgCount);
POSTCODE_LINUX_3(CRASH_DEV_COUNT_FAILURE_PC,
localSavedCrashMsgCount,
@@ -2096,7 +2092,7 @@ setup_crash_devices_work_queue(struct work_struct *work)
offsetof(struct spar_controlvm_channel_protocol,
saved_crash_message_offset),
&localSavedCrashMsgOffset, sizeof(u32)) < 0) {
- LOGERR("failed to get Saved Message Offset");
+ pr_err("failed to get Saved Message Offset");
POSTCODE_LINUX_2(CRASH_DEV_CTRL_RD_FAILURE_PC,
POSTCODE_SEVERITY_ERR);
return;
@@ -2107,7 +2103,7 @@ setup_crash_devices_work_queue(struct work_struct *work)
localSavedCrashMsgOffset,
&localCrashCreateBusMsg,
sizeof(struct controlvm_message)) < 0) {
- LOGERR("CRASH_DEV_RD_BUS_FAIULRE: Failed to read
CrashCreateBusMsg!");
+ pr_err("CRASH_DEV_RD_BUS_FAIULRE: Failed to read
CrashCreateBusMsg!");
POSTCODE_LINUX_2(CRASH_DEV_RD_BUS_FAIULRE_PC,
POSTCODE_SEVERITY_ERR);
return;
@@ -2119,7 +2115,7 @@ setup_crash_devices_work_queue(struct work_struct *work)
sizeof(struct controlvm_message),
&localCrashCreateDevMsg,
sizeof(struct controlvm_message)) < 0) {
- LOGERR("CRASH_DEV_RD_DEV_FAIULRE: Failed to read
CrashCreateDevMsg!");
+ pr_err("CRASH_DEV_RD_DEV_FAIULRE: Failed to read
CrashCreateDevMsg!");
POSTCODE_LINUX_2(CRASH_DEV_RD_DEV_FAIULRE_PC,
POSTCODE_SEVERITY_ERR);
return;
@@ -2129,7 +2125,7 @@ setup_crash_devices_work_queue(struct work_struct *work)
if (localCrashCreateBusMsg.cmd.create_bus.channel_addr != 0)
bus_create(&localCrashCreateBusMsg);
else {
- LOGERR("CrashCreateBusMsg is null, no dump will be taken");
+ pr_err("CrashCreateBusMsg is null, no dump will be taken");
POSTCODE_LINUX_2(CRASH_DEV_BUS_NULL_FAILURE_PC,
POSTCODE_SEVERITY_ERR);
return;
@@ -2139,7 +2135,7 @@ setup_crash_devices_work_queue(struct work_struct *work)
if (localCrashCreateDevMsg.cmd.create_device.channel_addr != 0)
my_device_create(&localCrashCreateDevMsg);
else {
- LOGERR("CrashCreateDevMsg is null, no dump will be taken");
+ pr_err("CrashCreateDevMsg is null, no dump will be taken");
POSTCODE_LINUX_2(CRASH_DEV_DEV_NULL_FAILURE_PC,
POSTCODE_SEVERITY_ERR);
return;
@@ -2204,7 +2200,7 @@ visorchipset_get_bus_info(ulong bus_no, struct
visorchipset_bus_info *bus_info)
void *p = findbus(&BusInfoList, bus_no);
if (!p) {
- LOGERR("(%lu) failed", bus_no);
+ pr_err("(%lu) failed", bus_no);
return FALSE;
}
memcpy(bus_info, p, sizeof(struct visorchipset_bus_info));
@@ -2218,7 +2214,7 @@ visorchipset_set_bus_context(ulong bus_no, void *context)
struct visorchipset_bus_info *p = findbus(&BusInfoList, bus_no);
if (!p) {
- LOGERR("(%lu) failed", bus_no);
+ pr_err("(%lu) failed", bus_no);
return FALSE;
}
p->bus_driver_context = context;
@@ -2233,7 +2229,7 @@ visorchipset_get_device_info(ulong bus_no, ulong dev_no,
void *p = finddevice(&DevInfoList, bus_no, dev_no);
if (!p) {
- LOGERR("(%lu,%lu) failed", bus_no, dev_no);
+ pr_err("(%lu,%lu) failed", bus_no, dev_no);
return FALSE;
}
memcpy(dev_info, p, sizeof(struct visorchipset_device_info));
@@ -2248,7 +2244,7 @@ visorchipset_set_device_context(ulong bus_no, ulong
dev_no, void *context)
finddevice(&DevInfoList, bus_no, dev_no);
if (!p) {
- LOGERR("(%lu,%lu) failed", bus_no, dev_no);
+ pr_err("(%lu,%lu) failed", bus_no, dev_no);
return FALSE;
}
p->bus_driver_context = context;
@@ -2279,7 +2275,7 @@ visorchipset_cache_alloc(struct kmem_cache *pool, BOOL
ok_to_block,
gfp |= __GFP_NORETRY;
p = kmem_cache_alloc(pool, gfp);
if (!p) {
- LOGERR("kmem_cache_alloc failed early @%s:%d\n", fn, ln);
+ pr_err("kmem_cache_alloc failed early @%s:%d\n", fn, ln);
return NULL;
}
atomic_inc(&Visorchipset_cache_buffers_in_use);
@@ -2292,7 +2288,7 @@ void
visorchipset_cache_free(struct kmem_cache *pool, void *p, char *fn, int ln)
{
if (!p) {
- LOGERR("NULL pointer @%s:%d\n", fn, ln);
+ pr_err("NULL pointer @%s:%d\n", fn, ln);
return;
}
atomic_dec(&Visorchipset_cache_buffers_in_use);
@@ -2379,7 +2375,7 @@ visorchipset_init(void)
atomic_set(&LiveDump_info.buffers_in_use, 0);
if (visorchipset_testvnic) {
- ERRDRV("testvnic option no longer supported: (status = %d)\n",
+ pr_err("testvnic option no longer supported: (status = %d)\n",
x);
POSTCODE_LINUX_3(CHIPSET_INIT_FAILURE_PC, x, DIAG_SEVERITY_ERR);
rc = x;
@@ -2399,20 +2395,21 @@ visorchipset_init(void)
visorchannel_id(ControlVm_channel, s));
initialize_controlvm_payload();
} else {
- LOGERR("controlvm channel is invalid");
+ pr_err("controlvm channel is invalid");
visorchannel_destroy(ControlVm_channel);
ControlVm_channel = NULL;
return -ENODEV;
}
} else {
- LOGERR("no controlvm channel discovered");
+ pr_err("no controlvm channel discovered");
return -ENODEV;
}
MajorDev = MKDEV(visorchipset_major, 0);
rc = visorchipset_file_init(MajorDev, &ControlVm_channel);
if (rc < 0) {
- ERRDRV("visorchipset_file_init(MajorDev, &ControlVm_channel):
error (status=%d)\n", rc);
+ pr_err("visorchipset_file_init(MajorDev, &ControlVm_channel):
error (status=%d)\n",
+ rc);
POSTCODE_LINUX_2(CHIPSET_INIT_FAILURE_PC, DIAG_SEVERITY_ERR);
goto Away;
}
@@ -2428,7 +2425,7 @@ visorchipset_init(void)
sizeof(struct putfile_buffer_entry),
0, SLAB_HWCACHE_ALIGN, NULL);
if (!Putfile_buffer_list_pool) {
- ERRDRV("failed to alloc Putfile_buffer_list_pool:
(status=-1)\n");
+ pr_err("failed to alloc Putfile_buffer_list_pool:
(status=-1)\n");
POSTCODE_LINUX_2(CHIPSET_INIT_FAILURE_PC, DIAG_SEVERITY_ERR);
rc = -1;
goto Away;
@@ -2447,7 +2444,7 @@ visorchipset_init(void)
create_singlethread_workqueue("visorchipset_controlvm");
if (Periodic_controlvm_workqueue == NULL) {
- ERRDRV("cannot create controlvm workqueue:
(status=%d)\n",
+ pr_err("cannot create controlvm workqueue:
(status=%d)\n",
-ENOMEM);
POSTCODE_LINUX_2(CREATE_WORKQUEUE_FAILED_PC,
DIAG_SEVERITY_ERR);
@@ -2459,7 +2456,8 @@ visorchipset_init(void)
rc = queue_delayed_work(Periodic_controlvm_workqueue,
&Periodic_controlvm_work, Poll_jiffies);
if (rc < 0) {
-
ERRDRV("queue_delayed_work(Periodic_controlvm_workqueue,
&Periodic_controlvm_work, Poll_jiffies): error (status=%d)\n", rc);
+
pr_err("queue_delayed_work(Periodic_controlvm_workqueue,
&Periodic_controlvm_work, Poll_jiffies): error (status=%d)\n",
+ rc);
POSTCODE_LINUX_2(QUEUE_DELAYED_WORK_PC,
DIAG_SEVERITY_ERR);
goto Away;
@@ -2469,7 +2467,7 @@ visorchipset_init(void)
Visorchipset_platform_device.dev.devt = MajorDev;
if (platform_device_register(&Visorchipset_platform_device) < 0) {
- ERRDRV("platform_device_register(visorchipset) failed:
(status=-1)\n");
+ pr_err("platform_device_register(visorchipset) failed:
(status=-1)\n");
POSTCODE_LINUX_2(DEVICE_REGISTER_FAILURE_PC, DIAG_SEVERITY_ERR);
rc = -1;
goto Away;
@@ -2479,7 +2477,7 @@ visorchipset_init(void)
rc = 0;
Away:
if (rc) {
- LOGERR("visorchipset_init failed");
+ pr_err("visorchipset_init failed");
POSTCODE_LINUX_3(CHIPSET_INIT_FAILURE_PC, rc,
POSTCODE_SEVERITY_ERR);
}
diff --git a/drivers/staging/unisys/visorutil/charqueue.c
b/drivers/staging/unisys/visorutil/charqueue.c
index ac7acb7..468e411 100644
--- a/drivers/staging/unisys/visorutil/charqueue.c
+++ b/drivers/staging/unisys/visorutil/charqueue.c
@@ -39,7 +39,7 @@ struct charqueue *visor_charqueue_create(ulong nslots)
struct charqueue *cq = kmalloc(alloc_size, GFP_KERNEL|__GFP_NORETRY);
if (cq == NULL) {
- ERRDRV("visor_charqueue_create allocation failed
(alloc_size=%d)",
+ pr_err("visor_charqueue_create allocation failed
(alloc_size=%d)",
alloc_size);
return NULL;
}
diff --git a/drivers/staging/unisys/visorutil/easyproc.c
b/drivers/staging/unisys/visorutil/easyproc.c
index 40f1ae9..abda3a8 100644
--- a/drivers/staging/unisys/visorutil/easyproc.c
+++ b/drivers/staging/unisys/visorutil/easyproc.c
@@ -63,7 +63,7 @@ static struct proc_dir_entry *
struct proc_dir_entry *p = proc_mkdir_mode(name, S_IFDIR, parent);
if (p == NULL)
- ERRDRV("failed to create /proc directory %s", name);
+ pr_err("failed to create /proc directory %s", name);
return p;
}
@@ -115,7 +115,7 @@ void visor_easyproc_InitDriver(struct easyproc_driver_info
*pdriver,
memset(pdriver, 0, sizeof(struct easyproc_driver_info));
pdriver->ProcId = procId;
if (pdriver->ProcId == NULL)
- ERRDRV("ProcId cannot be NULL (trouble ahead)!");
+ pr_err("ProcId cannot be NULL (trouble ahead)!");
pdriver->Show_driver_info = show_driver_info;
pdriver->Show_device_info = show_device_info;
if (pdriver->ProcDir == NULL)
@@ -133,7 +133,7 @@ void visor_easyproc_InitDriver(struct easyproc_driver_info
*pdriver,
pdriver->ProcDriverDir,
&proc_fops_driver, pdriver);
if (pdriver->ProcDriverDiagFile == NULL)
- ERRDRV("failed to register /proc/%s/driver/diag entry",
+ pr_err("failed to register /proc/%s/driver/diag entry",
pdriver->ProcId);
}
}
@@ -210,9 +210,9 @@ void visor_easyproc_InitDevice(struct easyproc_driver_info
*pdriver,
proc_create_data("diag", 0, p->procDevicexDir,
&proc_fops_device, p);
if (p->procDevicexDiagFile == NULL)
- ERRDEVX(devno, "failed to register
/proc/%s/device/%d/diag entry",
- pdriver->ProcId, devno
- );
+ pr_err("dev%d: failed to register
/proc/%s/device/%d/diag entry",
+ devno, pdriver->ProcId, devno
+ );
}
memset(&(p->device_property_info[0]), 0,
sizeof(p->device_property_info));
@@ -230,7 +230,7 @@ void visor_easyproc_CreateDeviceProperty(struct
easyproc_device_info *p,
struct easyproc_device_property_info *px = NULL;
if (p->procDevicexDir == NULL) {
- ERRDRV("state error");
+ pr_err("state error");
return;
}
for (i = 0; i < ARRAY_SIZE(p->device_property_info); i++) {
@@ -240,7 +240,7 @@ void visor_easyproc_CreateDeviceProperty(struct
easyproc_device_info *p,
}
}
if (!px) {
- ERRDEVX(p->devno, "too many device properties");
+ pr_err("dev%d: too many device properties", p->devno);
return;
}
px->devdata = p->devdata;
@@ -248,15 +248,14 @@ void visor_easyproc_CreateDeviceProperty(struct
easyproc_device_info *p,
px->procEntry = proc_create_data(property_name, 0, p->procDevicexDir,
&proc_fops_device_property, px);
if (strlen(property_name)+1 > sizeof(px->property_name)) {
- ERRDEVX(p->devno, "device property name %s too long",
- property_name);
+ pr_err("dev%d: device property name %s too long", p->devno,
+ property_name);
return;
}
strcpy(px->property_name, property_name);
if (px->procEntry == NULL) {
- ERRDEVX(p->devno,
- "failed to register /proc/%s/device/%d/%s entry",
- p->pdriver->ProcId, p->devno, property_name);
+ pr_err("dev%d: failed to register /proc/%s/device/%d/%s entry",
+ p->devno, p->pdriver->ProcId, p->devno, property_name);
return;
}
px->show_device_property_info = show_property_info;
diff --git a/drivers/staging/unisys/visorutil/memregion_direct.c
b/drivers/staging/unisys/visorutil/memregion_direct.c
index 33522cc..a72dcb4 100644
--- a/drivers/staging/unisys/visorutil/memregion_direct.c
+++ b/drivers/staging/unisys/visorutil/memregion_direct.c
@@ -44,7 +44,7 @@ visor_memregion_create(HOSTADDRESS physaddr, ulong nbytes)
struct memregion *memregion = kzalloc(sizeof(*memregion),
GFP_KERNEL | __GFP_NORETRY);
if (memregion == NULL) {
- ERRDRV("visor_memregion_create allocation failed");
+ pr_err("visor_memregion_create allocation failed");
return NULL;
}
memregion->physaddr = physaddr;
@@ -71,24 +71,22 @@ visor_memregion_create_overlapped(struct memregion *parent,
ulong offset,
struct memregion *memregion = NULL;
if (parent == NULL) {
- ERRDRV("%s parent is NULL", __func__);
+ pr_err("%s parent is NULL", __func__);
return NULL;
}
if (parent->mapped == NULL) {
- ERRDRV("%s parent is not mapped!", __func__);
+ pr_err("%s parent is not mapped!", __func__);
return NULL;
}
if ((offset >= parent->nbytes) ||
((offset + nbytes) >= parent->nbytes)) {
- ERRDRV("%s range (%lu,%lu) out of parent range",
+ pr_err("%s range (%lu,%lu) out of parent range",
__func__, offset, nbytes);
return NULL;
}
memregion = kzalloc(sizeof(*memregion), GFP_KERNEL|__GFP_NORETRY);
- if (memregion == NULL) {
- ERRDRV("%s allocation failed", __func__);
+ if (memregion == NULL)
return NULL;
- }
memregion->physaddr = parent->physaddr + offset;
memregion->nbytes = nbytes;
@@ -107,13 +105,13 @@ mapit(struct memregion *memregion)
memregion->requested = FALSE;
if (!request_mem_region(physaddr, nbytes, MYDRVNAME))
- ERRDRV("cannot reserve channel memory @0x%lx for 0x%lx-- no big
deal",
+ pr_err("cannot reserve channel memory @0x%lx for 0x%lx-- no big
deal",
physaddr, nbytes);
else
memregion->requested = TRUE;
memregion->mapped = ioremap_cache(physaddr, nbytes);
if (memregion->mapped == NULL) {
- ERRDRV("cannot ioremap_cache channel memory @0x%lx for 0x%lx",
+ pr_err("cannot ioremap_cache channel memory @0x%lx for 0x%lx",
physaddr, nbytes);
return FALSE;
}
@@ -181,7 +179,7 @@ memregion_readwrite(BOOL is_write,
void *local, ulong nbytes)
{
if (offset + nbytes > memregion->nbytes) {
- ERRDRV("memregion_readwrite offset out of range!!");
+ pr_err("memregion_readwrite offset out of range!!");
return -EIO;
}
if (is_write)
diff --git a/drivers/staging/unisys/visorutil/periodic_work.c
b/drivers/staging/unisys/visorutil/periodic_work.c
index 0908bf9..0d86fbb 100644
--- a/drivers/staging/unisys/visorutil/periodic_work.c
+++ b/drivers/staging/unisys/visorutil/periodic_work.c
@@ -90,7 +90,7 @@ BOOL visor_periodic_work_nextperiod(struct periodic_work *pw)
goto unlock;
} else if (queue_delayed_work(pw->workqueue, &pw->work,
pw->jiffy_interval) < 0) {
- ERRDEV(pw->devnam, "queue_delayed_work failed!");
+ pr_err("%s: queue_delayed_work failed!", pw->devnam);
pw->is_scheduled = FALSE;
rc = FALSE;
goto unlock;
@@ -116,15 +116,15 @@ BOOL visor_periodic_work_start(struct periodic_work *pw)
goto unlock;
}
if (pw->want_to_stop) {
- ERRDEV(pw->devnam,
- "dev_start_periodic_work failed!");
+ pr_err("%s: dev_start_periodic_work failed!", pw->devnam);
rc = FALSE;
goto unlock;
}
INIT_DELAYED_WORK(&pw->work, &periodic_work_func);
if (queue_delayed_work(pw->workqueue, &pw->work,
pw->jiffy_interval) < 0) {
- ERRDEV(pw->devnam, "%s queue_delayed_work failed!", __func__);
+ pr_err("%s: %s queue_delayed_work failed!", pw->devnam,
+ __func__);
rc = FALSE;
goto unlock;
}
diff --git a/drivers/staging/unisys/visorutil/procobjecttree.c
b/drivers/staging/unisys/visorutil/procobjecttree.c
index 195772d..c2793f6 100644
--- a/drivers/staging/unisys/visorutil/procobjecttree.c
+++ b/drivers/staging/unisys/visorutil/procobjecttree.c
@@ -97,7 +97,7 @@ createProcDir(const char *name, struct proc_dir_entry *parent)
struct proc_dir_entry *p = proc_mkdir_mode(name, S_IFDIR, parent);
if (p == NULL)
- ERRDRV("failed to create /proc directory %s", name);
+ pr_err("failed to create /proc directory %s", name);
return p;
}
@@ -108,7 +108,7 @@ createProcFile(const char *name, struct proc_dir_entry
*parent,
struct proc_dir_entry *p = proc_create_data(name, 0, parent,
fops, data);
if (p == NULL)
- ERRDRV("failed to create /proc file %s", name);
+ pr_err("failed to create /proc file %s", name);
return p;
}
@@ -138,18 +138,17 @@ MYPROCTYPE *visor_proc_CreateType(struct proc_dir_entry
*procDirRoot,
struct proc_dir_entry *parent = NULL;
if (procDirRoot == NULL) {
- ERRDRV("procDirRoot cannot be NULL!\n");
+ pr_err("procDirRoot cannot be NULL!\n");
goto Away;
}
if (name == NULL || name[0] == NULL) {
- ERRDRV("name must contain at least 1 node name!\n");
+ pr_err("name must contain at least 1 node name!\n");
goto Away;
}
type = kzalloc(sizeof(MYPROCTYPE), GFP_KERNEL | __GFP_NORETRY);
- if (type == NULL) {
- ERRDRV("out of memory\n");
+ if (type == NULL)
goto Away;
- }
+
type->name = name;
type->propertyNames = propertyNames;
type->nProperties = 0;
@@ -165,7 +164,7 @@ MYPROCTYPE *visor_proc_CreateType(struct proc_dir_entry
*procDirRoot,
sizeof(struct proc_dir_entry *),
GFP_KERNEL | __GFP_NORETRY);
if (type->procDirs == NULL) {
- ERRDRV("out of memory\n");
+ pr_err("out of memory\n");
goto Away;
}
parent = procDirRoot;
@@ -227,14 +226,13 @@ MYPROCOBJECT *visor_proc_CreateObject(MYPROCTYPE *type,
int i = 0;
if (type == NULL) {
- ERRDRV("type cannot be NULL\n");
+ pr_err("type cannot be NULL\n");
goto Away;
}
obj = kzalloc(sizeof(MYPROCOBJECT), GFP_KERNEL | __GFP_NORETRY);
- if (obj == NULL) {
- ERRDRV("out of memory\n");
+ if (obj == NULL)
goto Away;
- }
+
obj->type = type;
obj->context = context;
if (name == NULL) {
@@ -245,7 +243,7 @@ MYPROCOBJECT *visor_proc_CreateObject(MYPROCTYPE *type,
obj->name = kmalloc(obj->namesize, GFP_KERNEL | __GFP_NORETRY);
if (obj->name == NULL) {
obj->namesize = 0;
- ERRDRV("out of memory\n");
+ pr_err("out of memory\n");
goto Away;
}
strcpy(obj->name, name);
@@ -257,14 +255,14 @@ MYPROCOBJECT *visor_proc_CreateObject(MYPROCTYPE *type,
kzalloc((type->nProperties + 1) * sizeof(PROCDIRENTRYCONTEXT),
GFP_KERNEL | __GFP_NORETRY);
if (obj->procDirPropertyContexts == NULL) {
- ERRDRV("out of memory\n");
+ pr_err("out of memory\n");
goto Away;
}
obj->procDirProperties =
kzalloc((type->nProperties + 1) * sizeof(struct proc_dir_entry
*),
GFP_KERNEL | __GFP_NORETRY);
if (obj->procDirProperties == NULL) {
- ERRDRV("out of memory\n");
+ pr_err("out of memory\n");
goto Away;
}
for (i = 0; i < type->nProperties; i++) {
@@ -343,7 +341,7 @@ static int seq_show(struct seq_file *seq, void *offset)
PROCDIRENTRYCONTEXT *ctx = (PROCDIRENTRYCONTEXT *)(seq->private);
if (ctx == NULL) {
- ERRDRV("I don't have a freakin' clue...");
+ pr_err("I don't have a freakin' clue...");
return 0;
}
(*ctx->show_property)(seq, ctx->procObject->context,
--
2.1.0
_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
