From patchwork Sat Jan 19 21:02:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1028058 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="NhbJVa8f"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43hr4Q53Kpz9s7h for ; Sun, 20 Jan 2019 08:07:50 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729279AbfASVHr (ORCPT ); Sat, 19 Jan 2019 16:07:47 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:33877 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726773AbfASVHq (ORCPT ); Sat, 19 Jan 2019 16:07:46 -0500 Received: by mail-wr1-f68.google.com with SMTP id j2so19133017wrw.1 for ; Sat, 19 Jan 2019 13:07:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=C7Rwtrsq2xmpDFkyAz0mM842BsSj8Ne+cyv2p1n1MHE=; b=NhbJVa8fRvRnUAMbRnPeVqKqDiTZDbsv6uUcaLj5l0ai/LwwHRh7M+tbtIiPGAYT7U kr+6sAXcorkl/c0FzuT54AVuv/4zigSZi+JFlsPIdbSV0SteWF7zlxIgybjEQWWaR8/D wiRq2QK5kD64Xjtb4LsOXQbkrYbEknrRoqtTUboNTaEjViwFKZplDEnl/ZeBIYuq+WGh h+Qz5tXiogkRJAtDZVY4NziO333cB5I2n5aHt90ruHEgAV9PuVWtzHzxoeTbV8ZdVOH2 MZR2+ce5JH6rnkEvvmklQEcYZbEUupFhxQztvNqWQwEaakRhskqj1x/hndi2JpatsBtz LTFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=C7Rwtrsq2xmpDFkyAz0mM842BsSj8Ne+cyv2p1n1MHE=; b=uhdS8kOX83c3AmjHAPyu5oisy/vojhDPKcA1zibFm37aynTGi+AnHJr6z/LeZfCegr 7G6wpsRs5pIGSoLqTHuvYJ+I03a5FyRYKB02Swb+tsVc3QoMtTEGfOR0eWUJZDU53wfT w4xkAwOT5B8DFQvY5AqKwhXHyYggNwp5Cs19FR+d1ixHc0WUG4Dii1b1RybBvNVeVxD+ Lo3vpuP1bwNeVUZ4dKuAg5SwbsLOlU3J8ybY9zwC7Zh01NxgXIRlVVEd+9Mx/N+Bh6G2 HZsvz4g2YbHWEgnLWrbHvhcIiQG4Fw1/NA4ccOHFsyFFmaq6yC2/m6dzdCW1Iu4dCJ94 obrQ== X-Gm-Message-State: AJcUukdvMzA6WAcT42c6nbHFjP5AuSI18X7JYVYE1XQEy1J095a1Mbop zwlM9U38UumX42u1RuibojNk5mpE X-Google-Smtp-Source: ALg8bN7qnwpw0iFHz53gL8biGq+VP+pycgZWSOoHsbP3rPGM5OYmwwxh7ZfmRV/Y2fYAVpse3wUW7g== X-Received: by 2002:a05:6000:1251:: with SMTP id j17mr21155760wrx.315.1547932064759; Sat, 19 Jan 2019 13:07:44 -0800 (PST) Received: from ?IPv6:2003:ea:8bf1:e200:e877:8d0c:cdf0:81fd? (p200300EA8BF1E200E8778D0CCDF081FD.dip0.t-ipconnect.de. [2003:ea:8bf1:e200:e877:8d0c:cdf0:81fd]) by smtp.googlemail.com with ESMTPSA id y145sm34484234wmd.30.2019.01.19.13.07.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Jan 2019 13:07:44 -0800 (PST) Subject: [PATCH net-next v2 1/8] r8169: remove rtl_get_events From: Heiner Kallweit To: David Miller , Realtek linux nic maintainers Cc: "netdev@vger.kernel.org" References: Message-ID: Date: Sat, 19 Jan 2019 22:02:40 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This helper is used only once, so remove it. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index abb94c543..b2e30e302 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -1278,11 +1278,6 @@ static u8 rtl8168d_efuse_read(struct rtl8169_private *tp, int reg_addr) RTL_R32(tp, EFUSEAR) & EFUSEAR_DATA_MASK : ~0; } -static u16 rtl_get_events(struct rtl8169_private *tp) -{ - return RTL_R16(tp, IntrStatus); -} - static void rtl_ack_events(struct rtl8169_private *tp, u16 bits) { RTL_W16(tp, IntrStatus, bits); @@ -6409,7 +6404,7 @@ static int rtl_rx(struct net_device *dev, struct rtl8169_private *tp, u32 budget static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance) { struct rtl8169_private *tp = dev_instance; - u16 status = rtl_get_events(tp); + u16 status = RTL_R16(tp, IntrStatus); u16 irq_mask = RTL_R16(tp, IntrMask); if (status == 0xffff || !(status & irq_mask))