From patchwork Thu Apr 20 14:09:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Tull X-Patchwork-Id: 9690571 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2C8FC60326 for ; Thu, 20 Apr 2017 14:10:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 243C528433 for ; Thu, 20 Apr 2017 14:10:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 184A928477; Thu, 20 Apr 2017 14:10:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8EF9128433 for ; Thu, 20 Apr 2017 14:10:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031712AbdDTOKc (ORCPT ); Thu, 20 Apr 2017 10:10:32 -0400 Received: from mail.kernel.org ([198.145.29.136]:59826 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S970218AbdDTOKa (ORCPT ); Thu, 20 Apr 2017 10:10:30 -0400 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A7DE62015A; Thu, 20 Apr 2017 14:10:28 +0000 (UTC) Received: from localhost.localdomain (user-0ccsrjt.cable.mindspring.com [24.206.110.125]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D72DA20121; Thu, 20 Apr 2017 14:10:26 +0000 (UTC) From: Alan Tull To: Moritz Fischer Cc: Alan Tull , linux-kernel@vger.kernel.org, linux-fpga@vger.kernel.org Subject: [PATCH v2 05/16] fpga: region: use dev_err instead of pr_err Date: Thu, 20 Apr 2017 09:09:50 -0500 Message-Id: <1492697401-11211-6-git-send-email-atull@kernel.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1492697401-11211-1-git-send-email-atull@kernel.org> References: <1492697401-11211-1-git-send-email-atull@kernel.org> X-Virus-Scanned: ClamAV using ClamSMTP Sender: linux-fpga-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fpga@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Use dev_err messages instead of pr_err. Also s/®ion->dev/dev/ in two places where we already have dev = ®ion->dev Signed-off-by: Alan Tull --- v2: new in this version of the patchset --- drivers/fpga/fpga-region.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/drivers/fpga/fpga-region.c b/drivers/fpga/fpga-region.c index 5fa3c7d..eaea9d4 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(®ion->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 = ®ion->dev; - dev_dbg(®ion->dev, "put\n"); + dev_dbg(dev, "put\n"); module_put(dev->parent->driver->owner); of_node_put(dev->of_node); @@ -233,18 +233,19 @@ static int fpga_region_get_bridges(struct fpga_region *region, static int fpga_region_program_fpga(struct fpga_region *region, struct device_node *overlay) { + struct device *dev = ®ion->dev; struct fpga_manager *mgr; int ret; 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; } @@ -257,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(®ion->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(®ion->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; } @@ -363,6 +364,7 @@ static int child_regions_with_firmware(struct device_node *overlay) static int fpga_region_notify_pre_apply(struct fpga_region *region, struct of_overlay_notify_data *nd) { + struct device *dev = ®ion->dev; struct fpga_image_info *info; const char *firmware_name; int ret; @@ -405,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(dev, info); return -EINVAL; } @@ -418,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(dev, info); return -EINVAL; }