iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

skd: Remove unnecessary blank lines

Browse Source 
This patch does not change any functionality but makes the skd
driver source code more uniform with that of other kernel drivers.

Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Hannes Reinecke <hare@suse.de>
Cc: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Bart Van Assche 2017-08-17 13:12:51 -07:00 committed by Jens Axboe
parent c7eebcb0f6
commit 5477e1b51e
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/block/skd_main.c
View File

@ -333,7 +333,6 @@ struct skd_device {
u32 timo_slot; u32 timo_slot;
struct work_struct completion_worker; struct work_struct completion_worker;
}; };
@ -694,7 +693,6 @@ static void skd_request_fn(struct request_queue *q)
if (flush == SKD_FLUSH_ZERO_SIZE_FIRST) { if (flush == SKD_FLUSH_ZERO_SIZE_FIRST) {
skd_prep_zerosize_flush_cdb(scsi_req, skreq); skd_prep_zerosize_flush_cdb(scsi_req, skreq);
SKD_ASSERT(skreq->flush_cmd == 1); SKD_ASSERT(skreq->flush_cmd == 1);
} else { } else {
skd_prep_rw_cdb(scsi_req, data_dir, lba, count); skd_prep_rw_cdb(scsi_req, data_dir, lba, count);
} }
@ -2004,16 +2002,14 @@ static void skd_complete_internal(struct skd_device *skdev,
skd_send_internal_skspcl(skdev, skspcl, skd_send_internal_skspcl(skdev, skspcl,
READ_CAPACITY); READ_CAPACITY);
else { else {
pr_err( pr_err("(%s):*** W/R Buffer mismatch %d ***\n",
"(%s):*** W/R Buffer mismatch %d ***\n",
skd_name(skdev), skdev->connect_retries); skd_name(skdev), skdev->connect_retries);
if (skdev->connect_retries < if (skdev->connect_retries <
SKD_MAX_CONNECT_RETRIES) { SKD_MAX_CONNECT_RETRIES) {
skdev->connect_retries++; skdev->connect_retries++;
skd_soft_reset(skdev); skd_soft_reset(skdev);
} else { } else {
pr_err( pr_err("(%s): W/R Buffer Connect Error\n",
"(%s): W/R Buffer Connect Error\n",
skd_name(skdev)); skd_name(skdev));
return; return;
} }
@ -2621,7 +2617,6 @@ static void skd_process_scsi_inq(struct skd_device *skdev,
skd_do_driver_inq(skdev, skcomp, skerr, scsi_req->cdb, buf); skd_do_driver_inq(skdev, skcomp, skerr, scsi_req->cdb, buf);
} }
static int skd_isr_completion_posted(struct skd_device *skdev, static int skd_isr_completion_posted(struct skd_device *skdev,
int limit, int *enqueued) int limit, int *enqueued)
{ {
@ -3083,8 +3078,7 @@ static void skd_isr_fwstate(struct skd_device *skdev)
skdev->cur_max_queue_depth * 2 / 3 + 1; skdev->cur_max_queue_depth * 2 / 3 + 1;
if (skdev->queue_low_water_mark < 1) if (skdev->queue_low_water_mark < 1)
skdev->queue_low_water_mark = 1; skdev->queue_low_water_mark = 1;
pr_info( pr_info("(%s): Queue depth limit=%d dev=%d lowat=%d\n",
"(%s): Queue depth limit=%d dev=%d lowat=%d\n",
skd_name(skdev), skd_name(skdev),
skdev->cur_max_queue_depth, skdev->cur_max_queue_depth,
skdev->dev_max_queue_depth, skdev->queue_low_water_mark); skdev->dev_max_queue_depth, skdev->queue_low_water_mark);
@ -4553,7 +4547,6 @@ static void skd_destruct(struct skd_device *skdev)
if (skdev == NULL) if (skdev == NULL)
return; return;
pr_debug("%s:%s:%d disk\n", skdev->name, __func__, __LINE__); pr_debug("%s:%s:%d disk\n", skdev->name, __func__, __LINE__);
skd_free_disk(skdev); skd_free_disk(skdev);
@ -4617,7 +4610,6 @@ static const struct block_device_operations skd_blockdev_ops = {
.getgeo = skd_bdev_getgeo, .getgeo = skd_bdev_getgeo,
}; };
/* /*
***************************************************************************** *****************************************************************************
* PCIe DRIVER GLUE * PCIe DRIVER GLUE
@ -4716,14 +4708,12 @@ static int skd_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
pci_set_master(pdev); pci_set_master(pdev);
rc = pci_enable_pcie_error_reporting(pdev); rc = pci_enable_pcie_error_reporting(pdev);
if (rc) { if (rc) {
pr_err( pr_err("(%s): bad enable of PCIe error reporting rc=%d\n",
"(%s): bad enable of PCIe error reporting rc=%d\n",
skd_name(skdev), rc); skd_name(skdev), rc);
skdev->pcie_error_reporting_is_enabled = 0; skdev->pcie_error_reporting_is_enabled = 0;
} else } else
skdev->pcie_error_reporting_is_enabled = 1; skdev->pcie_error_reporting_is_enabled = 1;
pci_set_drvdata(pdev, skdev); pci_set_drvdata(pdev, skdev);
for (i = 0; i < SKD_MAX_BARS; i++) { for (i = 0; i < SKD_MAX_BARS; i++) {
@ -4768,8 +4758,7 @@ static int skd_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
} else { } else {
/* we timed out, something is wrong with the device, /* we timed out, something is wrong with the device,
don't add the disk structure */ don't add the disk structure */
pr_err( pr_err("(%s): error: waiting for s1120 timed out %d!\n",
"(%s): error: waiting for s1120 timed out %d!\n",
skd_name(skdev), rc); skd_name(skdev), rc);
/* in case of no error; we timeout with ENXIO */ /* in case of no error; we timeout with ENXIO */
if (!rc) if (!rc)