linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Matias Bjørling" <m@bjorling.me>
To: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, axboe@fb.com
Cc: "Sagi Grimberg" <sagi@grimberg.me>, "Matias Bjørling" <m@bjorling.me>
Subject: [PATCH 21/28] nvme/lightnvm: Log using the ctrl named device
Date: Fri,  6 May 2016 20:03:14 +0200	[thread overview]
Message-ID: <1462557801-24974-22-git-send-email-m@bjorling.me> (raw)
In-Reply-To: <1462557801-24974-1-git-send-email-m@bjorling.me>

From: Sagi Grimberg <sagi@grimberg.me>

Align with the rest of the nvme subsystem.

Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Matias Bjørling <m@bjorling.me>
---
 drivers/nvme/host/lightnvm.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/drivers/nvme/host/lightnvm.c b/drivers/nvme/host/lightnvm.c
index 8461f5a..fadeb54 100644
--- a/drivers/nvme/host/lightnvm.c
+++ b/drivers/nvme/host/lightnvm.c
@@ -367,8 +367,8 @@ static int nvme_nvm_get_l2p_tbl(struct nvm_dev *nvmdev, u64 slba, u32 nlb,
 		ret = nvme_submit_sync_cmd(ns->ctrl->admin_q,
 				(struct nvme_command *)&c, entries, len);
 		if (ret) {
-			dev_err(ns->ctrl->dev, "L2P table transfer failed (%d)\n",
-									ret);
+			dev_err(ns->ctrl->device,
+				"L2P table transfer failed (%d)\n", ret);
 			ret = -EIO;
 			goto out;
 		}
@@ -410,27 +410,28 @@ static int nvme_nvm_get_bb_tbl(struct nvm_dev *nvmdev, struct ppa_addr ppa,
 	ret = nvme_submit_sync_cmd(ctrl->admin_q, (struct nvme_command *)&c,
 								bb_tbl, tblsz);
 	if (ret) {
-		dev_err(ctrl->dev, "get bad block table failed (%d)\n", ret);
+		dev_err(ctrl->device, "get bad block table failed (%d)\n", ret);
 		ret = -EIO;
 		goto out;
 	}
 
 	if (bb_tbl->tblid[0] != 'B' || bb_tbl->tblid[1] != 'B' ||
 		bb_tbl->tblid[2] != 'L' || bb_tbl->tblid[3] != 'T') {
-		dev_err(ctrl->dev, "bbt format mismatch\n");
+		dev_err(ctrl->device, "bbt format mismatch\n");
 		ret = -EINVAL;
 		goto out;
 	}
 
 	if (le16_to_cpu(bb_tbl->verid) != 1) {
 		ret = -EINVAL;
-		dev_err(ctrl->dev, "bbt version not supported\n");
+		dev_err(ctrl->device, "bbt version not supported\n");
 		goto out;
 	}
 
 	if (le32_to_cpu(bb_tbl->tblks) != nr_blks) {
 		ret = -EINVAL;
-		dev_err(ctrl->dev, "bbt unsuspected blocks returned (%u!=%u)",
+		dev_err(ctrl->device,
+				"bbt unsuspected blocks returned (%u!=%u)",
 				le32_to_cpu(bb_tbl->tblks), nr_blks);
 		goto out;
 	}
@@ -457,7 +458,8 @@ static int nvme_nvm_set_bb_tbl(struct nvm_dev *nvmdev, struct ppa_addr *ppas,
 	ret = nvme_submit_sync_cmd(ns->ctrl->admin_q, (struct nvme_command *)&c,
 								NULL, 0);
 	if (ret)
-		dev_err(ns->ctrl->dev, "set bad block table failed (%d)\n", ret);
+		dev_err(ns->ctrl->device, "set bad block table failed (%d)\n",
+									ret);
 	return ret;
 }
 
-- 
2.1.4

  parent reply	other threads:[~2016-05-06 18:08 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-06 18:02 [PATCH 00/28] LightNVM fixes for 4.7 Matias Bjørling
2016-05-06 18:02 ` [PATCH 01/28] lightnvm: fix "warning: ‘ret’ may be used uninitialized" Matias Bjørling
2016-05-06 18:02 ` [PATCH 02/28] lightnvm: handle submit_io failure Matias Bjørling
2016-05-06 18:02 ` [PATCH 03/28] lightnvm: implement nvm_submit_ppa_list Matias Bjørling
2016-05-06 18:02 ` [PATCH 04/28] lightnvm: add fpg_size and pfpg_size to struct nvm_dev Matias Bjørling
2016-05-06 18:02 ` [PATCH 05/28] lightnvm: move block fold outside of get_bb_tbl() Matias Bjørling
2016-05-06 18:02 ` [PATCH 06/28] lightnvm: avoid memory leak when lun_map kcalloc fails Matias Bjørling
2016-05-06 18:03 ` [PATCH 07/28] lightnvm: calculate rrpc total blocks and sectors up front Matias Bjørling
2016-05-06 18:03 ` [PATCH 08/28] lightnvm: store rrpc->soffset in device sector size Matias Bjørling
2016-05-06 18:03 ` [PATCH 09/28] lightnvm: rename nvm_targets to nvm_tgt_type Matias Bjørling
2016-05-06 18:03 ` [PATCH 10/28] lightnvm: refactor dev->online_target to global nvm_targets Matias Bjørling
2016-05-06 18:03 ` [PATCH 11/28] lightnvm: introduce nvm_for_each_lun_ppa() macro Matias Bjørling
2016-05-06 18:03 ` [PATCH 12/28] lightnvm: refactor device ops->get_bb_tbl() Matias Bjørling
2016-05-06 18:03 ` [PATCH 13/28] lightnvm: remove struct factory_blks Matias Bjørling
2016-05-06 18:03 ` [PATCH 14/28] lightnvm: make nvm_set_rqd_ppalist() aware of vblks Matias Bjørling
2016-05-06 18:03 ` [PATCH 15/28] lightnvm: move responsibility for bad blk mgmt to target Matias Bjørling
2016-05-06 18:03 ` [PATCH 16/28] lightnvm: refactor set_bb_tbl for accepting ppa list Matias Bjørling
2016-05-06 18:03 ` [PATCH 17/28] lightnvm: fix out of bound ppa lun id on bb tbl Matias Bjørling
2016-05-06 18:03 ` [PATCH 18/28] lightnvm: do not free unused metadata on rrpc Matias Bjørling
2016-05-06 18:03 ` [PATCH 19/28] lightnvm: enable metadata to be sent to device Matias Bjørling
2016-05-06 18:03 ` [PATCH 20/28] lightnvm: rename dma helper functions Matias Bjørling
2016-05-06 18:03 ` Matias Bjørling [this message]
2016-05-06 18:03 ` [PATCH 22/28] lightnvm: do not assume sequential lun alloc Matias Bjørling
2016-05-06 18:03 ` [PATCH 23/28] lightnvm: pass dma address to hardware rather than pointer Matias Bjørling
2016-05-06 18:03 ` [PATCH 24/28] lightnvm: remove mgt targets on mgt removal Matias Bjørling
2016-05-06 18:03 ` [PATCH 25/28] lightnvm: expose gennvm_mark_blk to targets Matias Bjørling
2016-05-06 18:03 ` [PATCH 26/28] lightnvm: add is_cached entry to struct ppa_addr Matias Bjørling
2016-05-06 18:03 ` [PATCH 27/28] lightnvm: rename nr_pages to nr_ppas on nvm_rq Matias Bjørling
2016-05-06 18:03 ` [PATCH 28/28] lightnvm: reserved space calculation incorrect Matias Bjørling
2016-05-10 14:43 ` [PATCH 00/28] LightNVM fixes for 4.7 Jens Axboe

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1462557801-24974-22-git-send-email-m@bjorling.me \
    --to=m@bjorling.me \
    --cc=axboe@fb.com \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=sagi@grimberg.me \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).