Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp2396149pxb; Sat, 25 Sep 2021 06:13:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzDKdBXzKtfE7tlXBvbIZWv/89xAigLyK6OsT7KkQMHYHa1m/7F54dwptSl+NqyckSQ8AcQ X-Received: by 2002:a50:d987:: with SMTP id w7mr11194873edj.240.1632575609069; Sat, 25 Sep 2021 06:13:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632575609; cv=none; d=google.com; s=arc-20160816; b=G+JxvsPIt0paUy9vcuF4Hkn78JFPjUQE7i0P1oB7gSCQ5UFsVTB6BftCfIvK2mJFPi za3+68pnh2qoF9TnJRkBuC6pNOaX3+ZxIeENS/jg4tBCyhWxYhcWZr5VQgqfr4lnMza3 WqgqzZzWYdbSIa2atFhJ/3BtjiWtS7F2GZFFgyeGtMfghMv0g6QSmfc33R6cm/jdIQiR Y7koLE5JzqmRo1/DXzS/LJNhn+kBvOAVIPzAjfhfSpDNUT3NziO/hXp5FV5csJqoBosU ON5Eq1t4XZBLKx/5xMf89hhRfuJBgLufiGGX764kZzPXeCaRjlZwIOQvtlWQZILgYfpR a4MQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from; bh=fWeLit97E1gq4oOgb1pqCdW12/k3Z6s4MpBj1WKGZWg=; b=y6Vd4SElM8M6cyt938C/uIKZ8osc1KXROfTU1vPwLkUb5oXw5sUK2QWsJ7H0qRtPK3 lSgTye98RCd9fZkuvudmIS3/Yw7e2VBuYKR351FKmMogeQJQf+7J4gB52BCgjNtbRIFr LRh3W4xUqqdhRd+dmgpRMKrJTR/NMXRioO07HBH76dSx8gTi0Zz5rLcvcYlZ2eyDw01p y8SUUm79UPRGkmrZZDQ3puJByyCst0rPThSQwND3iEU0J66bb/gthyzggypGqvigjl7H iVMz9roiNa0hlMHe1wLVHQrck00idOdlwnC/FUJBoX4TluClY8l+FRWzedNQA6WqCcQf 70+Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i27si11963198ejh.465.2021.09.25.06.13.04; Sat, 25 Sep 2021 06:13:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245462AbhIYNJy (ORCPT + 99 others); Sat, 25 Sep 2021 09:09:54 -0400 Received: from mx22.baidu.com ([220.181.50.185]:56328 "EHLO baidu.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S245112AbhIYNJw (ORCPT ); Sat, 25 Sep 2021 09:09:52 -0400 Received: from BC-Mail-EX08.internal.baidu.com (unknown [172.31.51.48]) by Forcepoint Email with ESMTPS id 40FEFA9B5D149AE7CF6C; Sat, 25 Sep 2021 20:51:04 +0800 (CST) Received: from BJHW-MAIL-EX27.internal.baidu.com (10.127.64.42) by BC-Mail-EX08.internal.baidu.com (172.31.51.48) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2242.12; Sat, 25 Sep 2021 20:51:03 +0800 Received: from LAPTOP-UKSR4ENP.internal.baidu.com (172.31.63.8) by BJHW-MAIL-EX27.internal.baidu.com (10.127.64.42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.14; Sat, 25 Sep 2021 20:51:03 +0800 From: Cai Huoqing To: CC: Chris Snook , "David S. Miller" , Jakub Kicinski , Michael Chan , Francois Romieu , "Steve Glendinning" , , Subject: [PATCH 4/4] net: smsc: Fix function names in print messages and coments Date: Sat, 25 Sep 2021 20:50:41 +0800 Message-ID: <20210925125042.1629-4-caihuoqing@baidu.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210925125042.1629-1-caihuoqing@baidu.com> References: <20210925125042.1629-1-caihuoqing@baidu.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [172.31.63.8] X-ClientProxiedBy: BJHW-Mail-Ex01.internal.baidu.com (10.127.64.11) To BJHW-MAIL-EX27.internal.baidu.com (10.127.64.42) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use dma_xxx_xxx() instead of pci_xxx_xxx(), because the pci function wrappers are not called here. Signed-off-by: Cai Huoqing --- drivers/net/ethernet/smsc/smsc9420.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/smsc/smsc9420.c b/drivers/net/ethernet/smsc/smsc9420.c index fdbd2a43e267..3d1176588f7d 100644 --- a/drivers/net/ethernet/smsc/smsc9420.c +++ b/drivers/net/ethernet/smsc/smsc9420.c @@ -788,7 +788,7 @@ static int smsc9420_alloc_rx_buffer(struct smsc9420_pdata *pd, int index) PKT_BUF_SZ, DMA_FROM_DEVICE); if (dma_mapping_error(&pd->pdev->dev, mapping)) { dev_kfree_skb_any(skb); - netif_warn(pd, rx_err, pd->dev, "pci_map_single failed!\n"); + netif_warn(pd, rx_err, pd->dev, "dma_map_single failed!\n"); return -ENOMEM; } @@ -940,7 +940,7 @@ static netdev_tx_t smsc9420_hard_start_xmit(struct sk_buff *skb, DMA_TO_DEVICE); if (dma_mapping_error(&pd->pdev->dev, mapping)) { netif_warn(pd, tx_err, pd->dev, - "pci_map_single failed, dropping packet\n"); + "dma_map_single failed, dropping packet\n"); return NETDEV_TX_BUSY; } @@ -1551,7 +1551,7 @@ smsc9420_probe(struct pci_dev *pdev, const struct pci_device_id *id) if (!pd->rx_ring) goto out_free_io_4; - /* descriptors are aligned due to the nature of pci_alloc_consistent */ + /* descriptors are aligned due to the nature of dma_alloc_coherent */ pd->tx_ring = (pd->rx_ring + RX_RING_SIZE); pd->tx_dma_addr = pd->rx_dma_addr + sizeof(struct smsc9420_dma_desc) * RX_RING_SIZE; -- 2.25.1