Skip to content

Commit

Permalink
staging/rts_pstor: Use pr_ or dev_ printks in rtsx.c
Browse files Browse the repository at this point in the history 
fixed some checkpatch warnings.
-WARNING: Prefer pr_info(... to printk(KERN_INFO, ...
-WARNING: Prefer pr_err(... to printk(KERN_ERR, ...
-WARNING: quoted string split across lines

And added pr_fmt.

Signed-off-by: Toshiaki Yamane <yamanetoshi@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Toshiaki Yamane authored and Greg Kroah-Hartman committed Sep 17, 2012
1 parent 7c01432 commit d084610
Showing 1 changed file with 57 additions and 49 deletions.
106 changes: 57 additions & 49 deletions drivers/staging/rts_pstor/rtsx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
* No. 450, Shenhu Road, Suzhou Industry Park, Suzhou, China
*/

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#include <linux/blkdev.h>
#include <linux/kthread.h>
#include <linux/sched.h>
Expand Down Expand Up @@ -170,14 +172,14 @@ static int queuecommand_lck(struct scsi_cmnd *srb,

/* check for state-transition errors */
if (chip->srb != NULL) {
printk(KERN_ERR "Error in %s: chip->srb = %p\n",
dev_err(&dev->pci->dev, "Error in %s: chip->srb = %p\n",
__func__, chip->srb);
return SCSI_MLQUEUE_HOST_BUSY;
}

/* fail the command if we are disconnecting */
if (rtsx_chk_stat(chip, RTSX_STAT_DISCONNECT)) {
printk(KERN_INFO "Fail command during disconnect\n");
dev_info(&dev->pci->dev, "Fail command during disconnect\n");
srb->result = DID_NO_CONNECT << 16;
done(srb);
return 0;
Expand All @@ -204,14 +206,14 @@ static int command_abort(struct scsi_cmnd *srb)
struct rtsx_dev *dev = host_to_rtsx(host);
struct rtsx_chip *chip = dev->chip;

printk(KERN_INFO "%s called\n", __func__);
dev_info(&dev->pci->dev, "%s called\n", __func__);

scsi_lock(host);

/* Is this command still active? */
if (chip->srb != srb) {
scsi_unlock(host);
printk(KERN_INFO "-- nothing to abort\n");
dev_info(&dev->pci->dev, "-- nothing to abort\n");
return FAILED;
}

Expand All @@ -230,8 +232,9 @@ static int command_abort(struct scsi_cmnd *srb)
static int device_reset(struct scsi_cmnd *srb)
{
int result = 0;
struct rtsx_dev *dev = host_to_rtsx(srb->device->host);

printk(KERN_INFO "%s called\n", __func__);
dev_info(&dev->pci->dev, "%s called\n", __func__);

return result < 0 ? FAILED : SUCCESS;
}
Expand All @@ -240,8 +243,9 @@ static int device_reset(struct scsi_cmnd *srb)
static int bus_reset(struct scsi_cmnd *srb)
{
int result = 0;
struct rtsx_dev *dev = host_to_rtsx(srb->device->host);

printk(KERN_INFO "%s called\n", __func__);
dev_info(&dev->pci->dev, "%s called\n", __func__);

return result < 0 ? FAILED : SUCCESS;
}
Expand Down Expand Up @@ -303,14 +307,15 @@ static int rtsx_acquire_irq(struct rtsx_dev *dev)
{
struct rtsx_chip *chip = dev->chip;

printk(KERN_INFO "%s: chip->msi_en = %d, pci->irq = %d\n",
__func__, chip->msi_en, dev->pci->irq);
dev_info(&dev->pci->dev, "%s: chip->msi_en = %d, pci->irq = %d\n",
__func__, chip->msi_en, dev->pci->irq);

if (request_irq(dev->pci->irq, rtsx_interrupt,
chip->msi_en ? 0 : IRQF_SHARED,
CR_DRIVER_NAME, dev)) {
printk(KERN_ERR "rtsx: unable to grab IRQ %d, "
"disabling device\n", dev->pci->irq);
dev_err(&dev->pci->dev,
"rtsx: unable to grab IRQ %d, disabling device\n",
dev->pci->irq);
return -1;
}

Expand Down Expand Up @@ -347,10 +352,10 @@ static int rtsx_suspend(struct pci_dev *pci, pm_message_t state)
struct rtsx_dev *dev = (struct rtsx_dev *)pci_get_drvdata(pci);
struct rtsx_chip *chip;

printk(KERN_INFO "Ready to suspend\n");
dev_info(&dev->pci->dev, "Ready to suspend\n");

if (!dev) {
printk(KERN_ERR "Invalid memory\n");
dev_err(&dev->pci->dev, "Invalid memory\n");
return 0;
}

Expand Down Expand Up @@ -386,10 +391,10 @@ static int rtsx_resume(struct pci_dev *pci)
struct rtsx_dev *dev = (struct rtsx_dev *)pci_get_drvdata(pci);
struct rtsx_chip *chip;

printk(KERN_INFO "Ready to resume\n");
dev_info(&dev->pci->dev, "Ready to resume\n");

if (!dev) {
printk(KERN_ERR "Invalid memory\n");
dev_err(&dev->pci->dev, "Invalid memory\n");
return 0;
}

Expand All @@ -401,8 +406,9 @@ static int rtsx_resume(struct pci_dev *pci)
pci_set_power_state(pci, PCI_D0);
pci_restore_state(pci);
if (pci_enable_device(pci) < 0) {
printk(KERN_ERR "%s: pci_enable_device failed, "
"disabling device\n", CR_DRIVER_NAME);
dev_err(&dev->pci->dev,
"%s: pci_enable_device failed, disabling device\n",
CR_DRIVER_NAME);
/* unlock the device pointers */
mutex_unlock(&dev->dev_mutex);
return -EIO;
Expand Down Expand Up @@ -435,10 +441,10 @@ static void rtsx_shutdown(struct pci_dev *pci)
struct rtsx_dev *dev = (struct rtsx_dev *)pci_get_drvdata(pci);
struct rtsx_chip *chip;

printk(KERN_INFO "Ready to shutdown\n");
dev_info(&dev->pci->dev, "Ready to shutdown\n");

if (!dev) {
printk(KERN_ERR "Invalid memory\n");
dev_err(&dev->pci->dev, "Invalid memory\n");
return;
}

Expand Down Expand Up @@ -475,7 +481,7 @@ static int rtsx_control_thread(void *__dev)

/* if the device has disconnected, we are free to exit */
if (rtsx_chk_stat(chip, RTSX_STAT_DISCONNECT)) {
printk(KERN_INFO "-- rtsx-control exiting\n");
dev_info(&dev->pci->dev, "-- rtsx-control exiting\n");
mutex_unlock(&dev->dev_mutex);
break;
}
Expand All @@ -495,22 +501,22 @@ static int rtsx_control_thread(void *__dev)
* is UNKNOWN
*/
if (chip->srb->sc_data_direction == DMA_BIDIRECTIONAL) {
printk(KERN_ERR "UNKNOWN data direction\n");
dev_err(&dev->pci->dev, "UNKNOWN data direction\n");
chip->srb->result = DID_ERROR << 16;
}

/* reject if target != 0 or if LUN is higher than
* the maximum known LUN
*/
else if (chip->srb->device->id) {
printk(KERN_ERR "Bad target number (%d:%d)\n",
dev_err(&dev->pci->dev, "Bad target number (%d:%d)\n",
chip->srb->device->id,
chip->srb->device->lun);
chip->srb->result = DID_BAD_TARGET << 16;
}

else if (chip->srb->device->lun > chip->max_lun) {
printk(KERN_ERR "Bad LUN (%d:%d)\n",
dev_err(&dev->pci->dev, "Bad LUN (%d:%d)\n",
chip->srb->device->id,
chip->srb->device->lun);
chip->srb->result = DID_BAD_TARGET << 16;
Expand All @@ -534,7 +540,7 @@ static int rtsx_control_thread(void *__dev)
chip->srb->scsi_done(chip->srb);
} else {
SkipForAbort:
printk(KERN_ERR "scsi command aborted\n");
dev_err(&dev->pci->dev, "scsi command aborted\n");
}

if (rtsx_chk_stat(chip, RTSX_STAT_ABORT)) {
Expand Down Expand Up @@ -594,7 +600,7 @@ static int rtsx_polling_thread(void *__dev)

/* if the device has disconnected, we are free to exit */
if (rtsx_chk_stat(chip, RTSX_STAT_DISCONNECT)) {
printk(KERN_INFO "-- rtsx-polling exiting\n");
dev_info(&dev->pci->dev, "-- rtsx-polling exiting\n");
mutex_unlock(&dev->dev_mutex);
break;
}
Expand Down Expand Up @@ -683,13 +689,13 @@ static irqreturn_t rtsx_interrupt(int irq, void *dev_id)
/* Release all our dynamic resources */
static void rtsx_release_resources(struct rtsx_dev *dev)
{
printk(KERN_INFO "-- %s\n", __func__);
dev_info(&dev->pci->dev, "-- %s\n", __func__);

/* Tell the control thread to exit. The SCSI host must
* already have been removed so it won't try to queue
* any more commands.
*/
printk(KERN_INFO "-- sending exit command to thread\n");
dev_info(&dev->pci->dev, "-- sending exit command to thread\n");
complete(&dev->cmnd_ready);
if (dev->ctl_thread)
wait_for_completion(&dev->control_exit);
Expand Down Expand Up @@ -774,8 +780,9 @@ static int rtsx_scan_thread(void *__dev)

/* Wait for the timeout to expire or for a disconnect */
if (delay_use > 0) {
printk(KERN_INFO "%s: waiting for device "
"to settle before scanning\n", CR_DRIVER_NAME);
dev_info(&dev->pci->dev,
"%s: waiting for device to settle before scanning\n",
CR_DRIVER_NAME);
wait_event_interruptible_timeout(dev->delay_wait,
rtsx_chk_stat(chip, RTSX_STAT_DISCONNECT),
delay_use * HZ);
Expand All @@ -784,7 +791,8 @@ static int rtsx_scan_thread(void *__dev)
/* If the device is still connected, perform the scanning */
if (!rtsx_chk_stat(chip, RTSX_STAT_DISCONNECT)) {
scsi_scan_host(rtsx_to_host(dev));
printk(KERN_INFO "%s: device scan complete\n", CR_DRIVER_NAME);
dev_info(&dev->pci->dev, "%s: device scan complete\n",
CR_DRIVER_NAME);

/* Should we unbind if no devices were detected? */
}
Expand Down Expand Up @@ -906,14 +914,14 @@ static int __devinit rtsx_probe(struct pci_dev *pci,

err = pci_enable_device(pci);
if (err < 0) {
printk(KERN_ERR "PCI enable device failed!\n");
dev_err(&pci->dev, "PCI enable device failed!\n");
return err;
}

err = pci_request_regions(pci, CR_DRIVER_NAME);
if (err < 0) {
printk(KERN_ERR "PCI request regions for %s failed!\n",
CR_DRIVER_NAME);
dev_err(&pci->dev, "PCI request regions for %s failed!\n",
CR_DRIVER_NAME);
pci_disable_device(pci);
return err;
}
Expand All @@ -924,7 +932,7 @@ static int __devinit rtsx_probe(struct pci_dev *pci,
*/
host = scsi_host_alloc(&rtsx_host_template, sizeof(*dev));
if (!host) {
printk(KERN_ERR "Unable to allocate the scsi host\n");
dev_err(&pci->dev, "Unable to allocate the scsi host\n");
pci_release_regions(pci);
pci_disable_device(pci);
return -ENOMEM;
Expand All @@ -949,12 +957,12 @@ static int __devinit rtsx_probe(struct pci_dev *pci,
dev->pci = pci;
dev->irq = -1;

printk(KERN_INFO "Resource length: 0x%x\n",
(unsigned int)pci_resource_len(pci, 0));
dev_info(&pci->dev, "Resource length: 0x%x\n",
(unsigned int)pci_resource_len(pci, 0));
dev->addr = pci_resource_start(pci, 0);
dev->remap_addr = ioremap_nocache(dev->addr, pci_resource_len(pci, 0));
if (dev->remap_addr == NULL) {
printk(KERN_ERR "ioremap error\n");
dev_err(&pci->dev, "ioremap error\n");
err = -ENXIO;
goto errout;
}
Expand All @@ -963,13 +971,13 @@ static int __devinit rtsx_probe(struct pci_dev *pci,
* Using "unsigned long" cast here to eliminate gcc warning in
* 64-bit system
*/
printk(KERN_INFO "Original address: 0x%lx, remapped address: 0x%lx\n",
(unsigned long)(dev->addr), (unsigned long)(dev->remap_addr));
dev_info(&pci->dev, "Original address: 0x%lx, remapped address: 0x%lx\n",
(unsigned long)(dev->addr), (unsigned long)(dev->remap_addr));

dev->rtsx_resv_buf = dma_alloc_coherent(&(pci->dev), RTSX_RESV_BUF_LEN,
&(dev->rtsx_resv_buf_addr), GFP_KERNEL);
if (dev->rtsx_resv_buf == NULL) {
printk(KERN_ERR "alloc dma buffer fail\n");
dev_err(&pci->dev, "alloc dma buffer fail\n");
err = -ENXIO;
goto errout;
}
Expand All @@ -983,7 +991,7 @@ static int __devinit rtsx_probe(struct pci_dev *pci,

rtsx_init_options(dev->chip);

printk(KERN_INFO "pci->irq = %d\n", pci->irq);
dev_info(&pci->dev, "pci->irq = %d\n", pci->irq);

if (dev->chip->msi_en) {
if (pci_enable_msi(pci) < 0)
Expand All @@ -1008,22 +1016,22 @@ static int __devinit rtsx_probe(struct pci_dev *pci,
/* Start up our control thread */
th = kthread_run(rtsx_control_thread, dev, CR_DRIVER_NAME);
if (IS_ERR(th)) {
printk(KERN_ERR "Unable to start control thread\n");
dev_err(&pci->dev, "Unable to start control thread\n");
err = PTR_ERR(th);
goto errout;
}
dev->ctl_thread = th;

err = scsi_add_host(host, &pci->dev);
if (err) {
printk(KERN_ERR "Unable to add the scsi host\n");
dev_err(&pci->dev, "Unable to add the scsi host\n");
goto errout;
}

/* Start up the thread for delayed SCSI-device scanning */
th = kthread_run(rtsx_scan_thread, dev, "rtsx-scan");
if (IS_ERR(th)) {
printk(KERN_ERR "Unable to start the device-scanning thread\n");
dev_err(&pci->dev, "Unable to start the device-scanning thread\n");
complete(&dev->scanning_done);
quiesce_and_remove_host(dev);
err = PTR_ERR(th);
Expand All @@ -1033,7 +1041,7 @@ static int __devinit rtsx_probe(struct pci_dev *pci,
/* Start up the thread for polling thread */
th = kthread_run(rtsx_polling_thread, dev, "rtsx-polling");
if (IS_ERR(th)) {
printk(KERN_ERR "Unable to start the device-polling thread\n");
dev_err(&pci->dev, "Unable to start the device-polling thread\n");
quiesce_and_remove_host(dev);
err = PTR_ERR(th);
goto errout;
Expand All @@ -1046,7 +1054,7 @@ static int __devinit rtsx_probe(struct pci_dev *pci,

/* We come here if there are any problems */
errout:
printk(KERN_ERR "rtsx_probe() failed\n");
dev_err(&pci->dev, "rtsx_probe() failed\n");
release_everything(dev);

return err;
Expand All @@ -1057,7 +1065,7 @@ static void __devexit rtsx_remove(struct pci_dev *pci)
{
struct rtsx_dev *dev = (struct rtsx_dev *)pci_get_drvdata(pci);

printk(KERN_INFO "rtsx_remove() called\n");
dev_info(&pci->dev, "rtsx_remove() called\n");

quiesce_and_remove_host(dev);
release_everything(dev);
Expand Down Expand Up @@ -1090,18 +1098,18 @@ static struct pci_driver driver = {

static int __init rtsx_init(void)
{
printk(KERN_INFO "Initializing Realtek PCIE storage driver...\n");
pr_info("Initializing Realtek PCIE storage driver...\n");

return pci_register_driver(&driver);
}

static void __exit rtsx_exit(void)
{
printk(KERN_INFO "rtsx_exit() called\n");
pr_info("rtsx_exit() called\n");

pci_unregister_driver(&driver);

printk(KERN_INFO "%s module exit\n", CR_DRIVER_NAME);
pr_info("%s module exit\n", CR_DRIVER_NAME);
}

module_init(rtsx_init)
Expand Down

0 comments on commit d084610

Please sign in to comment.