From patchwork Tue Sep 12 16:55:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 138506 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp772243vqx; Tue, 12 Sep 2023 17:46:54 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFDAOBGJBRflTwugxmszY8VX/hVRD/EFv9Q9OqRD6RPZGS7U8JnKZx+0FtUxcVJs7Is9Pkn X-Received: by 2002:a05:6358:3a1a:b0:133:7f9:303f with SMTP id g26-20020a0563583a1a00b0013307f9303fmr1484333rwe.23.1694566014163; Tue, 12 Sep 2023 17:46:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694566014; cv=none; d=google.com; s=arc-20160816; b=nieCWpOc3HSeUDzS6dPehnJtV8H6XyUf8SNfaBr3WrJhaqsuEyuY1uhYrluS8lqhrb hriXIaf7u2AuyNfZRJBzhQ13YmIB2zIr38BCq3y59vmK82/JAhVqqF4sY4RAglo/rHD8 P+IhDVMS4SNOIV0FRJSmgfRY82NFcIMYpNtHrkQywnpJo3Txtv9eU2AFdX5E/VZ8HUX0 hvNdy1CA6PRHd8ADFZNo8w2VVhcm3ccTo3hMQRe2fLueJJE7JostFGlpbc7hs+R3YvsQ wdBGI3+Udn8qpu4YgMnYmLeuVKFostZs2SBZB1NOnRGXksGiJ0j5yA7x7clOx50Iekvi d/0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=fR0qFjJNbw4ytP+MhvfIAzpOp2qcIF03mfHXQeWB2zI=; fh=TMZ9FIAmYkZxQ+Rq3/nuuzL+U3w/v+M4SmGZ2xhLkVo=; b=tu3aAn17b2HiWJnqwGNB6y1P0E3Xz5EspOZOSrSvlqRS4B+1q+Ax2zGTHhZ62UEG3u hhP4FF9OTJwus3YTtyKHHT5Oa5oB9VSEFn4CbPWQixwdOYR1OW5gEpQ5SdN0UlSTY1dN Eh17hBQWbBomFM77PC7+FfxXeACbi5PTobsql4rc0dCcjnjD64Pn6M+2s8aTUffHwaSA dUtoxLMwRVFLOc5SapUgtKrmyGE92LGjQM9slpGiHobI0c5pswAs59JWD03T68rt6yxA AW1SoLYki91LqR7+Wkw09lXa3D9Y07FzbaBtx1XNI+f6Nb4B3mYNaiqUDOEzATiUcivJ /haA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Nc2cdbc9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id fa27-20020a056a002d1b00b0068a3edcf2a6si9159393pfb.246.2023.09.12.17.46.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 17:46:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Nc2cdbc9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 3302A81DDD0A; Tue, 12 Sep 2023 09:56:32 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237196AbjILQ4V (ORCPT + 37 others); Tue, 12 Sep 2023 12:56:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35428 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233867AbjILQ4N (ORCPT ); Tue, 12 Sep 2023 12:56:13 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0046E110; Tue, 12 Sep 2023 09:56:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1694537770; x=1726073770; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=+MaNNJGCKYl5eg+q9uVCoghWL58VMuP9LdwrcSXnJzc=; b=Nc2cdbc9G4X0Iy2mOsUaOTsPJQkodn1okyb+vflwuj/JkF+7ZRtbILVP zEM6kLQJNioyJiO9DUi3TgO0UWMgRglzBRpPIlWuS8x4ALgZrPd8mBJVa sx7LEFeI/imW/JryT+XuKaQglntMns53ojdMXrTLI/sEovyKCCDKU2W8b QwzC02h01VWp7zlnfOpAHTOQ2VNHzJqyuShCzVTISYm4hJ6/tmB0EbCLl EEOf55aXv+8Wcxh0G4G+aPUi7oQv73C0hjAJLN5eHj6fjkAdlgRNimKJK 7/ZpAsBpcH6BxSipqIkINemTmx1z2bJGu6f5wJr5M59f4htNYKYzE+CHV g==; X-IronPort-AV: E=McAfee;i="6600,9927,10831"; a="381136009" X-IronPort-AV: E=Sophos;i="6.02,139,1688454000"; d="scan'208";a="381136009" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Sep 2023 09:55:56 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10831"; a="693561252" X-IronPort-AV: E=Sophos;i="6.02,139,1688454000"; d="scan'208";a="693561252" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga003.jf.intel.com with ESMTP; 12 Sep 2023 09:55:54 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 2915F248; Tue, 12 Sep 2023 19:55:53 +0300 (EEST) From: Andy Shevchenko To: Greg Kroah-Hartman , Andy Shevchenko , linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Al Cooper , Broadcom internal kernel review list , Jiri Slaby Subject: [PATCH v1 1/1] serial: 8250_bcm7271: Use dev_err_probe() instead of dev_err() Date: Tue, 12 Sep 2023 19:55:50 +0300 Message-Id: <20230912165550.402540-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Tue, 12 Sep 2023 09:56:32 -0700 (PDT) X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776868882392178527 X-GMAIL-MSGID: 1776881252718776594 Make the error messages format unified by switching to use dev_err_probe() where it makes sense. This also helps simplifing the code. Signed-off-by: Andy Shevchenko --- drivers/tty/serial/8250/8250_bcm7271.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/drivers/tty/serial/8250/8250_bcm7271.c b/drivers/tty/serial/8250/8250_bcm7271.c index aa5aff046756..51c3eca8673c 100644 --- a/drivers/tty/serial/8250/8250_bcm7271.c +++ b/drivers/tty/serial/8250/8250_bcm7271.c @@ -984,10 +984,9 @@ static int brcmuart_probe(struct platform_device *pdev) } /* We should have just the uart base registers or all the registers */ - if (x != 1 && x != REGS_MAX) { - dev_warn(dev, "%s registers not specified\n", reg_names[x]); - return -EINVAL; - } + if (x != 1 && x != REGS_MAX) + return dev_err_probe(dev, -EINVAL, "%s registers not specified\n", + reg_names[x]); /* if the DMA registers were specified, try to enable DMA */ if (x > REGS_DMA_RX) { @@ -1034,8 +1033,7 @@ static int brcmuart_probe(struct platform_device *pdev) } if (clk_rate == 0) { - dev_err(dev, "clock-frequency or clk not defined\n"); - ret = -EINVAL; + ret = dev_err_probe(dev, -EINVAL, "clock-frequency or clk not defined\n"); goto err_clk_disable; } @@ -1093,7 +1091,7 @@ static int brcmuart_probe(struct platform_device *pdev) ret = serial8250_register_8250_port(&up); if (ret < 0) { - dev_err(dev, "unable to register 8250 port\n"); + dev_err_probe(dev, ret, "unable to register 8250 port\n"); goto err; } priv->line = ret; @@ -1102,14 +1100,13 @@ static int brcmuart_probe(struct platform_device *pdev) if (priv->dma_enabled) { dma_irq = platform_get_irq_byname(pdev, "dma"); if (dma_irq < 0) { - ret = dma_irq; - dev_err(dev, "no IRQ resource info\n"); + dev_err_probe(dev, dma_irq, "no IRQ resource info\n"); goto err1; } ret = devm_request_irq(dev, dma_irq, brcmuart_isr, IRQF_SHARED, "uart DMA irq", &new_port->port); if (ret) { - dev_err(dev, "unable to register IRQ handler\n"); + dev_err_probe(dev, ret, "unable to register IRQ handler\n"); goto err1; } }