Skip to contentSkip to conversation

Address issues reported by static checkers

PATCH New Bart Van Assche 3 participants 6 messages Jun 20, 2016 NVMe

lore
Share & tools
lore

Bart Van Assche

author
#0 lore raw

cover Address issues reported by static checkers

Hello Keith,

The two patches in this series address warning messages reported by static source code analysis tool (gcc + W=1, smatch and checkpatch). It would be appreciated if you could have a look at these two patches.

Thanks,

Bart.

author
#1 lore raw

PATCH 1/2 nvme: Remove set-but-not-used variables

Detected these variables by building with W=1.

Signed-off-by Bart Van Assche <bart.vanassche at sandisk.com>
Cc Jens Axboe <axboe at fb.com>
Cc Christoph Hellwig <hch at lst.de>
Cc Sagi Grimberg <sagig at grimberg.me>
---
 drivers/nvme/host/scsi.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/nvme/host/scsi.c +1 -6
index e947e29..0fd9707 100644
@@ -1347,10 +1347,6 @@ static inline void nvme_trans_modesel_get_bd_len(u8 *parm_list, u8 cdb10,
 static void nvme_trans_modesel_save_bd(struct nvme_ns *ns, u8 *parm_list,
 					u16 idx, u16 bd_len, u8 llbaa)
 {
-	u16 bd_num;
-
-	bd_num = bd_len / ((llbaa == 0) ?
-			SHORT_DESC_BLOCK : LONG_DESC_BLOCK);
 	/* Store block descriptor info if a FORMAT UNIT comes later */
 	/* TODO Saving 1st BD info; what to do if multiple BD received? */
 	if (llbaa == 0) {

@@ -1595,7 +1591,7 @@ static int nvme_trans_fmt_send_cmd(struct nvme_ns *ns, struct sg_io_hdr *hdr,
 	int nvme_sc;
 	struct nvme_id_ns *id_ns;
 	u8 i;
-	u8 flbas, nlbaf;
+	u8 nlbaf;
 	u8 selected_lbaf = 0xFF;
 	u32 cdw10 = 0;
 	struct nvme_command c;

@@ -1606,7 +1602,6 @@ static int nvme_trans_fmt_send_cmd(struct nvme_ns *ns, struct sg_io_hdr *hdr,
 	if (res)
 		return res;
 
-	flbas = (id_ns->flbas) & 0x0F;
 	nlbaf = id_ns->nlbaf;
 
 	for (i = 0; i < nlbaf; i++) {
Signature · 1 line
2.8.4
maintainer
#2 lore raw

PATCH 1/2 nvme: Remove set-but-not-used variables

Looks good,

Reviewed-by Sagi Grimberg <sagi at grimberg.me>
author
#3 lore raw

PATCH 2/2 nvme: Make indentation consistent

In reply to Bart Van Assche

This patch avoids that smatch complains about inconsistent indentation and also that checkpatch complains about trailing whitespace. This patch does not change any functionality.

Signed-off-by Bart Van Assche <bart.vanassche at sandisk.com>
Cc Jens Axboe <axboe at fb.com>
Cc Christoph Hellwig <hch at lst.de>
Cc Sagi Grimberg <sagig at grimberg.me>
---
 drivers/nvme/host/pci.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/nvme/host/pci.c +6 -5
index befac5b..20b5c5c 100644
@@ -49,7 +49,7 @@
 #define NVME_AQ_DEPTH		256
 #define SQ_SIZE(depth)		(depth * sizeof(struct nvme_command))
 #define CQ_SIZE(depth)		(depth * sizeof(struct nvme_completion))
-		
+
 /*
  * We handle AEN commands ourselves and don't even let the
  * block layer know about them.

@@ -1927,10 +1927,11 @@ static int nvme_dev_map(struct nvme_dev *dev)
 	if (!dev->bar)
 		goto release;
 
-       return 0;
-  release:
-       pci_release_selected_regions(pdev, bars);
-       return -ENODEV;
+	return 0;
+
+release:
+	pci_release_selected_regions(pdev, bars);
+	return -ENODEV;
 }
 
 static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id)
Signature · 1 line
2.8.4
maintainer
#4 lore raw

PATCH 2/2 nvme: Make indentation consistent

Looks good,

Reviewed-by Sagi Grimberg <sagi at grimberg.me>
#5 lore raw

cover Address issues reported by static checkers

In reply to Bart Van Assche
Quoted 5 lines · Bart Van Assche

Hello Keith,

The two patches in this series address warning messages reported by static source code analysis tool (gcc + W=1, smatch and checkpatch). It would be appreciated if you could have a look at these two patches.

Thanks for the fixes, looks good.

Reviewed-by Keith Busch <keith.busch at intel.com>