All of lore.kernel.org
 help / color / mirror / Atom feed
From: Alan Tull <atull@kernel.org>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Moritz Fischer <mdf@kernel.org>, Alan Tull <atull@kernel.org>,
	linux-kernel@vger.kernel.org, linux-fpga@vger.kernel.org
Subject: [PATCH v6 04/18] fpga: region: use dev_err instead of pr_err
Date: Wed, 15 Nov 2017 14:20:14 -0600	[thread overview]
Message-ID: <1510777228-4291-5-git-send-email-atull@kernel.org> (raw)
In-Reply-To: <1510777228-4291-1-git-send-email-atull@kernel.org>

Use dev_err messages instead of pr_err.

Also s/&region->dev/dev/ in two places where we already
have dev = &region->dev.

Signed-off-by: Alan Tull <atull@kernel.org>
Acked-by: Moritz Fischer <mdf@kernel.org>
---
v2: new in this version of the patchset
v3: for bisectability some changes moved to earlier patches
v4: no change to this patch in this version of patchset
v5: Add Moritz' ack
v6: No change in v6 of patchset
---
 drivers/fpga/fpga-region.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/drivers/fpga/fpga-region.c b/drivers/fpga/fpga-region.c
index 1e1640a..6b4f9ab 100644
--- a/drivers/fpga/fpga-region.c
+++ b/drivers/fpga/fpga-region.c
@@ -102,7 +102,7 @@ static struct fpga_region *fpga_region_get(struct fpga_region *region)
 		return ERR_PTR(-ENODEV);
 	}
 
-	dev_dbg(&region->dev, "get\n");
+	dev_dbg(dev, "get\n");
 
 	return region;
 }
@@ -116,7 +116,7 @@ static void fpga_region_put(struct fpga_region *region)
 {
 	struct device *dev = &region->dev;
 
-	dev_dbg(&region->dev, "put\n");
+	dev_dbg(dev, "put\n");
 
 	module_put(dev->parent->driver->owner);
 	of_node_put(dev->of_node);
@@ -239,13 +239,13 @@ static int fpga_region_program_fpga(struct fpga_region *region,
 
 	region = fpga_region_get(region);
 	if (IS_ERR(region)) {
-		pr_err("failed to get fpga region\n");
+		dev_err(dev, "failed to get FPGA region\n");
 		return PTR_ERR(region);
 	}
 
 	mgr = fpga_region_get_manager(region);
 	if (IS_ERR(mgr)) {
-		pr_err("failed to get fpga region manager\n");
+		dev_err(dev, "failed to get FPGA manager\n");
 		ret = PTR_ERR(mgr);
 		goto err_put_region;
 	}
@@ -258,25 +258,25 @@ static int fpga_region_program_fpga(struct fpga_region *region,
 
 	ret = fpga_region_get_bridges(region, overlay);
 	if (ret) {
-		pr_err("failed to get fpga region bridges\n");
+		dev_err(dev, "failed to get FPGA bridges\n");
 		goto err_unlock_mgr;
 	}
 
 	ret = fpga_bridges_disable(&region->bridge_list);
 	if (ret) {
-		pr_err("failed to disable region bridges\n");
+		dev_err(dev, "failed to disable bridges\n");
 		goto err_put_br;
 	}
 
 	ret = fpga_mgr_load(mgr, region->info);
 	if (ret) {
-		pr_err("failed to load fpga image\n");
+		dev_err(dev, "failed to load FPGA image\n");
 		goto err_put_br;
 	}
 
 	ret = fpga_bridges_enable(&region->bridge_list);
 	if (ret) {
-		pr_err("failed to enable region bridges\n");
+		dev_err(dev, "failed to enable region bridges\n");
 		goto err_put_br;
 	}
 
@@ -407,7 +407,7 @@ static int fpga_region_notify_pre_apply(struct fpga_region *region,
 
 	/* If FPGA was externally programmed, don't specify firmware */
 	if ((info->flags & FPGA_MGR_EXTERNAL_CONFIG) && info->firmware_name) {
-		pr_err("error: specified firmware and external-fpga-config");
+		dev_err(dev, "error: specified firmware and external-fpga-config");
 		fpga_image_info_free(info);
 		return -EINVAL;
 	}
@@ -420,7 +420,7 @@ static int fpga_region_notify_pre_apply(struct fpga_region *region,
 
 	/* If we got this far, we should be programming the FPGA */
 	if (!info->firmware_name) {
-		pr_err("should specify firmware-name or external-fpga-config\n");
+		dev_err(dev, "should specify firmware-name or external-fpga-config\n");
 		fpga_image_info_free(info);
 		return -EINVAL;
 	}
-- 
2.7.4

  parent reply	other threads:[~2017-11-15 20:24 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-15 20:20 [PATCH v6 00/18] patches for FPGA Alan Tull
2017-11-15 20:20 ` [PATCH v6 01/18] fpga: bridge: support getting bridge from device Alan Tull
2017-11-15 20:20 ` [PATCH v6 02/18] fpga: mgr: API change to replace fpga load functions with single function Alan Tull
2017-11-15 20:20 ` [PATCH v6 03/18] fpga: mgr: separate getting/locking FPGA manager Alan Tull
2017-11-15 20:20 ` Alan Tull [this message]
2017-11-15 20:20 ` [PATCH v6 05/18] fpga: region: remove unneeded of_node_get and put Alan Tull
2017-11-15 20:20 ` [PATCH v6 06/18] fpga: region: get mgr early on Alan Tull
2017-11-15 20:20 ` [PATCH v6 07/18] fpga: region: check for child regions before allocing image info Alan Tull
2017-11-15 20:20 ` [PATCH v6 08/18] fpga: region: fix slow warning with more than one overlay Alan Tull
2017-11-15 20:20 ` [PATCH v6 09/18] fpga: region: use image info as parameter for programming region Alan Tull
2017-11-15 20:20 ` [PATCH v6 10/18] fpga: region: separate out code that parses the overlay Alan Tull
2017-11-15 20:20 ` [PATCH v6 11/18] fpga: region: add fpga-region.h header Alan Tull
2017-11-15 20:20 ` [PATCH v6 12/18] fpga: region: rename some functions prior to moving Alan Tull
2017-11-15 20:20 ` [PATCH v6 13/18] fpga: region: add register/unregister functions Alan Tull
2017-11-15 20:20 ` [PATCH v6 14/18] fpga: region: add fpga_region_class_find Alan Tull
2017-11-15 20:20 ` [PATCH v6 15/18] fpga: region: move device tree support to of-fpga-region.c Alan Tull
2017-11-15 20:20 ` [PATCH v6 16/18] fpga: of-fpga-region: accept overlays that don't program FPGA Alan Tull
2017-11-15 20:20 ` [PATCH v6 17/18] fpga: clean up fpga Kconfig Alan Tull
2017-11-15 20:20 ` [PATCH v6 18/18] fpga: add attribute groups Alan Tull

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=1510777228-4291-5-git-send-email-atull@kernel.org \
    --to=atull@kernel.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-fpga@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mdf@kernel.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.