From patchwork Mon Nov 2 10:57:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 538966 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id A54FA140D6A for ; Mon, 2 Nov 2015 21:59:35 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=baylibre_com.20150623.gappssmtp.com header.i=@baylibre_com.20150623.gappssmtp.com header.b=u+dioTBJ; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753598AbbKBK5V (ORCPT ); Mon, 2 Nov 2015 05:57:21 -0500 Received: from mail-wm0-f51.google.com ([74.125.82.51]:33883 "EHLO mail-wm0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753576AbbKBK5S (ORCPT ); Mon, 2 Nov 2015 05:57:18 -0500 Received: by wmff134 with SMTP id f134so55443143wmf.1 for ; Mon, 02 Nov 2015 02:57:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre_com.20150623.gappssmtp.com; s=20150623; h=from:subject:to:cc:organization:message-id:date:user-agent :mime-version:content-type:content-transfer-encoding; bh=MtkI2uB1Tz3M0MFshqKmR/vlib7cV/g4HRwcNHXWgtY=; b=u+dioTBJ8WcwqUlVGPLp8AxPCbYT+pzYj4QSTkCCA4qS5sPND8t+45bNc0hNK+/UUm g23Y9NawIM+5j/QkkY8n4KPrjgTE3/K1cFUZvyN/pxfd/ymBuBlImt2qfXvkKpdHad+X rtdLn5Dk2jzMHRMJWrJDbmqSqqpmOhuHvPj7I6nKdrUFU3zua2mR+dYTGLGPEKWLilKL YiHz9MprRMnNkUquSloe2dqsIr1N/SH9HMvQeNDy3CuY2ZVcCWgVVccrBeMxUtF8G7A4 VK4YASASdcqGu28zaXlD08F7FcxX/jIKIpx0VFZm1TfLE9E5mEJYqSJg1L3XpfLHMkdt rmgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:subject:to:cc:organization:message-id:date :user-agent:mime-version:content-type:content-transfer-encoding; bh=MtkI2uB1Tz3M0MFshqKmR/vlib7cV/g4HRwcNHXWgtY=; b=F7zJk8/Qsa0Qixmyq35AsTPAyAz4847Uiu8pszSe3jXDDYls1pRuBKTseiKbIAjjsL yn3PFiSIywZT+koW0enP6a5IwoSvUfK8YAYqm9Fxuyl1L1pu3zq0KHj9oub/DHh94NGH pOEDQALRgcIWQRj5sjdEp2FgrN3vPCazt65pc3L2/J1sZgPVdG7ViXbytJsRKE3di2q5 VpC5KLIoLx4JdBPzJ06Zjvxm7azHKc55D+DtXKPBhjOvPG428fEKP4Ga2IbaY3h5swEk UHdn5409wqViagW6KVmUhz+8oj65q3yYImj1mRzl6r+6q5OoUIHqTB3jNUKQZxrZOnsN E9yw== X-Gm-Message-State: ALoCoQkQWbOlGfU5hvJa8dwL8qnOtN3lMv1TfmGPJ+MGihNOIpo19XWcu7z/FJrJZLYwKZKpCZHW X-Received: by 10.28.229.70 with SMTP id c67mr13762372wmh.48.1446461837029; Mon, 02 Nov 2015 02:57:17 -0800 (PST) Received: from [192.168.2.52] (cag06-6-78-235-100-105.fbx.proxad.net. [78.235.100.105]) by smtp.gmail.com with ESMTPSA id t2sm17501060wme.0.2015.11.02.02.57.15 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Nov 2015 02:57:16 -0800 (PST) From: Neil Armstrong Subject: [RFC PATCH net-next 1/6] net: dsa: mv88e6060: remove poll_link callback To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, "David S. Miller" , Florian Fainelli , Andrew Lunn , Guenter Roeck , Neil Armstrong , Vivien Didelot Organization: Baylibre Message-ID: <56374182.8040000@baylibre.com> Date: Mon, 2 Nov 2015 11:57:06 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.2.0 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org As of mv88e6xxx remove the poll_link callback since the link state change polling is now handled by the phylib. Tested on a mv88e6060 B0 device with a TI DM816X SoC. Suggested-by: Andrew Lunn Signed-off-by: Neil Armstrong --- drivers/net/dsa/mv88e6060.c | 49 --------------------------------------------- 1 file changed, 49 deletions(-) diff --git a/drivers/net/dsa/mv88e6060.c b/drivers/net/dsa/mv88e6060.c index 9093577..6885ef5 100644 --- a/drivers/net/dsa/mv88e6060.c +++ b/drivers/net/dsa/mv88e6060.c @@ -225,54 +225,6 @@ mv88e6060_phy_write(struct dsa_switch *ds, int port, int regnum, u16 val) return reg_write(ds, addr, regnum, val); } -static void mv88e6060_poll_link(struct dsa_switch *ds) -{ - int i; - - for (i = 0; i < DSA_MAX_PORTS; i++) { - struct net_device *dev; - int uninitialized_var(port_status); - int link; - int speed; - int duplex; - int fc; - - dev = ds->ports[i]; - if (dev == NULL) - continue; - - link = 0; - if (dev->flags & IFF_UP) { - port_status = reg_read(ds, REG_PORT(i), 0x00); - if (port_status < 0) - continue; - - link = !!(port_status & 0x1000); - } - - if (!link) { - if (netif_carrier_ok(dev)) { - netdev_info(dev, "link down\n"); - netif_carrier_off(dev); - } - continue; - } - - speed = (port_status & 0x0100) ? 100 : 10; - duplex = (port_status & 0x0200) ? 1 : 0; - fc = ((port_status & 0xc000) == 0xc000) ? 1 : 0; - - if (!netif_carrier_ok(dev)) { - netdev_info(dev, - "link up, %d Mb/s, %s duplex, flow control %sabled\n", - speed, - duplex ? "full" : "half", - fc ? "en" : "dis"); - netif_carrier_on(dev); - } - } -} - static struct dsa_switch_driver mv88e6060_switch_driver = { .tag_protocol = DSA_TAG_PROTO_TRAILER, .probe = mv88e6060_probe, @@ -280,7 +232,6 @@ static struct dsa_switch_driver mv88e6060_switch_driver = { .set_addr = mv88e6060_set_addr, .phy_read = mv88e6060_phy_read, .phy_write = mv88e6060_phy_write, - .poll_link = mv88e6060_poll_link, }; static int __init mv88e6060_init(void)