From patchwork Thu Nov 8 23:27:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 995253 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="sxiTHy2p"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42rfbK3bfLz9sDn for ; Fri, 9 Nov 2018 10:27:57 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727311AbeKIJFn (ORCPT ); Fri, 9 Nov 2018 04:05:43 -0500 Received: from mail-wr1-f65.google.com ([209.85.221.65]:40910 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726834AbeKIJFn (ORCPT ); Fri, 9 Nov 2018 04:05:43 -0500 Received: by mail-wr1-f65.google.com with SMTP id i17-v6so7927wre.7; Thu, 08 Nov 2018 15:27:49 -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=1hepCnQNsrg9aKtHaOWIVj4YcMJAb35t616uw/Dwv94=; b=sxiTHy2pew3eYXbXIjby6lt2MNXPKRmk06t76PkCHa0xAbJXdLbT+NLbGZgxvRTzxm pEoKjHnk9l5GjeEg4jkP4MH3YfLOBCNN+GsFVZ5GW6HcJDw2EtG2fHbSDOy573+mhCUk +scPpFr0jVIlMqyhfv2hyKmX3mKl+a0TuvpPxsgN9+g3QAuRLn4Xmmqbedw6ElMo0X2s CdIuItYG/yQYH79r8qNwRtkRjkd7ee/9ioudTpvd45N1IFTLzoqetvi7tD7KGNS7tKZz C1OkzzALkQtiJZvx7QGd89eICo+H9x5Fr7H51SH7NIX7jrgT4xpSmFiG0pBOY2Y2xZuh E7vg== 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=1hepCnQNsrg9aKtHaOWIVj4YcMJAb35t616uw/Dwv94=; b=PMPqys2XaUFLo0pgsF8qTwkjEPIMucCvgsKHkt0G4Jevs3zf0Ohb5Xv4gClRLLFCot CzPky6l6Iz1yTtDZgzXUfcyFVXhNEVkm4J3qhaKXxev1bw9FWtrynoKg0cchO9mNXk3B ZHvGl8t/Jh46H3sFELoL2ErF5hixV1gXCKbZBRNwjmEMBhAbWNOsWHkVivwLRIX8gmTi oNwAYY9XbuYamE/yaRoicRXlS76wwlc6XxCiX2SK3GDDZbeSe3Gxz4rNjj7VFrKRQmfw 8JiJiuHRnyM6M9oHaY/8hRO6J+d8OlHqN9ij7zdiKqxHqVu7AxUJobAi+q4yKIMg2be1 tHdQ== X-Gm-Message-State: AGRZ1gK/O2IFD+cR66J8g1r1jnxmQ8IBT6QAv7cfGK61j1e8wFnXsNlR So0f2uR5jCX6dIvXhAPmM9w= X-Google-Smtp-Source: AJdET5fxGPCwvo+/ApuPfLdhVZT7EXXHKX4qjHcw30kZGvcD2TIP0ZinFz2PxYMN0oSuuvxIb97mgQ== X-Received: by 2002:a5d:63cf:: with SMTP id c15-v6mr5990007wrw.221.1541719668943; Thu, 08 Nov 2018 15:27:48 -0800 (PST) Received: from ?IPv6:2003:ea:8bcf:e300:3cbc:a9ea:9ab8:4b19? (p200300EA8BCFE3003CBCA9EA9AB84B19.dip0.t-ipconnect.de. [2003:ea:8bcf:e300:3cbc:a9ea:9ab8:4b19]) by smtp.googlemail.com with ESMTPSA id r76-v6sm8210307wmb.21.2018.11.08.15.27.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Nov 2018 15:27:48 -0800 (PST) Subject: [PATCH net-next v2 1/2] net: phy: replace PHY_HAS_INTERRUPT with a check for config_intr and ack_interrupt From: Heiner Kallweit To: Andrew Lunn , Florian Fainelli , David Miller Cc: "netdev@vger.kernel.org" , "maintainer:BROADCOM BCM63XX ARM ARCHITECTURE" , Richard Cochran , Carlo Caione , Kevin Hilman , open list , "moderated list:BROADCOM BCM63XX ARM ARCHITECTURE" , "open list:ARM/Amlogic Meson SoC support" References: Message-ID: Date: Fri, 9 Nov 2018 00:27:46 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.3.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 Flag PHY_HAS_INTERRUPT is used only here for this small check. I think using interrupts isn't possible if a driver defines neither config_intr nor ack_interrupts callback. So we can replace checking flag PHY_HAS_INTERRUPT with checking for these callbacks. Signed-off-by: Heiner Kallweit --- v2: - add helper for the check --- drivers/net/phy/phy_device.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index d165a2c82..70895bc3f 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -2083,6 +2083,11 @@ static void of_set_phy_eee_broken(struct phy_device *phydev) phydev->eee_broken_modes = broken; } +static bool phy_drv_supports_irq(struct phy_driver *phydrv) +{ + return phydrv->config_intr || phydrv->ack_interrupt; +} + /** * phy_probe - probe and init a PHY device * @dev: device to probe and init @@ -2104,8 +2109,7 @@ static int phy_probe(struct device *dev) /* Disable the interrupt if the PHY doesn't support it * but the interrupt is still a valid one */ - if (!(phydrv->flags & PHY_HAS_INTERRUPT) && - phy_interrupt_is_valid(phydev)) + if (!phy_drv_supports_irq(phydrv) && phy_interrupt_is_valid(phydev)) phydev->irq = PHY_POLL; if (phydrv->flags & PHY_IS_INTERNAL)