Remove the DBGINF() group of logging macros and use pr_debug() instead. Fix
places that used the DBGINF() macro so they actually print the expected value,
because they were not being compiled at all before the switchover.
Signed-off-by: Ken Depro <kenneth.depro@xxxxxxxxxx>
Signed-off-by: Benjamin Romer <benjamin.romer@xxxxxxxxxx>
---
drivers/staging/unisys/include/timskmod.h | 2 --
drivers/staging/unisys/include/uniklog.h | 39 --------------------
drivers/staging/unisys/uislib/uislib.c | 8 ++---
drivers/staging/unisys/uislib/uisutils.c | 2 +-
drivers/staging/unisys/virthba/virthba.c | 57 +++++++++++++++---------------
drivers/staging/unisys/virtpci/virtpci.c | 41 ++++++++++-----------
drivers/staging/unisys/visorchipset/file.c | 18 +++++-----
7 files changed, 64 insertions(+), 103 deletions(-)
diff --git a/drivers/staging/unisys/include/timskmod.h b/drivers/staging/unisys/include/timskmod.h
index 7831dbc..3d563c4 100644
--- a/drivers/staging/unisys/include/timskmod.h
+++ b/drivers/staging/unisys/include/timskmod.h
@@ -91,14 +91,12 @@
#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 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)
-#define DEBUGDEV(devname, fmt, args...) DBGINFDEV(devname, 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 e94120b..edc12f0 100644
--- a/drivers/staging/unisys/include/uniklog.h
+++ b/drivers/staging/unisys/include/uniklog.h
@@ -26,45 +26,6 @@
#include <linux/printk.h>
/*
- * # DBGINF
- *
- * \brief Log debug informational message - log a LOG_INFO message only
- * if DEBUG compiletime option enabled
- *
- * \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
- *
- * Log a message at the LOG_INFO level, but only if DEBUG is enabled. If
- * DEBUG is disabled, this expands to a no-op.
- */
-
-/*
- * # DBGVER
- *
- * \brief Log debug verbose message - log a LOG_DEBUG message only if
- * DEBUG compiletime option enabled
- *
- * \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
- *
- * Log a message at the LOG_DEBUG level, but only if DEBUG is enabled. If
- * DEBUG is disabled, this expands to a no-op. Note also that LOG_DEBUG
- * messages can be enabled/disabled at runtime as well.
- */
-#define DBGINFDEV(devname, fmt, args...) do { } while (0)
-#define DBGVERDEV(devname, fmt, args...) do { } while (0)
-#define DBGINF(fmt, args...) do { } while (0)
-#define DBGVER(fmt, args...) do { } while (0)
-
-/*
* # LOGINF
*
* \brief Log informational message - logs a message at the LOG_INFO level
diff --git a/drivers/staging/unisys/uislib/uislib.c b/drivers/staging/unisys/uislib/uislib.c
index eb58449..d986fde 100644
--- a/drivers/staging/unisys/uislib/uislib.c
+++ b/drivers/staging/unisys/uislib/uislib.c
@@ -1161,7 +1161,7 @@ static ssize_t info_debugfs_read(struct file *file, char __user *buf,
/* *start = buf; */
if (debug_buf == NULL) {
- DBGINF("debug_buf == NULL; allocating buffer.\n.");
+ pr_debug("debug_buf == NULL; allocating buffer.\n.");
debug_buf = vmalloc(PROC_READ_BUFFER_SIZE);
if (debug_buf == NULL) {
@@ -1173,7 +1173,7 @@ static ssize_t info_debugfs_read(struct file *file, char __user *buf,
temp = debug_buf;
if ((*offset == 0) || (!debug_buf_valid)) {
- DBGINF("calling info_debugfs_read_helper.\n");
+ pr_debug("calling info_debugfs_read_helper.\n");
/* if the read fails, then -1 will be returned */
total_bytes = info_debugfs_read_helper(&temp, &remaining_bytes);
debug_buf_valid = 1;
@@ -1333,7 +1333,7 @@ static int process_incoming(void *v)
idle_cycles = idle_cycles + delta_cycles;
}
}
- DBGINF("exiting.\n");
+ pr_debug("exiting.\n");
complete_and_exit(&incoming_ti.has_stopped, 0);
}
@@ -1513,7 +1513,7 @@ uislib_mod_exit(void)
debugfs_remove(platformnumber_debugfs_read);
debugfs_remove(dir_debugfs);
- DBGINF("goodbye.\n");
+ pr_debug("goodbye.\n");
}
module_init(uislib_mod_init);
diff --git a/drivers/staging/unisys/uislib/uisutils.c b/drivers/staging/unisys/uislib/uisutils.c
index b4e5907..637cedc 100644
--- a/drivers/staging/unisys/uislib/uisutils.c
+++ b/drivers/staging/unisys/uislib/uisutils.c
@@ -53,7 +53,7 @@ uisutil_add_proc_line_ex(int *total, char **buffer, int *buffer_remaining,
va_list args;
int len;
- DBGINF("buffer = 0x%p : *buffer = 0x%p.\n", buffer, *buffer);
+ pr_debug("buffer = 0x%p : *buffer = 0x%p.\n", buffer, *buffer);
va_start(args, format);
len = vsnprintf(*buffer, *buffer_remaining, format, args);
if (len >= *buffer_remaining) {
diff --git a/drivers/staging/unisys/virthba/virthba.c b/drivers/staging/unisys/virthba/virthba.c
index a424f96..2decac4 100644
--- a/drivers/staging/unisys/virthba/virthba.c
+++ b/drivers/staging/unisys/virthba/virthba.c
@@ -26,7 +26,7 @@
* which start with an 8 digit sequence number, a colon, and then
* letters after that */
-#undef DBGINF
+#undef pr_debug
#include <linux/kernel.h>
#ifdef CONFIG_MODVERSIONS
@@ -479,7 +479,7 @@ virthba_probe(struct virtpci_dev *virtpcidev, const struct pci_device_id *id)
* initializatoin. The host is not published to the scsi
* midlayer until scsi_add_host is called.
*/
- DBGINF("calling scsi_host_alloc.\n");
+ pr_debug("calling scsi_host_alloc.\n");
/* arg 2 passed in length of extra space we want allocated
* with scsi_host struct for our own use scsi_host_alloc
@@ -490,7 +490,7 @@ virthba_probe(struct virtpci_dev *virtpcidev, const struct pci_device_id *id)
if (scsihost == NULL)
return -ENODEV;
- DBGINF("scsihost: 0x%p, scsihost->this_id: %d, host_no: %d.\n",
+ pr_debug("scsihost: 0x%p, scsihost->this_id: %d, host_no: %d.\n",
scsihost, scsihost->this_id, scsihost->host_no);
scsihost->this_id = UIS_MAGIC_VHBA;
@@ -524,7 +524,7 @@ virthba_probe(struct virtpci_dev *virtpcidev, const struct pci_device_id *id)
scsihost->can_queue, scsihost->cmd_per_lun, scsihost->max_sectors,
scsihost->sg_tablesize);
- DBGINF("calling scsi_add_host\n");
+ pr_debug("calling scsi_add_host\n");
/* this creates "host%d" in sysfs. If 2nd argument is NULL,
* then this generic /sys/devices/platform/host? device is
@@ -557,7 +557,7 @@ virthba_probe(struct virtpci_dev *virtpcidev, const struct pci_device_id *id)
virthbainfo->virtpcidev = virtpcidev;
spin_lock_init(&virthbainfo->chinfo.insertlock);
- DBGINF("generic_dev: 0x%p, queueinfo: 0x%p.\n",
+ pr_debug("generic_dev: 0x%p, queueinfo: 0x%p.\n",
&virtpcidev->generic_dev, &virtpcidev->queueinfo);
init_waitqueue_head(&virthbainfo->rsp_queue);
@@ -581,7 +581,7 @@ virthba_probe(struct virtpci_dev *virtpcidev, const struct pci_device_id *id)
ULTRA_IO_CHANNEL_IS_POLLING,
&virthbainfo->chinfo.queueinfo->chan->features);
/* start thread that will receive scsicmnd responses */
- DBGINF("starting rsp thread -- queueinfo: 0x%p, threadinfo: 0x%p.\n",
+ pr_debug("starting rsp thread -- queueinfo: 0x%p, threadinfo: 0x%p.\n",
virthbainfo->chinfo.queueinfo, &virthbainfo->chinfo.threadinfo);
pChannelHeader = virthbainfo->chinfo.queueinfo->chan;
@@ -632,9 +632,9 @@ virthba_probe(struct virtpci_dev *virtpcidev, const struct pci_device_id *id)
rsltq_wait_usecs = 4000000;
}
- DBGINF("calling scsi_scan_host.\n");
+ pr_debug("calling scsi_scan_host.\n");
scsi_scan_host(scsihost);
- DBGINF("return from scsi_scan_host.\n");
+ pr_debug("return from scsi_scan_host.\n");
LOGINF("virthba added scsihost:0x%p\n", scsihost);
POSTCODE_LINUX_2(VHBA_PROBE_EXIT_PC, POSTCODE_SEVERITY_INFO);
@@ -656,14 +656,14 @@ virthba_remove(struct virtpci_dev *virtpcidev)
LOGINF("Removing virtpcidev: 0x%p, virthbainfo: 0x%p\n", virtpcidev,
virthbainfo);
- DBGINF("removing scsihost: 0x%p, scsihost->this_id: %d\n", scsihost,
+ pr_debug("removing scsihost: 0x%p, scsihost->this_id: %d\n", scsihost,
scsihost->this_id);
scsi_remove_host(scsihost);
- DBGINF("stopping thread.\n");
+ pr_debug("stopping thread.\n");
uisthread_stop(&virthbainfo->chinfo.threadinfo);
- DBGINF("calling scsi_host_put\n");
+ pr_debug("calling scsi_host_put\n");
/* decr refcount on scsihost which was incremented by
* scsi_add_host so the scsi_host gets deleted
@@ -687,7 +687,7 @@ forward_vdiskmgmt_command(enum vdisk_mgmt_types vdiskcmdtype,
vdest->channel, vdest->id, vdest->lun);
if (virthbainfo->serverdown || virthbainfo->serverchangingstate) {
- DBGINF("Server is down/changing state. Returning Failure.\n");
+ pr_debug("Server is down/changing state. Returning Failure.\n");
return FAILED;
}
@@ -748,7 +748,7 @@ forward_taskmgmt_command(enum task_mgmt_types tasktype,
scsidev->channel, scsidev->id, scsidev->lun);
if (virthbainfo->serverdown || virthbainfo->serverchangingstate) {
- DBGINF("Server is down/changing state. Returning Failure.\n");
+ pr_debug("Server is down/changing state. Returning Failure.\n");
return FAILED;
}
@@ -892,7 +892,7 @@ virthba_get_info(struct Scsi_Host *shp)
static int
virthba_ioctl(struct scsi_device *dev, int cmd, void __user *arg)
{
- DBGINF("In virthba_ioctl: ioctl: cmd=0x%x\n", cmd);
+ pr_debug("In virthba_ioctl: ioctl: cmd=0x%x\n", cmd);
return -EINVAL;
}
@@ -917,7 +917,7 @@ virthba_queue_command_lck(struct scsi_cmnd *scsicmd,
int sg_failed = 0;
if (virthbainfo->serverdown || virthbainfo->serverchangingstate) {
- DBGINF("Server is down/changing state. Returning SCSI_MLQUEUE_DEVICE_BUSY.\n");
+ pr_debug("Server is down/changing state. Returning SCSI_MLQUEUE_DEVICE_BUSY.\n");
return SCSI_MLQUEUE_DEVICE_BUSY;
}
@@ -976,7 +976,7 @@ virthba_queue_command_lck(struct scsi_cmnd *scsicmd,
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",
+ pr_debug("No sg; buffer:0x%p bufflen:%d\n",
scsi_sglist(scsicmd), scsi_bufflen(scsicmd));
} else {
/* buffer is scatterlist - copy it out */
@@ -1189,7 +1189,7 @@ do_scsi_nolinuxstat(struct uiscmdrsp *cmdrsp, struct scsi_cmnd *scsicmd)
sg = scsi_sglist(scsicmd);
for (i = 0; i < scsi_sg_count(scsicmd); i++) {
- DBGVER("copying OUT OF buf into 0x%p %d\n",
+ pr_debug("copying OUT OF buf into 0x%p %d\n",
sg_page(sg + i), sg[i].length);
thispage_orig = kmap_atomic(sg_page(sg + i));
thispage = (void *) ((unsigned long)thispage_orig |
@@ -1221,7 +1221,8 @@ do_scsi_nolinuxstat(struct uiscmdrsp *cmdrsp, struct scsi_cmnd *scsicmd)
static void
complete_scsi_command(struct uiscmdrsp *cmdrsp, struct scsi_cmnd *scsicmd)
{
- DBGINF("cmdrsp: 0x%p, scsistat:0x%x.\n", cmdrsp, cmdrsp->scsi.scsistat);
+ pr_debug("cmdrsp: 0x%p, scsistat:0x%x.\n", cmdrsp,
+ cmdrsp->scsi.scsistat);
/* take what we need out of cmdrsp and complete the scsicmd */
scsicmd->result = cmdrsp->scsi.linuxstat;
@@ -1231,7 +1232,7 @@ complete_scsi_command(struct uiscmdrsp *cmdrsp, struct scsi_cmnd *scsicmd)
do_scsi_nolinuxstat(cmdrsp, scsicmd);
if (scsicmd->scsi_done) {
- DBGVER("Scsi_DONE\n");
+ pr_debug("Scsi_DONE\n");
scsicmd->scsi_done(scsicmd);
}
}
@@ -1349,7 +1350,7 @@ process_incoming_rsps(void *v)
kfree(cmdrsp);
- DBGINF("exiting processing incoming rsps.\n");
+ pr_debug("exiting processing incoming rsps.\n");
complete_and_exit(&dc->threadinfo.has_stopped, 0);
}
@@ -1471,11 +1472,11 @@ virthba_serverup(struct virtpci_dev *virtpcidev)
(struct virthba_info *) ((struct Scsi_Host *) virtpcidev->scsi.
scsihost)->hostdata;
- DBGINF("virtpcidev bus_no<<%d>>devNo<<%d>>", virtpcidev->bus_no,
+ pr_debug("virtpcidev bus_no<<%d>>devNo<<%d>>", virtpcidev->bus_no,
virtpcidev->device_no);
if (!virthbainfo->serverdown) {
- DBGINF("Server up message received while server is already up.\n");
+ pr_debug("Server up message received while server is already up.\n");
return 1;
}
if (virthbainfo->serverchangingstate) {
@@ -1536,7 +1537,7 @@ virthba_serverdown_complete(struct work_struct *work)
break;
case CMD_SCSITASKMGMT_TYPE:
cmdrsp = (struct uiscmdrsp *) pendingdel->sent;
- DBGINF("cmdrsp=0x%x, notify=0x%x\n", cmdrsp,
+ pr_debug("cmdrsp=0x%p, notify=0x%p\n", cmdrsp,
cmdrsp->scsitaskmgmt.notify);
*(int *) cmdrsp->scsitaskmgmt.notifyresult =
TASK_MGMT_FAILED;
@@ -1562,7 +1563,7 @@ virthba_serverdown_complete(struct work_struct *work)
virtpcidev = virthbainfo->virtpcidev;
- DBGINF("virtpcidev bus_no<<%d>>devNo<<%d>>", virtpcidev->bus_no,
+ pr_debug("virtpcidev bus_no<<%d>>devNo<<%d>>", virtpcidev->bus_no,
virtpcidev->device_no);
virthbainfo->serverdown = true;
virthbainfo->serverchangingstate = false;
@@ -1579,8 +1580,8 @@ virthba_serverdown(struct virtpci_dev *virtpcidev, u32 state)
(struct virthba_info *) ((struct Scsi_Host *) virtpcidev->scsi.
scsihost)->hostdata;
- DBGINF("virthba_serverdown");
- DBGINF("virtpcidev bus_no<<%d>>devNo<<%d>>", virtpcidev->bus_no,
+ pr_debug("virthba_serverdown");
+ pr_debug("virtpcidev bus_no<<%d>>devNo<<%d>>", virtpcidev->bus_no,
virtpcidev->device_no);
if (!virthbainfo->serverdown && !virthbainfo->serverchangingstate) {
@@ -1603,7 +1604,7 @@ virthba_serverdown(struct virtpci_dev *virtpcidev, u32 state)
static int __init
virthba_parse_line(char *str)
{
- DBGINF("In virthba_parse_line %s\n", str);
+ pr_debug("In virthba_parse_line %s\n", str);
return 1;
}
@@ -1620,7 +1621,7 @@ virthba_parse_options(char *line)
if (next != NULL)
*next++ = 0;
if (!virthba_parse_line(line))
- DBGINF("Unknown option '%s'\n", line);
+ pr_debug("Unknown option '%s'\n", line);
}
POSTCODE_LINUX_2(VHBA_CREATE_EXIT_PC, POSTCODE_SEVERITY_INFO);
diff --git a/drivers/staging/unisys/virtpci/virtpci.c b/drivers/staging/unisys/virtpci/virtpci.c
index eb73919..7432850 100644
--- a/drivers/staging/unisys/virtpci/virtpci.c
+++ b/drivers/staging/unisys/virtpci/virtpci.c
@@ -712,8 +712,8 @@ virtpci_match_device(const struct pci_device_id *ids,
const struct virtpci_dev *dev)
{
while (ids->vendor || ids->subvendor || ids->class_mask) {
- DBGINF("ids->vendor:%x dev->vendor:%x ids->device:%x dev->device:%x\n",
- ids->vendor, dev->vendor, ids->device, dev->device);
+ pr_debug("ids->vendor:%x dev->vendor:%x ids->device:%x dev->device:%x\n",
+ ids->vendor, dev->vendor, ids->device, dev->device);
if ((ids->vendor == dev->vendor) &&
(ids->device == dev->device))
@@ -735,20 +735,20 @@ static int virtpci_bus_match(struct device *dev, struct device_driver *drv)
struct virtpci_driver *virtpcidrv = driver_to_virtpci_driver(drv);
int match = 0;
- DBGINF("In virtpci_bus_match dev->bus_id:%s drv->name:%s\n",
- dev->bus_id, drv->name);
+ pr_debug("In virtpci_bus_match dev->bus->name:%s drv->name:%s\n",
+ dev->bus->name, drv->name);
/* check ids list for a match */
if (virtpci_match_device(virtpcidrv->id_table, virtpcidev))
match = 1;
- DBGINF("returning match:%d\n", match);
+ pr_debug("returning match:%d\n", match);
return match; /* 0 - no match; 1 - yes it matches */
}
static int virtpci_uevent(struct device *dev, struct kobj_uevent_env *env)
{
- DBGINF("In virtpci_hotplug\n");
+ pr_debug("In virtpci_hotplug\n");
/* add variables to the environment prior to the generation of
* hotplug events to user space
*/
@@ -759,13 +759,13 @@ static int virtpci_uevent(struct device *dev, struct kobj_uevent_env *env)
static int virtpci_device_suspend(struct device *dev, pm_message_t state)
{
- DBGINF("In virtpci_device_suspend -NYI ****\n");
+ pr_debug("In virtpci_device_suspend -NYI ****\n");
return 0;
}
static int virtpci_device_resume(struct device *dev)
{
- DBGINF("In virtpci_device_resume -NYI ****\n");
+ pr_debug("In virtpci_device_resume -NYI ****\n");
return 0;
}
@@ -892,10 +892,10 @@ static int virtpci_device_remove(struct device *dev_)
virtpcidev->mydriver = NULL;
}
- DBGINF("calling putdevice\n");
+ pr_debug("calling putdevice\n");
put_device(dev_);
- DBGINF("Leaving\n");
+ pr_debug("Leaving\n");
return 0;
}
@@ -908,7 +908,7 @@ static void virtpci_bus_release(struct device *dev)
/* this function is called when the last reference to the
* device is removed
*/
- DBGINF("In virtpci_bus_release\n");
+ pr_debug("In virtpci_bus_release\n");
/* what else is supposed to happen here? */
}
@@ -1039,8 +1039,8 @@ static int virtpci_device_add(struct device *parentbus, int devtype,
* list. Otherwise, a device_unregister from this function can
* cause a "scheduling while atomic".
*/
- DBGINF("registering device:%p with bus_id:%s\n",
- &virtpcidev->generic_dev, virtpcidev->generic_dev.bus_id);
+ pr_debug("registering device:%p with bus name:%s\n",
+ &virtpcidev->generic_dev, virtpcidev->generic_dev.bus->name);
ret = device_register(&virtpcidev->generic_dev);
/* NOTE: THIS IS CALLING HOTPLUG virtpci_hotplug!!!
* This call to device_register results in virtpci_bus_match
@@ -1344,7 +1344,7 @@ static ssize_t virtpci_driver_attr_show(struct kobject *kobj,
else
driver = NULL;
- DBGINF("In virtpci_driver_attr_show driver->name:%s\n", driver->name);
+ pr_debug("In virtpci_driver_attr_show driver->name:%s\n", driver->name);
if (driver) {
if (dattr->show)
ret = dattr->show(driver, buf);
@@ -1367,7 +1367,8 @@ static ssize_t virtpci_driver_attr_store(struct kobject *kobj,
else
driver = NULL;
- DBGINF("In virtpci_driver_attr_store driver->name:%s\n", driver->name);
+ pr_debug("In virtpci_driver_attr_store driver->name:%s\n",
+ driver->name);
if (driver) {
if (dattr->store)
@@ -1381,7 +1382,7 @@ int virtpci_register_driver(struct virtpci_driver *drv)
{
int result = 0;
- DBGINF("In virtpci_register_driver\n");
+ pr_debug("In virtpci_register_driver\n");
if (drv->id_table == NULL) {
pr_err("id_table missing\n");
@@ -1415,7 +1416,7 @@ EXPORT_SYMBOL_GPL(virtpci_register_driver);
void virtpci_unregister_driver(struct virtpci_driver *drv)
{
- DBGINF("In virtpci_unregister_driver drv:%p\n", drv);
+ pr_debug("In virtpci_unregister_driver drv:%p\n", drv);
driver_unregister(&drv->core_driver);
/* driver_unregister calls bus_remove_driver
* bus_remove_driver calls device_detach
@@ -1425,7 +1426,7 @@ void virtpci_unregister_driver(struct virtpci_driver *drv)
* virtpci_device_remove
* virtpci_device_remove calls virthba_remove
*/
- DBGINF("Leaving\n");
+ pr_debug("Leaving\n");
}
EXPORT_SYMBOL_GPL(virtpci_unregister_driver);
@@ -1538,7 +1539,7 @@ static int __init virtpci_mod_init(void)
POSTCODE_SEVERITY_ERR);
return ret;
}
- DBGINF("bus_register successful\n");
+ pr_debug("bus_register successful\n");
bus_device_info_init(&bus_driver_info, "clientbus", "virtpci",
VERSION, NULL);
@@ -1551,7 +1552,7 @@ static int __init virtpci_mod_init(void)
POSTCODE_SEVERITY_ERR);
return ret;
}
- DBGINF("device_register successful ret:%x\n", ret);
+ pr_debug("device_register successful ret:%x\n", ret);
if (!uisctrl_register_req_handler(2, (void *)&virtpci_ctrlchan_func,
&chipset_driver_info)) {
diff --git a/drivers/staging/unisys/visorchipset/file.c b/drivers/staging/unisys/visorchipset/file.c
index 24ffd92..aca0be0 100644
--- a/drivers/staging/unisys/visorchipset/file.c
+++ b/drivers/staging/unisys/visorchipset/file.c
@@ -105,7 +105,7 @@ visorchipset_open(struct inode *inode, struct file *file)
{
unsigned minor_number = iminor(inode);
- DEBUGDRV("%s", __func__);
+ pr_debug("%s", __func__);
if (minor_number != 0)
return -ENODEV;
file->private_data = NULL;
@@ -115,7 +115,7 @@ visorchipset_open(struct inode *inode, struct file *file)
static int
visorchipset_release(struct inode *inode, struct file *file)
{
- DEBUGDRV("%s", __func__);
+ pr_debug("%s", __func__);
return 0;
}
@@ -127,7 +127,7 @@ visorchipset_mmap(struct file *file, struct vm_area_struct *vma)
GUEST_PHYSICAL_ADDRESS addr = 0;
/* sv_enable_dfp(); */
- DEBUGDRV("%s", __func__);
+ pr_debug("%s", __func__);
if (offset & (PAGE_SIZE - 1)) {
pr_err("%s virtual address NOT page-aligned!", __func__);
return -ENXIO; /* need aligned offsets */
@@ -148,7 +148,7 @@ visorchipset_mmap(struct file *file, struct vm_area_struct *vma)
return -ENXIO;
}
physaddr = (ulong)addr;
- DEBUGDRV("mapping physical address = 0x%lx", physaddr);
+ pr_debug("mapping physical address = 0x%lx", physaddr);
if (remap_pfn_range(vma, vma->vm_start,
physaddr >> PAGE_SHIFT,
vma->vm_end - vma->vm_start,
@@ -161,7 +161,7 @@ visorchipset_mmap(struct file *file, struct vm_area_struct *vma)
default:
return -ENOSYS;
}
- DEBUGDRV("%s success!", __func__);
+ pr_debug("%s success!", __func__);
return 0;
}
@@ -170,7 +170,7 @@ long visorchipset_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
s64 adjustment;
s64 vrtc_offset;
- DBGINF("entered visorchipset_ioctl, cmd=%d", cmd);
+ pr_debug("entered visorchipset_ioctl, cmd=%d", cmd);
switch (cmd) {
case VMCALL_QUERY_GUEST_VIRTUAL_TIME_OFFSET:
/* get the physical rtc offset */
@@ -179,7 +179,7 @@ long visorchipset_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
((void __user *)arg, &vrtc_offset, sizeof(vrtc_offset))) {
return -EFAULT;
}
- DBGINF("insde visorchipset_ioctl, cmd=%d, vrtc_offset=%lld",
+ pr_debug("insde visorchipset_ioctl, cmd=%d, vrtc_offset=%lld",
cmd, vrtc_offset);
return SUCCESS;
case VMCALL_UPDATE_PHYSICAL_TIME:
@@ -187,8 +187,8 @@ long visorchipset_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
(&adjustment, (void __user *)arg, sizeof(adjustment))) {
return -EFAULT;
}
- DBGINF("insde visorchipset_ioctl, cmd=%d, adjustment=%lld", cmd,
- adjustment);
+ pr_debug("insde visorchipset_ioctl, cmd=%d, adjustment=%lld",
+ cmd, adjustment);
return issue_vmcall_update_physical_time(adjustment);
default:
pr_err("visorchipset_ioctl received invalid command");
--
2.1.0
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
