Remove the entire set of LOGINFO() macros and replace them with calls to
pr_info() instead.
Signed-off-by: Ken Depro <kenneth.de...@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.ro...@unisys.com>
---
drivers/staging/unisys/include/timskmod.h | 5 --
drivers/staging/unisys/include/uniklog.h | 29 --------
drivers/staging/unisys/uislib/uislib.c | 40 +++++-----
drivers/staging/unisys/uislib/uisthread.c | 6 +-
drivers/staging/unisys/uislib/uisutils.c | 6 +-
drivers/staging/unisys/virthba/virthba.c | 54 +++++++-------
drivers/staging/unisys/virtpci/virtpci.c | 72 +++++++++---------
.../unisys/visorchannel/visorchannel_main.c | 4 +-
drivers/staging/unisys/visorchipset/file.c | 6 +-
.../unisys/visorchipset/visorchipset_main.c | 86 +++++++++++-----------
10 files changed, 137 insertions(+), 171 deletions(-)
diff --git a/drivers/staging/unisys/include/timskmod.h
b/drivers/staging/unisys/include/timskmod.h
index 3d563c4..5f33d5c 100644
--- a/drivers/staging/unisys/include/timskmod.h
+++ b/drivers/staging/unisys/include/timskmod.h
@@ -87,16 +87,11 @@
(void *)(p2) = SWAPPOINTERS_TEMP; \
} while (0)
-#define PRINTKDRV(fmt, args...) LOGINF(fmt, ## args)
#define WARNDRV(fmt, args...) LOGWRN(fmt, ## args)
#define SECUREDRV(fmt, args...) LOGWRN(fmt, ## args)
-#define INFODRV(fmt, args...) LOGINF(fmt, ## args)
-#define PRINTKDEV(devname, fmt, args...) LOGINFDEV(devname, 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)
-#define INFODEVX(devno, fmt, args...) LOGINFDEVX(devno, fmt, ## args)
/** Verifies the consistency of your PRIVATEDEVICEDATA structure using
* conventional "signature" fields:
diff --git a/drivers/staging/unisys/include/uniklog.h
b/drivers/staging/unisys/include/uniklog.h
index edc12f0..74a723e 100644
--- a/drivers/staging/unisys/include/uniklog.h
+++ b/drivers/staging/unisys/include/uniklog.h
@@ -26,35 +26,6 @@
#include <linux/printk.h>
/*
- * # LOGINF
- *
- * \brief Log informational message - logs a message at the LOG_INFO level
- *
- * \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 string.
- * \return nothing
- *
- * Logs the specified message at the LOG_INFO level.
- */
-
-#define LOGINF(fmt, args...) pr_info(fmt, ## args)
-#define LOGINFDEV(devname, fmt, args...) \
- pr_info("%s " fmt, devname, ## args)
-#define LOGINFDEVX(devno, fmt, args...) \
- pr_info("dev%d " fmt, devno, ## args)
-#define LOGINFNAME(vnic, fmt, args...) \
- do { \
- if (vnic != NULL) { \
- pr_info("%s " fmt, vnic->name, ## args); \
- } else { \
- pr_info(fmt, ## args); \
- } \
- } while (0)
-
-/*
* # LOGVER
*
* \brief Log verbose message - logs a message at the LOG_DEBUG level,
diff --git a/drivers/staging/unisys/uislib/uislib.c
b/drivers/staging/unisys/uislib/uislib.c
index d986fde..b6a7fb0 100644
--- a/drivers/staging/unisys/uislib/uislib.c
+++ b/drivers/staging/unisys/uislib/uislib.c
@@ -671,7 +671,7 @@ static int destroy_device(struct controlvm_message *msg,
char *buf)
dev_no = msg->cmd.destroy_device.bus_no;
read_lock(&bus_list_lock);
- LOGINF("destroy_device called for bus_no=%u, dev_no=%u", bus_no,
+ pr_info("destroy_device called for bus_no=%u, dev_no=%u", bus_no,
dev_no);
for (bus = bus_list; bus; bus = bus->next) {
if (bus->bus_no == bus_no) {
@@ -733,12 +733,12 @@ static int destroy_device(struct controlvm_message *msg,
char *buf)
* kernel paging request"
*/
if (dev->polling) {
- LOGINF("calling uislib_disable_channel_interrupts");
+ pr_info("calling uislib_disable_channel_interrupts");
uislib_disable_channel_interrupts(bus_no, dev_no);
}
/* unmap the channel memory for the device. */
if (!msg->hdr.flags.test_message) {
- LOGINF("destroy_device, doing iounmap");
+ pr_info("destroy_device, doing iounmap");
uislib_iounmap(dev->chanptr);
}
kfree(dev);
@@ -806,7 +806,7 @@ uislib_client_inject_add_bus(u32 bus_no, uuid_le inst_uuid,
{
struct controlvm_message msg;
- LOGINF("enter busNo=0x%x\n", bus_no);
+ pr_info("enter busNo=0x%x\n", bus_no);
/* step 0: init the chipset */
POSTCODE_LINUX_3(CHIPSET_INIT_ENTRY_PC, bus_no, POSTCODE_SEVERITY_INFO);
@@ -826,7 +826,7 @@ uislib_client_inject_add_bus(u32 bus_no, uuid_le inst_uuid,
pr_err("init_chipset failed.\n");
return 0;
}
- LOGINF("chipset initialized\n");
+ pr_info("chipset initialized\n");
POSTCODE_LINUX_3(CHIPSET_INIT_EXIT_PC, bus_no,
POSTCODE_SEVERITY_INFO);
}
@@ -906,7 +906,7 @@ uislib_client_inject_add_vhba(u32 bus_no, u32 dev_no,
{
struct controlvm_message msg;
- LOGINF(" enter busNo=0x%x devNo=0x%x\n", bus_no, dev_no);
+ pr_info(" enter busNo=0x%x devNo=0x%x\n", bus_no, dev_no);
/* chipset init'ed with bus bus has been previously created -
* Verify it still exists step 2: create the VHBA device on the
* bus
@@ -965,7 +965,7 @@ uislib_client_inject_add_vnic(u32 bus_no, u32 dev_no,
{
struct controlvm_message msg;
- LOGINF(" enter busNo=0x%x devNo=0x%x\n", bus_no, dev_no);
+ pr_info(" enter busNo=0x%x devNo=0x%x\n", bus_no, dev_no);
/* chipset init'ed with bus bus has been previously created -
* Verify it still exists step 2: create the VNIC device on the
* bus
@@ -1251,7 +1251,7 @@ static int process_incoming(void *v)
wait_cycles = (cur_cycles - old_cycles);
}
}
- LOGINF("wait_cycles=%llu", wait_cycles);
+ pr_info("wait_cycles=%llu", wait_cycles);
cycles_before_wait = wait_cycles;
idle_cycles = 0;
poll_dev_start = 0;
@@ -1312,7 +1312,7 @@ static int process_incoming(void *v)
if (incoming_ti.should_stop)
break;
if (en_smart_wakeup == 0xFF) {
- LOGINF("en_smart_wakeup set to 0xff, to force exiting
process_incoming");
+ pr_info("en_smart_wakeup set to 0xff, to force exiting
process_incoming");
break;
}
/* wait for POLLJIFFIES_NORMAL jiffies, or until
@@ -1444,26 +1444,26 @@ uislib_mod_init(void)
if (!unisys_spar_platform)
return -ENODEV;
- LOGINF("MONITORAPIS");
+ pr_info("MONITORAPIS");
- LOGINF("sizeof(struct uiscmdrsp):%lu bytes\n",
+ pr_info("sizeof(struct uiscmdrsp):%lu bytes\n",
(ulong)sizeof(struct uiscmdrsp));
- LOGINF("sizeof(struct phys_info):%lu\n",
+ pr_info("sizeof(struct phys_info):%lu\n",
(ulong)sizeof(struct phys_info));
- LOGINF("sizeof(uiscmdrsp_scsi):%lu\n",
+ pr_info("sizeof(uiscmdrsp_scsi):%lu\n",
(ulong)sizeof(struct uiscmdrsp_scsi));
- LOGINF("sizeof(uiscmdrsp_net):%lu\n",
+ pr_info("sizeof(uiscmdrsp_net):%lu\n",
(ulong)sizeof(struct uiscmdrsp_net));
- LOGINF("sizeof(CONTROLVM_MESSAGE):%lu bytes\n",
+ pr_info("sizeof(CONTROLVM_MESSAGE):%lu bytes\n",
(ulong)sizeof(struct controlvm_message));
- LOGINF("sizeof(struct spar_controlvm_channel_protocol):%lu bytes\n",
+ pr_info("sizeof(struct spar_controlvm_channel_protocol):%lu bytes\n",
(ulong)sizeof(struct spar_controlvm_channel_protocol));
- LOGINF("sizeof(CHANNEL_HEADER):%lu bytes\n",
+ pr_info("sizeof(CHANNEL_HEADER):%lu bytes\n",
(ulong)sizeof(struct channel_header));
- LOGINF("sizeof(struct spar_io_channel_protocol):%lu bytes\n",
+ pr_info("sizeof(struct spar_io_channel_protocol):%lu bytes\n",
(ulong)sizeof(struct spar_io_channel_protocol));
- LOGINF("SIZEOF_CMDRSP:%lu bytes\n", SIZEOF_CMDRSP);
- LOGINF("SIZEOF_PROTOCOL:%lu bytes\n", SIZEOF_PROTOCOL);
+ pr_info("SIZEOF_CMDRSP:%lu bytes\n", SIZEOF_CMDRSP);
+ pr_info("SIZEOF_PROTOCOL:%lu bytes\n", SIZEOF_PROTOCOL);
/* initialize global pointers to NULL */
bus_list = NULL;
diff --git a/drivers/staging/unisys/uislib/uisthread.c
b/drivers/staging/unisys/uislib/uisthread.c
index 1cc93b4..9aae374 100644
--- a/drivers/staging/unisys/uislib/uisthread.c
+++ b/drivers/staging/unisys/uislib/uisthread.c
@@ -51,7 +51,7 @@ uisthread_start(struct uisthread_info *thrinfo,
}
thrinfo->id = thrinfo->task->pid;
wake_up_process(thrinfo->task);
- LOGINF("started thread pid:%d\n", thrinfo->id);
+ pr_info("started thread pid:%d\n", thrinfo->id);
return 1;
}
EXPORT_SYMBOL_GPL(uisthread_start);
@@ -65,7 +65,7 @@ uisthread_stop(struct uisthread_info *thrinfo)
if (thrinfo->id == 0)
return; /* thread not running */
- LOGINF("uisthread_stop stopping id:%d\n", thrinfo->id);
+ pr_info("uisthread_stop stopping id:%d\n", thrinfo->id);
thrinfo->should_stop = 1;
ret = KILL(thrinfo->id, SIGHUP, 1);
if (ret) {
@@ -78,7 +78,7 @@ uisthread_stop(struct uisthread_info *thrinfo)
pr_err("timed out trying to signal thread\n");
}
if (stopped) {
- LOGINF("uisthread_stop stopped id:%d\n", thrinfo->id);
+ pr_info("uisthread_stop stopped id:%d\n", thrinfo->id);
thrinfo->id = 0;
}
}
diff --git a/drivers/staging/unisys/uislib/uisutils.c
b/drivers/staging/unisys/uislib/uisutils.c
index 637cedc..f724e9d 100644
--- a/drivers/staging/unisys/uislib/uisutils.c
+++ b/drivers/staging/unisys/uislib/uisutils.c
@@ -74,7 +74,7 @@ int
uisctrl_register_req_handler(int type, void *fptr,
struct ultra_vbus_deviceinfo *chipset_driver_info)
{
- LOGINF("type = %d, fptr = 0x%p.\n", type, fptr);
+ pr_info("type = %d, fptr = 0x%p.\n", type, fptr);
switch (type) {
case 2:
@@ -114,7 +114,7 @@ uisctrl_register_req_handler_ex(uuid_le switch_uuid,
{
struct req_handler_info *req_handler;
- LOGINF("type=%pUL, controlfunc=0x%p.\n",
+ pr_info("type=%pUL, controlfunc=0x%p.\n",
&switch_uuid, controlfunc);
if (!controlfunc) {
pr_err("%pUL: controlfunc must be supplied\n", &switch_uuid);
@@ -155,7 +155,7 @@ EXPORT_SYMBOL_GPL(uisctrl_register_req_handler_ex);
int
uisctrl_unregister_req_handler_ex(uuid_le switch_uuid)
{
- LOGINF("type=%pUL.\n", &switch_uuid);
+ pr_info("type=%pUL.\n", &switch_uuid);
if (req_handler_del(switch_uuid) < 0) {
pr_err("failed to remove %pUL from server list\n",
&switch_uuid);
diff --git a/drivers/staging/unisys/virthba/virthba.c
b/drivers/staging/unisys/virthba/virthba.c
index 2decac4..0f70a71 100644
--- a/drivers/staging/unisys/virthba/virthba.c
+++ b/drivers/staging/unisys/virthba/virthba.c
@@ -468,8 +468,8 @@ virthba_probe(struct virtpci_dev *virtpcidev, const struct
pci_device_id *id)
LOGVER("virtpcidev bus_no<<%d>>devNo<<%d>>", virtpcidev->bus_no,
virtpcidev->device_no);
- LOGINF("entering virthba_probe...\n");
- LOGINF("virtpcidev bus_no<<%d>>devNo<<%d>>", virtpcidev->bus_no,
+ pr_info("entering virthba_probe...\n");
+ pr_info("virtpcidev bus_no<<%d>>devNo<<%d>>", virtpcidev->bus_no,
virtpcidev->device_no);
POSTCODE_LINUX_2(VHBA_PROBE_ENTRY_PC, POSTCODE_SEVERITY_INFO);
/* call scsi_host_alloc to register a scsi host adapter
@@ -500,7 +500,7 @@ virthba_probe(struct virtpci_dev *virtpcidev, const struct
pci_device_id *id)
* scan is 0 to max (inclusive); so we will subtract one from
* the max-channel value.
*/
- LOGINF("virtpcidev->scsi.max.max_channel=%u, max_id=%u, max_lun=%u,
cmd_per_lun=%u, max_io_size=%u\n",
+ pr_info("virtpcidev->scsi.max.max_channel=%u, max_id=%u, max_lun=%u,
cmd_per_lun=%u, max_io_size=%u\n",
(unsigned) virtpcidev->scsi.max.max_channel - 1,
(unsigned) virtpcidev->scsi.max.max_id,
(unsigned) virtpcidev->scsi.max.max_lun,
@@ -516,11 +516,11 @@ virthba_probe(struct virtpci_dev *virtpcidev, const
struct pci_device_id *id)
(unsigned short) (virtpcidev->scsi.max.max_io_size / PAGE_SIZE);
if (scsihost->sg_tablesize > MAX_PHYS_INFO)
scsihost->sg_tablesize = MAX_PHYS_INFO;
- LOGINF("scsihost->max_channel=%u, max_id=%u, max_lun=%llu,
cmd_per_lun=%u, max_sectors=%hu, sg_tablesize=%hu\n",
+ pr_info("scsihost->max_channel=%u, max_id=%u, max_lun=%llu,
cmd_per_lun=%u, max_sectors=%hu, sg_tablesize=%hu\n",
scsihost->max_channel, scsihost->max_id, scsihost->max_lun,
scsihost->cmd_per_lun, scsihost->max_sectors,
scsihost->sg_tablesize);
- LOGINF("scsihost->can_queue=%u, scsihost->cmd_per_lun=%u,
max_sectors=%hu, sg_tablesize=%hu\n",
+ pr_info("scsihost->can_queue=%u, scsihost->cmd_per_lun=%u,
max_sectors=%hu, sg_tablesize=%hu\n",
scsihost->can_queue, scsihost->cmd_per_lun, scsihost->max_sectors,
scsihost->sg_tablesize);
@@ -601,15 +601,15 @@ virthba_probe(struct virtpci_dev *virtpcidev, const
struct pci_device_id *id)
scsi_host_put(scsihost);
return -ENODEV;
}
- LOGINF("sendInterruptHandle=0x%16llX",
+ pr_info("sendInterruptHandle=0x%16llX",
virthbainfo->intr.send_irq_handle);
- LOGINF("recvInterruptHandle=0x%16llX",
+ pr_info("recvInterruptHandle=0x%16llX",
virthbainfo->intr.recv_irq_handle);
- LOGINF("recvInterruptVector=0x%8X",
+ pr_info("recvInterruptVector=0x%8X",
virthbainfo->intr.recv_irq_vector);
- LOGINF("recvInterruptShared=0x%2X",
+ pr_info("recvInterruptShared=0x%2X",
virthbainfo->intr.recv_irq_shared);
- LOGINF("scsihost.hostt->name=%s", scsihost->hostt->name);
+ pr_info("scsihost.hostt->name=%s", scsihost->hostt->name);
virthbainfo->interrupt_vector =
virthbainfo->intr.recv_irq_handle & INTERRUPT_VECTOR_MASK;
rsp = request_irq(virthbainfo->interrupt_vector, handler, IRQF_SHARED,
@@ -636,7 +636,7 @@ virthba_probe(struct virtpci_dev *virtpcidev, const struct
pci_device_id *id)
scsi_scan_host(scsihost);
pr_debug("return from scsi_scan_host.\n");
- LOGINF("virthba added scsihost:0x%p\n", scsihost);
+ pr_info("virthba added scsihost:0x%p\n", scsihost);
POSTCODE_LINUX_2(VHBA_PROBE_EXIT_PC, POSTCODE_SEVERITY_INFO);
return 0;
}
@@ -648,12 +648,12 @@ virthba_remove(struct virtpci_dev *virtpcidev)
struct Scsi_Host *scsihost =
(struct Scsi_Host *) virtpcidev->scsi.scsihost;
- LOGINF("virtpcidev bus_no<<%d>>devNo<<%d>>", virtpcidev->bus_no,
+ pr_info("virtpcidev bus_no<<%d>>devNo<<%d>>", virtpcidev->bus_no,
virtpcidev->device_no);
virthbainfo = (struct virthba_info *) scsihost->hostdata;
if (virthbainfo->interrupt_vector != -1)
free_irq(virthbainfo->interrupt_vector, virthbainfo);
- LOGINF("Removing virtpcidev: 0x%p, virthbainfo: 0x%p\n", virtpcidev,
+ pr_info("Removing virtpcidev: 0x%p, virthbainfo: 0x%p\n", virtpcidev,
virthbainfo);
pr_debug("removing scsihost: 0x%p, scsihost->this_id: %d\n", scsihost,
@@ -669,7 +669,7 @@ virthba_remove(struct virtpci_dev *virtpcidev)
* scsi_add_host so the scsi_host gets deleted
*/
scsi_host_put(scsihost);
- LOGINF("virthba removed scsi_host.\n");
+ pr_info("virthba removed scsi_host.\n");
}
static int
@@ -683,7 +683,7 @@ forward_vdiskmgmt_command(enum vdisk_mgmt_types
vdiskcmdtype,
int notifyresult = 0xffff;
wait_queue_head_t notifyevent;
- LOGINF("vDiskMgmt:%d %d:%d:%d\n", vdiskcmdtype,
+ pr_info("vDiskMgmt:%d %d:%d:%d\n", vdiskcmdtype,
vdest->channel, vdest->id, vdest->lun);
if (virthbainfo->serverdown || virthbainfo->serverchangingstate) {
@@ -722,10 +722,10 @@ forward_vdiskmgmt_command(enum vdisk_mgmt_types
vdiskcmdtype,
&virthbainfo->chinfo.insertlock,
DONT_ISSUE_INTERRUPT, (u64) NULL,
OK_TO_WAIT, "vhba");
- LOGINF("VdiskMgmt waiting on event notifyevent=0x%p\n",
+ pr_info("VdiskMgmt waiting on event notifyevent=0x%p\n",
cmdrsp->scsitaskmgmt.notify);
wait_event(notifyevent, notifyresult != 0xffff);
- LOGINF("VdiskMgmt complete; result:%d\n", cmdrsp->vdiskmgmt.result);
+ pr_info("VdiskMgmt complete; result:%d\n", cmdrsp->vdiskmgmt.result);
kfree(cmdrsp);
return SUCCESS;
}
@@ -744,7 +744,7 @@ forward_taskmgmt_command(enum task_mgmt_types tasktype,
int notifyresult = 0xffff;
wait_queue_head_t notifyevent;
- LOGINF("TaskMgmt:%d %d:%d:%llu\n", tasktype,
+ pr_info("TaskMgmt:%d %d:%d:%llu\n", tasktype,
scsidev->channel, scsidev->id, scsidev->lun);
if (virthbainfo->serverdown || virthbainfo->serverchangingstate) {
@@ -782,10 +782,10 @@ forward_taskmgmt_command(enum task_mgmt_types tasktype,
&virthbainfo->chinfo.insertlock,
DONT_ISSUE_INTERRUPT, (u64) NULL,
OK_TO_WAIT, "vhba");
- LOGINF("TaskMgmt waiting on event notifyevent=0x%p\n",
+ pr_info("TaskMgmt waiting on event notifyevent=0x%p\n",
cmdrsp->scsitaskmgmt.notify);
wait_event(notifyevent, notifyresult != 0xffff);
- LOGINF("TaskMgmt complete; result:%d\n", cmdrsp->scsitaskmgmt.result);
+ pr_info("TaskMgmt complete; result:%d\n", cmdrsp->scsitaskmgmt.result);
kfree(cmdrsp);
return SUCCESS;
}
@@ -987,7 +987,7 @@ virthba_queue_command_lck(struct scsi_cmnd *scsicmd,
cmdrsp->scsi.gpi_list[i].address = sg_phys(sg);
cmdrsp->scsi.gpi_list[i].length = sg->length;
if ((i != 0) && (sg->offset != 0))
- LOGINF("Offset on a sg_entry other than zero
=<<%d>>.\n",
+ pr_info("Offset on a sg_entry other than zero
=<<%d>>.\n",
sg->offset);
}
@@ -1244,7 +1244,7 @@ complete_vdiskmgmt_command(struct uiscmdrsp *cmdrsp)
/* wake up the error handler that is waiting for this */
*(int *) cmdrsp->vdiskmgmt.notifyresult = cmdrsp->vdiskmgmt.result;
wake_up_all((wait_queue_head_t *) cmdrsp->vdiskmgmt.notify);
- LOGINF("set notify result to %d\n", cmdrsp->vdiskmgmt.result);
+ pr_info("set notify result to %d\n", cmdrsp->vdiskmgmt.result);
}
static inline void
@@ -1255,7 +1255,7 @@ complete_taskmgmt_command(struct uiscmdrsp *cmdrsp)
*(int *) cmdrsp->scsitaskmgmt.notifyresult =
cmdrsp->scsitaskmgmt.result;
wake_up_all((wait_queue_head_t *) cmdrsp->scsitaskmgmt.notify);
- LOGINF("set notify result to %d\n", cmdrsp->scsitaskmgmt.result);
+ pr_info("set notify result to %d\n", cmdrsp->scsitaskmgmt.result);
}
static void
@@ -1636,7 +1636,7 @@ virthba_mod_init(void)
if (!unisys_spar_platform)
return -ENODEV;
- LOGINF("Entering virthba_mod_init...\n");
+ pr_info("Entering virthba_mod_init...\n");
POSTCODE_LINUX_2(VHBA_CREATE_ENTRY_PC, POSTCODE_SEVERITY_INFO);
virthba_parse_options(virthba_options);
@@ -1676,7 +1676,7 @@ virthba_mod_init(void)
}
POSTCODE_LINUX_2(VHBA_CREATE_EXIT_PC, POSTCODE_SEVERITY_INFO);
- LOGINF("Leaving virthba_mod_init\n");
+ pr_info("Leaving virthba_mod_init\n");
return error;
}
@@ -1726,7 +1726,7 @@ static DEVICE_ATTRIBUTE *virthba_shost_attrs[] = {
static void __exit
virthba_mod_exit(void)
{
- LOGINF("entering virthba_mod_exit...\n");
+ pr_info("entering virthba_mod_exit...\n");
virtpci_unregister_driver(&virthba_driver);
/* unregister is going to call virthba_remove */
@@ -1737,7 +1737,7 @@ virthba_mod_exit(void)
}
debugfs_remove_recursive(virthba_debugfs_dir);
- LOGINF("Leaving virthba_mod_exit\n");
+ pr_info("Leaving virthba_mod_exit\n");
}
diff --git a/drivers/staging/unisys/virtpci/virtpci.c
b/drivers/staging/unisys/virtpci/virtpci.c
index 7432850..b7276cb 100644
--- a/drivers/staging/unisys/virtpci/virtpci.c
+++ b/drivers/staging/unisys/virtpci/virtpci.c
@@ -283,7 +283,7 @@ static int add_vbus(struct add_vbus_guestpart *addparams)
&chipset_driver_info);
write_vbus_bus_info(vbus->platform_data /* chanptr */ ,
&bus_driver_info);
- LOGINF("Added vbus %d; device %s created successfully\n",
+ pr_info("Added vbus %d; device %s created successfully\n",
addparams->bus_no, BUS_ID(vbus));
POSTCODE_LINUX_2(VPCI_CREATE_EXIT_PC, POSTCODE_SEVERITY_INFO);
return 1;
@@ -332,13 +332,13 @@ static int add_vhba(struct add_virt_guestpart *addparams)
return 0;
}
- LOGINF("Adding vhba wwnn:%x:%x config:%d-%d-%d-%d chanptr:%p\n",
+ pr_info("Adding vhba wwnn:%x:%x config:%d-%d-%d-%d chanptr:%p\n",
scsi.wwnn.wwnn1, scsi.wwnn.wwnn2,
scsi.max.max_channel, scsi.max.max_id, scsi.max.max_lun,
scsi.max.cmd_per_lun, addparams->chanptr);
i = virtpci_device_add(vbus, VIRTHBA_TYPE, addparams, &scsi, NULL);
if (i) {
- LOGINF("Added vhba wwnn:%x:%x chanptr:%p\n", scsi.wwnn.wwnn1,
+ pr_info("Added vhba wwnn:%x:%x chanptr:%p\n", scsi.wwnn.wwnn1,
scsi.wwnn.wwnn2, addparams->chanptr);
POSTCODE_LINUX_3(VPCI_CREATE_EXIT_PC, i,
POSTCODE_SEVERITY_INFO);
@@ -395,13 +395,13 @@ add_vnic(struct add_virt_guestpart *addparams)
return 0;
}
- LOGINF("Adding vnic macaddr:%02x:%02x:%02x:%02x:%02x:%02x rcvbufs:%d
mtu:%d chanptr:%p%pUL\n",
+ pr_info("Adding vnic macaddr:%02x:%02x:%02x:%02x:%02x:%02x rcvbufs:%d
mtu:%d chanptr:%p%pUL\n",
net.mac_addr[0], net.mac_addr[1], net.mac_addr[2],
net.mac_addr[3], net.mac_addr[4], net.mac_addr[5],
net.num_rcv_bufs, net.mtu, addparams->chanptr, &net.zone_uuid);
i = virtpci_device_add(vbus, VIRTNIC_TYPE, addparams, NULL, &net);
if (i) {
- LOGINF("Added vnic macaddr:%02x:%02x:%02x:%02x:%02x:%02x\n",
+ pr_info("Added vnic macaddr:%02x:%02x:%02x:%02x:%02x:%02x\n",
net.mac_addr[0], net.mac_addr[1], net.mac_addr[2],
net.mac_addr[3], net.mac_addr[4], net.mac_addr[5]);
POSTCODE_LINUX_3(VPCI_CREATE_EXIT_PC, i,
@@ -430,10 +430,10 @@ delete_vbus(struct del_vbus_guestpart *delparams)
}
/* ensure that bus has no devices? -- TBD */
- LOGINF("Deleting %s\n", BUS_ID(vbus));
+ pr_info("Deleting %s\n", BUS_ID(vbus));
if (delete_vbus_device(vbus, NULL))
return 0; /* failure */
- LOGINF("Deleted vbus %d\n", delparams->bus_no);
+ pr_info("Deleted vbus %d\n", delparams->bus_no);
return 1;
}
@@ -445,13 +445,13 @@ delete_vbus_device(struct device *vbus, void *data)
if ((checkforroot) && match_busid(vbus, (void *)BUS_ID(dev))) {
/* skip it - don't delete root bus */
- LOGINF("skipping root bus\n");
+ pr_info("skipping root bus\n");
return 0; /* pretend no error */
}
- LOGINF("Calling unregister for %s\n", BUS_ID(vbus));
+ pr_info("Calling unregister for %s\n", BUS_ID(vbus));
device_unregister(vbus);
kfree(vbus);
- LOGINF("VBus unregister and freed\n");
+ pr_info("VBus unregister and freed\n");
return 0; /* no error */
}
@@ -465,11 +465,11 @@ static int pause_vhba(struct pause_virt_guestpart
*pauseparams)
GET_SCSIADAPINFO_FROM_CHANPTR(pauseparams->chanptr);
- LOGINF("Pausing vhba wwnn:%x:%x\n", scsi.wwnn.wwnn1, scsi.wwnn.wwnn2);
+ pr_info("Pausing vhba wwnn:%x:%x\n", scsi.wwnn.wwnn1, scsi.wwnn.wwnn2);
i = virtpci_device_serverdown(NULL /*no parent bus */ , VIRTHBA_TYPE,
&scsi.wwnn, NULL);
if (i)
- LOGINF("Paused vhba wwnn:%x:%x\n", scsi.wwnn.wwnn1,
+ pr_info("Paused vhba wwnn:%x:%x\n", scsi.wwnn.wwnn1,
scsi.wwnn.wwnn2);
return i;
}
@@ -484,13 +484,13 @@ static int pause_vnic(struct pause_virt_guestpart
*pauseparams)
GET_NETADAPINFO_FROM_CHANPTR(pauseparams->chanptr);
- LOGINF("Pausing vnic macaddr:%02x:%02x:%02x:%02x:%02x:%02x\n",
+ pr_info("Pausing vnic macaddr:%02x:%02x:%02x:%02x:%02x:%02x\n",
net.mac_addr[0], net.mac_addr[1], net.mac_addr[2],
net.mac_addr[3], net.mac_addr[4], net.mac_addr[5]);
i = virtpci_device_serverdown(NULL /*no parent bus */ , VIRTNIC_TYPE,
NULL, net.mac_addr);
if (i) {
- LOGINF(" Paused vnic macaddr:%02x:%02x:%02x:%02x:%02x:%02x\n",
+ pr_info(" Paused vnic macaddr:%02x:%02x:%02x:%02x:%02x:%02x\n",
net.mac_addr[0], net.mac_addr[1], net.mac_addr[2],
net.mac_addr[3], net.mac_addr[4], net.mac_addr[5]);
}
@@ -507,11 +507,11 @@ static int resume_vhba(struct resume_virt_guestpart
*resumeparams)
GET_SCSIADAPINFO_FROM_CHANPTR(resumeparams->chanptr);
- LOGINF("Resuming vhba wwnn:%x:%x\n", scsi.wwnn.wwnn1, scsi.wwnn.wwnn2);
+ pr_info("Resuming vhba wwnn:%x:%x\n", scsi.wwnn.wwnn1, scsi.wwnn.wwnn2);
i = virtpci_device_serverup(NULL /*no parent bus */ , VIRTHBA_TYPE,
&scsi.wwnn, NULL);
if (i)
- LOGINF("Resumed vhba wwnn:%x:%x\n", scsi.wwnn.wwnn1,
+ pr_info("Resumed vhba wwnn:%x:%x\n", scsi.wwnn.wwnn1,
scsi.wwnn.wwnn2);
return i;
}
@@ -527,13 +527,13 @@ resume_vnic(struct resume_virt_guestpart *resumeparams)
GET_NETADAPINFO_FROM_CHANPTR(resumeparams->chanptr);
- LOGINF("Resuming vnic macaddr:%02x:%02x:%02x:%02x:%02x:%02x\n",
+ pr_info("Resuming vnic macaddr:%02x:%02x:%02x:%02x:%02x:%02x\n",
net.mac_addr[0], net.mac_addr[1], net.mac_addr[2],
net.mac_addr[3], net.mac_addr[4], net.mac_addr[5]);
i = virtpci_device_serverup(NULL /*no parent bus */ , VIRTNIC_TYPE,
NULL, net.mac_addr);
if (i) {
- LOGINF(" Resumed vnic macaddr:%02x:%02x:%02x:%02x:%02x:%02x\n",
+ pr_info(" Resumed vnic macaddr:%02x:%02x:%02x:%02x:%02x:%02x\n",
net.mac_addr[0], net.mac_addr[1], net.mac_addr[2],
net.mac_addr[3], net.mac_addr[4], net.mac_addr[5]);
}
@@ -550,11 +550,11 @@ static int delete_vhba(struct del_virt_guestpart
*delparams)
GET_SCSIADAPINFO_FROM_CHANPTR(delparams->chanptr);
- LOGINF("Deleting vhba wwnn:%x:%x\n", scsi.wwnn.wwnn1, scsi.wwnn.wwnn2);
+ pr_info("Deleting vhba wwnn:%x:%x\n", scsi.wwnn.wwnn1, scsi.wwnn.wwnn2);
i = virtpci_device_del(NULL /*no parent bus */ , VIRTHBA_TYPE,
&scsi.wwnn, NULL);
if (i) {
- LOGINF("Deleted vhba wwnn:%x:%x\n", scsi.wwnn.wwnn1,
+ pr_info("Deleted vhba wwnn:%x:%x\n", scsi.wwnn.wwnn1,
scsi.wwnn.wwnn2);
return 1;
}
@@ -571,13 +571,13 @@ static int delete_vnic(struct del_virt_guestpart
*delparams)
GET_NETADAPINFO_FROM_CHANPTR(delparams->chanptr);
- LOGINF("Deleting vnic macaddr:%02x:%02x:%02x:%02x:%02x:%02x\n",
+ pr_info("Deleting vnic macaddr:%02x:%02x:%02x:%02x:%02x:%02x\n",
net.mac_addr[0], net.mac_addr[1], net.mac_addr[2],
net.mac_addr[3], net.mac_addr[4], net.mac_addr[5]);
i = virtpci_device_del(NULL /*no parent bus */ , VIRTNIC_TYPE, NULL,
net.mac_addr);
if (i) {
- LOGINF("Deleted vnic macaddr:%02x:%02x:%02x:%02x:%02x:%02x\n",
+ pr_info("Deleted vnic macaddr:%02x:%02x:%02x:%02x:%02x:%02x\n",
net.mac_addr[0], net.mac_addr[1], net.mac_addr[2],
net.mac_addr[3], net.mac_addr[4], net.mac_addr[5]);
}
@@ -585,9 +585,9 @@ static int delete_vnic(struct del_virt_guestpart *delparams)
}
#define DELETE_ONE_VPCIDEV(vpcidev) { \
- LOGINF("calling device_unregister:%p\n", &vpcidev->generic_dev); \
+ pr_info("calling device_unregister:%p\n", &vpcidev->generic_dev); \
device_unregister(&vpcidev->generic_dev); \
- LOGINF("Deleted %p\n", vpcidev); \
+ pr_info("Deleted %p\n", vpcidev); \
kfree(vpcidev); \
}
@@ -614,7 +614,7 @@ static void delete_all(void)
tmpvpcidev = nextvpcidev;
count++;
}
- LOGINF("Deleted %d vhbas/vnics.\n", count);
+ pr_info("Deleted %d vhbas/vnics.\n", count);
/* now delete each vbus */
if (bus_for_each_dev
@@ -647,12 +647,12 @@ static int delete_all_virt(enum virtpci_dev_type devtype,
return 0;
}
- LOGINF("Deleting all %s in vbus %s\n",
+ pr_info("Deleting all %s in vbus %s\n",
devtype == VIRTHBA_TYPE ? "vhbas" : "vnics", busid);
/* delete all vhbas/vnics */
i = virtpci_device_del(vbus, devtype, NULL, NULL);
if (i > 0)
- LOGINF("Deleted %d %s\n", i,
+ pr_info("Deleted %d %s\n", i,
devtype == VIRTHBA_TYPE ? "vhbas" : "vnics");
return 1;
}
@@ -836,7 +836,7 @@ static int virtpci_device_probe(struct device *dev)
const struct pci_device_id *id;
int error = 0;
- LOGINF("In virtpci_device_probe dev:%p virtpcidev:%p virtpcidrv:%p\n",
+ pr_info("In virtpci_device_probe dev:%p virtpcidev:%p virtpcidrv:%p\n",
dev, virtpcidev, virtpcidrv); /* VERBOSE/DEBUG ? */
POSTCODE_LINUX_2(VPCI_PROBE_ENTRY_PC, POSTCODE_SEVERITY_INFO);
/* static match and static probe vs dynamic match & dynamic
@@ -882,7 +882,7 @@ static int virtpci_device_remove(struct device *dev_)
struct virtpci_dev *virtpcidev = device_to_virtpci_dev(dev_);
struct virtpci_driver *virtpcidrv = virtpcidev->mydriver;
- LOGINF("In virtpci_device_remove bus_id:%s dev_:%p virtpcidev:%p
dev->driver:%p drivername:%s\n",
+ pr_info("In virtpci_device_remove bus_id:%s dev_:%p virtpcidev:%p
dev->driver:%p drivername:%s\n",
BUS_ID(dev_), dev_, virtpcidev, dev_->driver,
dev_->driver->name); /* VERBOSE/DEBUG */
if (virtpcidrv) {
@@ -931,7 +931,7 @@ static int virtpci_device_add(struct device *parentbus, int
devtype,
struct spar_io_channel_protocol __iomem *io_chan = NULL;
struct device *dev;
- LOGINF("virtpci_device_add parentbus:%p chanptr:%p\n", parentbus,
+ pr_info("virtpci_device_add parentbus:%p chanptr:%p\n", parentbus,
addparams->chanptr);
POSTCODE_LINUX_2(VPCI_CREATE_ENTRY_PC, POSTCODE_SEVERITY_INFO);
@@ -1075,7 +1075,7 @@ static int virtpci_device_add(struct device *parentbus,
int devtype,
return 0;
}
- LOGINF("Added %s:%d:%d &virtpcidev->generic_dev:%p\n",
+ pr_info("Added %s:%d:%d &virtpcidev->generic_dev:%p\n",
(devtype == VIRTHBA_TYPE) ? "virthba" : "virtnic",
addparams->bus_no, addparams->device_no,
&virtpcidev->generic_dev);
@@ -1318,7 +1318,7 @@ static void virtpci_device_release(struct device *dev_)
/* this function is called when the last reference to the
* device is removed
*/
- LOGINF("In virtpci_device_release:%p - NOT YET IMPLEMENTED\n", dev_);
+ pr_info("In virtpci_device_release:%p - NOT YET IMPLEMENTED\n", dev_);
}
/*****************************************************/
@@ -1563,20 +1563,20 @@ static int __init virtpci_mod_init(void)
return -1;
}
- LOGINF("successfully registered virtpci_ctrlchan_func (0x%p) as
callback.\n",
+ pr_info("successfully registered virtpci_ctrlchan_func (0x%p) as
callback.\n",
(void *)&virtpci_ctrlchan_func);
/* create debugfs directory and info file inside. */
virtpci_debugfs_dir = debugfs_create_dir("virtpci", NULL);
debugfs_create_file("info", S_IRUSR, virtpci_debugfs_dir,
NULL, &debugfs_info_fops);
- LOGINF("Leaving\n");
+ pr_info("Leaving\n");
POSTCODE_LINUX_2(VPCI_CREATE_EXIT_PC, POSTCODE_SEVERITY_INFO);
return 0;
}
static void __exit virtpci_mod_exit(void)
{
- LOGINF("virtpci_mod_exit...\n");
+ pr_info("virtpci_mod_exit...\n");
/* unregister the callback function */
if (!uisctrl_register_req_handler(2, NULL, NULL))
@@ -1585,7 +1585,7 @@ static void __exit virtpci_mod_exit(void)
device_unregister(&virtpci_rootbus_device);
bus_unregister(&virtpci_bus_type);
debugfs_remove_recursive(virtpci_debugfs_dir);
- LOGINF("Leaving\n");
+ pr_info("Leaving\n");
}
module_init(virtpci_mod_init);
diff --git a/drivers/staging/unisys/visorchannel/visorchannel_main.c
b/drivers/staging/unisys/visorchannel/visorchannel_main.c
index f4be2e6..5dee28f 100644
--- a/drivers/staging/unisys/visorchannel/visorchannel_main.c
+++ b/drivers/staging/unisys/visorchannel/visorchannel_main.c
@@ -32,14 +32,14 @@ visorchannel_init(void)
if (!unisys_spar_platform)
return -ENODEV;
- INFODRV("driver version %s loaded", VERSION);
+ pr_info("driver version %s loaded", VERSION);
return 0;
}
static void
visorchannel_exit(void)
{
- INFODRV("driver unloaded");
+ pr_info("driver unloaded");
}
module_init(visorchannel_init);
diff --git a/drivers/staging/unisys/visorchipset/file.c
b/drivers/staging/unisys/visorchipset/file.c
index aca0be0..f4bdac5 100644
--- a/drivers/staging/unisys/visorchipset/file.c
+++ b/drivers/staging/unisys/visorchipset/file.c
@@ -65,7 +65,7 @@ visorchipset_file_init(dev_t major_dev, struct visorchannel
**controlvm_channel)
return -1;
}
registered = TRUE;
- INFODRV("New major number %d registered\n", MAJOR(majordev));
+ pr_info("New major number %d registered\n", MAJOR(majordev));
} else {
/* static major device number registration required */
if (register_chrdev_region(majordev, 1, MYDRVNAME) < 0) {
@@ -73,14 +73,14 @@ visorchipset_file_init(dev_t major_dev, struct visorchannel
**controlvm_channel)
return -1;
}
registered = TRUE;
- INFODRV("Static major number %d registered\n", MAJOR(majordev));
+ pr_info("Static major number %d registered\n", MAJOR(majordev));
}
rc = cdev_add(&file_cdev, MKDEV(MAJOR(majordev), 0), 1);
if (rc < 0) {
pr_err("failed to create char device: (status=%d)\n", rc);
return -1;
}
- INFODRV("Registered char device for %s (major=%d)",
+ pr_info("Registered char device for %s (major=%d)",
MYDRVNAME, MAJOR(majordev));
return 0;
}
diff --git a/drivers/staging/unisys/visorchipset/visorchipset_main.c
b/drivers/staging/unisys/visorchipset/visorchipset_main.c
index b13eed7..71e0b85 100644
--- a/drivers/staging/unisys/visorchipset/visorchipset_main.c
+++ b/drivers/staging/unisys/visorchipset/visorchipset_main.c
@@ -522,19 +522,19 @@ testUnicode(void)
* trailed NUL byte!! REALLY!!!!! Arrrrgggghhhhh
*/
- LOGINF("sizeof(wchar_t) = %d", sizeof(wchar_t));
- LOGINF("utf8_wcstombs=%d",
+ pr_info("sizeof(wchar_t) = %d", sizeof(wchar_t));
+ pr_info("utf8_wcstombs=%d",
chrs = utf8_wcstombs(s, unicodeString, sizeof(s)));
if (chrs >= 0)
s[chrs] = '\0'; /* GRRRRRRRR */
- LOGINF("s='%s'", s);
- LOGINF("utf8_mbstowcs=%d", chrs = utf8_mbstowcs(unicode2, s, 100));
+ pr_info("s='%s'", s);
+ pr_info("utf8_mbstowcs=%d", chrs = utf8_mbstowcs(unicode2, s, 100));
if (chrs >= 0)
unicode2[chrs] = 0; /* GRRRRRRRR */
if (memcmp(unicodeString, unicode2, sizeof(unicodeString)) == 0)
- LOGINF("strings match... good");
+ pr_info("strings match... good");
else
- LOGINF("strings did not match!!");
+ pr_info("strings did not match!!");
}
#endif
@@ -718,7 +718,7 @@ controlvm_respond(struct controlvm_message_header *msgHdr,
int response)
g_diagpoolDevNo)
outmsg.cmd = g_DeviceChangeStatePacket;
if (outmsg.hdr.flags.test_message == 1) {
- LOGINF("%s controlvm_msg=0x%x response=%d for test message",
+ pr_info("%s controlvm_msg=0x%x response=%d for test message",
__func__, outmsg.hdr.id, response);
return;
}
@@ -1068,7 +1068,7 @@ device_epilog(u32 busNo, u32 devNo, struct
spar_segment_state state, u32 cmd,
*/
if (busNo == g_diagpoolBusNo
&& devNo == g_diagpoolDevNo) {
-
LOGINF("DEVICE_CHANGESTATE(DiagpoolChannel busNo=%d devNo=%d is pausing...)",
+
pr_info("DEVICE_CHANGESTATE(DiagpoolChannel busNo=%d devNo=%d is pausing...)",
busNo, devNo);
/* this will trigger the
* diag_shutdown.sh script in
@@ -1297,7 +1297,7 @@ Away:
is_diagpool_channel(pDevInfo->chan_info.channel_type_uuid)) {
g_diagpoolBusNo = busNo;
g_diagpoolDevNo = devNo;
- LOGINF("CONTROLVM_DEVICE_CREATE for DiagPool channel:
busNo=%lu, devNo=%lu",
+ pr_info("CONTROLVM_DEVICE_CREATE for DiagPool channel:
busNo=%lu, devNo=%lu",
g_diagpoolBusNo, g_diagpoolDevNo);
}
device_epilog(busNo, devNo, segment_state_running,
@@ -1409,7 +1409,7 @@ initialize_controlvm_payload_info(HOSTADDRESS phys_addr,
u64 offset, u32 bytes,
info->offset = offset;
info->bytes = bytes;
info->ptr = payload;
- LOGINF("offset=%llu, bytes=%lu, ptr=%p",
+ pr_info("offset=%llu, bytes=%lu, ptr=%p",
(u64) (info->offset), (ulong) (info->bytes), info->ptr);
Away:
@@ -1511,7 +1511,7 @@ chipset_ready(struct controlvm_message_header *msgHdr)
* and disks mounted for the partition
*/
g_ChipSetMsgHdr = *msgHdr;
- LOGINF("Holding CHIPSET_READY response");
+ pr_info("Holding CHIPSET_READY response");
}
}
@@ -1648,7 +1648,7 @@ parahotplug_request_kickoff(struct parahotplug_request
*req)
sprintf(env_func, "SPAR_PARAHOTPLUG_FUNCTION=%d",
cmd->device_change_state.dev_no & 0x7);
- LOGINF("parahotplug_request_kickoff: state=%d, bdf=%d/%d/%d, id=%u\n",
+ pr_info("parahotplug_request_kickoff: state=%d, bdf=%d/%d/%d, id=%u\n",
cmd->device_change_state.state.active,
cmd->device_change_state.bus_no,
cmd->device_change_state.dev_no >> 3,
@@ -1832,40 +1832,40 @@ handle_command(struct controlvm_message inmsg,
HOSTADDRESS channel_addr)
}
switch (inmsg.hdr.id) {
case CONTROLVM_CHIPSET_INIT:
- LOGINF("CHIPSET_INIT(#busses=%lu,#switches=%lu)",
+ pr_info("CHIPSET_INIT(#busses=%lu,#switches=%lu)",
(ulong) inmsg.cmd.init_chipset.bus_count,
(ulong) inmsg.cmd.init_chipset.switch_count);
chipset_init(&inmsg);
break;
case CONTROLVM_BUS_CREATE:
- LOGINF("BUS_CREATE(%lu,#devs=%lu)",
+ pr_info("BUS_CREATE(%lu,#devs=%lu)",
(ulong) cmd->create_bus.bus_no,
(ulong) cmd->create_bus.dev_count);
bus_create(&inmsg);
break;
case CONTROLVM_BUS_DESTROY:
- LOGINF("BUS_DESTROY(%lu)", (ulong) cmd->destroy_bus.bus_no);
+ pr_info("BUS_DESTROY(%lu)", (ulong)cmd->destroy_bus.bus_no);
bus_destroy(&inmsg);
break;
case CONTROLVM_BUS_CONFIGURE:
- LOGINF("BUS_CONFIGURE(%lu)", (ulong) cmd->configure_bus.bus_no);
+ pr_info("BUS_CONFIGURE(%lu)", (ulong)cmd->configure_bus.bus_no);
bus_configure(&inmsg, parser_ctx);
break;
case CONTROLVM_DEVICE_CREATE:
- LOGINF("DEVICE_CREATE(%lu,%lu)",
+ pr_info("DEVICE_CREATE(%lu,%lu)",
(ulong) cmd->create_device.bus_no,
(ulong) cmd->create_device.dev_no);
my_device_create(&inmsg);
break;
case CONTROLVM_DEVICE_CHANGESTATE:
if (cmd->device_change_state.flags.phys_device) {
- LOGINF("DEVICE_CHANGESTATE for physical device
(%lu,%lu, active=%lu)",
+ pr_info("DEVICE_CHANGESTATE for physical device
(%lu,%lu, active=%lu)",
(ulong) cmd->device_change_state.bus_no,
(ulong) cmd->device_change_state.dev_no,
(ulong) cmd->device_change_state.state.active);
parahotplug_process_message(&inmsg);
} else {
- LOGINF("DEVICE_CHANGESTATE for virtual device (%lu,%lu,
state.Alive=0x%lx)",
+ pr_info("DEVICE_CHANGESTATE for virtual device
(%lu,%lu, state.Alive=0x%lx)",
(ulong) cmd->device_change_state.bus_no,
(ulong) cmd->device_change_state.dev_no,
(ulong) cmd->device_change_state.state.alive);
@@ -1878,13 +1878,13 @@ handle_command(struct controlvm_message inmsg,
HOSTADDRESS channel_addr)
}
break;
case CONTROLVM_DEVICE_DESTROY:
- LOGINF("DEVICE_DESTROY(%lu,%lu)",
+ pr_info("DEVICE_DESTROY(%lu,%lu)",
(ulong) cmd->destroy_device.bus_no,
(ulong) cmd->destroy_device.dev_no);
my_device_destroy(&inmsg);
break;
case CONTROLVM_DEVICE_CONFIGURE:
- LOGINF("DEVICE_CONFIGURE(%lu,%lu)",
+ pr_info("DEVICE_CONFIGURE(%lu,%lu)",
(ulong) cmd->configure_device.bus_no,
(ulong) cmd->configure_device.dev_no);
/* no op for now, just send a respond that we passed */
@@ -1892,15 +1892,15 @@ handle_command(struct controlvm_message inmsg,
HOSTADDRESS channel_addr)
controlvm_respond(&inmsg.hdr, CONTROLVM_RESP_SUCCESS);
break;
case CONTROLVM_CHIPSET_READY:
- LOGINF("CHIPSET_READY");
+ pr_info("CHIPSET_READY");
chipset_ready(&inmsg.hdr);
break;
case CONTROLVM_CHIPSET_SELFTEST:
- LOGINF("CHIPSET_SELFTEST");
+ pr_info("CHIPSET_SELFTEST");
chipset_selftest(&inmsg.hdr);
break;
case CONTROLVM_CHIPSET_STOP:
- LOGINF("CHIPSET_STOP");
+ pr_info("CHIPSET_STOP");
chipset_notready(&inmsg.hdr);
break;
default:
@@ -1928,7 +1928,7 @@ static HOSTADDRESS controlvm_get_channel_address(void)
__func__);
return 0;
}
- INFODRV("controlvm addr=%Lx", addr);
+ pr_info("controlvm addr=%Lx", addr);
return addr;
}
@@ -1961,7 +1961,7 @@ controlvm_periodic_work(struct work_struct *work)
if (visorchipset_holdchipsetready
&& (g_ChipSetMsgHdr.id != CONTROLVM_INVALID)) {
if (check_chipset_events() == 1) {
- LOGINF("Sending CHIPSET_READY response");
+ pr_info("Sending CHIPSET_READY response");
controlvm_respond(&g_ChipSetMsgHdr, 0);
clear_chipset_events();
memset(&g_ChipSetMsgHdr, 0,
@@ -2024,13 +2024,13 @@ Away:
* polling
*/
if (Poll_jiffies != POLLJIFFIES_CONTROLVMCHANNEL_SLOW) {
- LOGINF("switched to slow controlvm polling");
+ pr_info("switched to slow controlvm polling");
Poll_jiffies = POLLJIFFIES_CONTROLVMCHANNEL_SLOW;
}
} else {
if (Poll_jiffies != POLLJIFFIES_CONTROLVMCHANNEL_FAST) {
Poll_jiffies = POLLJIFFIES_CONTROLVMCHANNEL_FAST;
- LOGINF("switched to fast controlvm polling");
+ pr_info("switched to fast controlvm polling");
}
}
@@ -2140,7 +2140,7 @@ setup_crash_devices_work_queue(struct work_struct *work)
POSTCODE_SEVERITY_ERR);
return;
}
- LOGINF("Bus and device ready for dumping");
+ pr_info("Bus and device ready for dumping");
POSTCODE_LINUX_2(CRASH_DEV_EXIT_PC, POSTCODE_SEVERITY_INFO);
return;
@@ -2355,18 +2355,18 @@ visorchipset_init(void)
if (!unisys_spar_platform)
return -ENODEV;
- LOGINF("chipset driver version %s loaded", VERSION);
+ pr_info("chipset driver version %s loaded", VERSION);
/* process module options */
POSTCODE_LINUX_2(DRIVER_ENTRY_PC, POSTCODE_SEVERITY_INFO);
- LOGINF("option - testvnic=%d", visorchipset_testvnic);
- LOGINF("option - testvnicclient=%d", visorchipset_testvnicclient);
- LOGINF("option - testmsg=%d", visorchipset_testmsg);
- LOGINF("option - testteardown=%d", visorchipset_testteardown);
- LOGINF("option - major=%d", visorchipset_major);
- LOGINF("option - serverregwait=%d", visorchipset_serverregwait);
- LOGINF("option - clientregwait=%d", visorchipset_clientregwait);
- LOGINF("option - holdchipsetready=%d", visorchipset_holdchipsetready);
+ pr_info("option - testvnic=%d", visorchipset_testvnic);
+ pr_info("option - testvnicclient=%d", visorchipset_testvnicclient);
+ pr_info("option - testmsg=%d", visorchipset_testmsg);
+ pr_info("option - testteardown=%d", visorchipset_testteardown);
+ pr_info("option - major=%d", visorchipset_major);
+ pr_info("option - serverregwait=%d", visorchipset_serverregwait);
+ pr_info("option - clientregwait=%d", visorchipset_clientregwait);
+ pr_info("option - holdchipsetready=%d", visorchipset_holdchipsetready);
memset(&BusDev_Server_Notifiers, 0, sizeof(BusDev_Server_Notifiers));
memset(&BusDev_Client_Notifiers, 0, sizeof(BusDev_Client_Notifiers));
@@ -2391,7 +2391,7 @@ visorchipset_init(void)
spar_controlvm_channel_protocol_uuid);
if (SPAR_CONTROLVM_CHANNEL_OK_CLIENT(
visorchannel_get_header(ControlVm_channel))) {
- LOGINF("Channel %s (ControlVm) discovered",
+ pr_info("Channel %s (ControlVm) discovered",
visorchannel_id(ControlVm_channel, s));
initialize_controlvm_payload();
} else {
@@ -2431,7 +2431,7 @@ visorchipset_init(void)
goto Away;
}
if (visorchipset_disable_controlvm) {
- LOGINF("visorchipset_init:controlvm disabled");
+ pr_info("visorchipset_init:controlvm disabled");
} else {
/* if booting in a crash kernel */
if (visorchipset_crash_kernel)
@@ -2472,7 +2472,7 @@ visorchipset_init(void)
rc = -1;
goto Away;
}
- LOGINF("visorchipset device created");
+ pr_info("visorchipset device created");
POSTCODE_LINUX_2(CHIPSET_INIT_SUCCESS_PC, POSTCODE_SEVERITY_INFO);
rc = 0;
Away:
@@ -2514,13 +2514,13 @@ visorchipset_exit(void)
memset(&g_DelDumpMsgHdr, 0, sizeof(struct controlvm_message_header));
- LOGINF("Channel %s (ControlVm) disconnected",
+ pr_info("Channel %s (ControlVm) disconnected",
visorchannel_id(ControlVm_channel, s));
visorchannel_destroy(ControlVm_channel);
visorchipset_file_cleanup();
POSTCODE_LINUX_2(DRIVER_EXIT_PC, POSTCODE_SEVERITY_INFO);
- LOGINF("chipset driver unloaded");
+ pr_info("chipset driver unloaded");
}
module_param_named(testvnic, visorchipset_testvnic, int, S_IRUGO);
--
2.1.0
_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
