From patchwork Tue Sep 12 16:56:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 138320 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp544569vqx; Tue, 12 Sep 2023 09:56:57 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFVvdsGdYiDiGiX07F9Vko5GUCkQZy8GJlt3HiIASVreql5RLYLzhc0Xmkw0oreD2eKZQAR X-Received: by 2002:a05:6a20:1046:b0:149:44d9:bbb0 with SMTP id gt6-20020a056a20104600b0014944d9bbb0mr10124603pzc.43.1694537817549; Tue, 12 Sep 2023 09:56:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694537817; cv=none; d=google.com; s=arc-20160816; b=BhOQf33racW/t4HdAEIvCY9cs+t53O6M5CmuuKNUdL4u5xW1P1lTjdDamygEGMIYQy RYtNcrA1LHLibmiAmvr3221zhgek24qjzk30/Uap/rR1pNfIk6nryGEX90hmKfuS0M7D xttuSpe5FvfUPiekV770y+/4YV8gmGU5rB43rhV/ch/qAZNkIWLb0bI/JU60b0ybojIg SOX+dI0yMmvu13r/Ife1pCYmfphMEAJfXZcjzyoq9T8g+/BqhIpxAmSwv7Qdx0EhPraC xkmX8DCVolTNTNcJcWrHu5/PmkruXm3jLIGqNQA6r5D/u8GI21zZ09RWpIo0PHkgVqW5 Qptw== 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=DwO9YCIIR0gzSQkL2fkj8jxc/32bzxZGxMbyawy/neM=; fh=ZS9YJfguNAznzMT0iCHuhiso0OI1aLtyPzkhTnDvnH0=; b=DBkrUZHrHwOo3QPldWdPYtJMyIpcw+EC3u/0YF7ktLgdF2QZObXc231bAU6oyHnF4R w5cZCD4x6ldOTFJig6yeoN2vUW+fojDJGNHAFzaNPddfi73Plk9dFjr0HI4SllxOmWyA dbZdOvAPYQweMxilok73k9luku3WLOTbXiofPK572h1YSIWlwSKu8LoI+8es3u3bI8h0 I2dmbl7tQbh1Icdl0QFAVQYZUHD9yeV9Up0jjkAwYmXFlRLHaNX04p0vPqm27Asz6RLR pVSv5IXpEfHAqW6hqzWHDwooz1lsfULZhEQ61wo0ie09XBWMza8l+JRXgzCI8GtijP6X FsMg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=PcjcwyiC; 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 d20-20020a656214000000b00565e39e7b80si7815903pgv.678.2023.09.12.09.56.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 09:56:57 -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=PcjcwyiC; 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 65B2181DDD2C; Tue, 12 Sep 2023 09:56:34 -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 S237202AbjILQ4X (ORCPT + 37 others); Tue, 12 Sep 2023 12:56:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35440 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237194AbjILQ4Q (ORCPT ); Tue, 12 Sep 2023 12:56:16 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D6233110; Tue, 12 Sep 2023 09:56:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1694537772; x=1726073772; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=pV99F/DxJsfDjodvyOfXHlYZI7zldMz95G0ynqOMMX4=; b=PcjcwyiCusHpqFmZaruy9mCTfi4eVXAeqP5t3rS6vX6OPa/GNuiZBAYx rRBCpxrK00bPeTjBXHczudTPDVv97NOB+5KiH1Hv1Gj93pB4vym0NlZcb 4KRTQapPp4Naovn2hTMmqO8iy96tRqD/ZZrb2ts8KlWA/BcnFHpDe8XdW kH/DF9b5ppONmKk22Fvu1Bre2gpbnPWwip6XJ5HVREc1HvJoSqhoV/TSn g2qFZG/094L/MuBWuS2SkL5jZA4TmuiK2pDtn85GXbFq4v3p4cZVN6QTj X2VM/O96Ys9ea4NxWql5UjH9BoQrFkQgDG8fijgFvqHzSWPkOrxR27XxH Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10831"; a="363469835" X-IronPort-AV: E=Sophos;i="6.02,139,1688454000"; d="scan'208";a="363469835" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Sep 2023 09:56:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10831"; a="809349527" X-IronPort-AV: E=Sophos;i="6.02,139,1688454000"; d="scan'208";a="809349527" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga008.fm.intel.com with ESMTP; 12 Sep 2023 09:56:10 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id B7E2F248; Tue, 12 Sep 2023 19:56:08 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org Cc: Greg Kroah-Hartman , Jiri Slaby Subject: [PATCH v1 1/1] serial: 8250_of: Use dev_err_probe() instead of dev_warn() Date: Tue, 12 Sep 2023 19:56:07 +0300 Message-Id: <20230912165607.402580-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:34 -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: 1776851686244686187 X-GMAIL-MSGID: 1776851686244686187 The probe process may generate EPROBE_DEFER. In this case dev_err_probe() can still record err information. Otherwise it may pollute logs on that occasion. This also helps simplifing code and standardizing the error output. Signed-off-by: Andy Shevchenko --- drivers/tty/serial/8250/8250_of.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/drivers/tty/serial/8250/8250_of.c b/drivers/tty/serial/8250/8250_of.c index 51329625c48a..8c61ed25a8e4 100644 --- a/drivers/tty/serial/8250/8250_of.c +++ b/drivers/tty/serial/8250/8250_of.c @@ -33,7 +33,8 @@ static int of_platform_serial_setup(struct platform_device *ofdev, struct of_serial_info *info) { struct resource resource; - struct device_node *np = ofdev->dev.of_node; + struct device *dev = &ofdev->dev; + struct device_node *np = dev->of_node; struct uart_port *port = &up->port; u32 clk, spd, prop; int ret, irq; @@ -48,10 +49,7 @@ static int of_platform_serial_setup(struct platform_device *ofdev, /* Get clk rate through clk driver if present */ info->clk = devm_clk_get(&ofdev->dev, NULL); if (IS_ERR(info->clk)) { - ret = PTR_ERR(info->clk); - if (ret != -EPROBE_DEFER) - dev_warn(&ofdev->dev, - "failed to get clock: %d\n", ret); + ret = dev_err_probe(dev, PTR_ERR(info->clk), "failed to get clock\n"); goto err_pmruntime; } @@ -67,7 +65,7 @@ static int of_platform_serial_setup(struct platform_device *ofdev, ret = of_address_to_resource(np, 0, &resource); if (ret) { - dev_warn(&ofdev->dev, "invalid address\n"); + dev_err_probe(dev, ret, "invalid address\n"); goto err_unprepare; } @@ -85,9 +83,8 @@ static int of_platform_serial_setup(struct platform_device *ofdev, /* Check for shifted address mapping */ if (of_property_read_u32(np, "reg-offset", &prop) == 0) { if (prop >= port->mapsize) { - dev_warn(&ofdev->dev, "reg-offset %u exceeds region size %pa\n", - prop, &port->mapsize); - ret = -EINVAL; + ret = dev_err_probe(dev, -EINVAL, "reg-offset %u exceeds region size %pa\n", + prop, &port->mapsize); goto err_unprepare; } @@ -109,9 +106,8 @@ static int of_platform_serial_setup(struct platform_device *ofdev, UPIO_MEM32BE : UPIO_MEM32; break; default: - dev_warn(&ofdev->dev, "unsupported reg-io-width (%d)\n", - prop); - ret = -EINVAL; + ret = dev_err_probe(dev, -EINVAL, "unsupported reg-io-width (%u)\n", + prop); goto err_unprepare; } }