From patchwork Tue Jun 21 00:17:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Hutchings X-Patchwork-Id: 638351 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 3rYSwg3wJZz9sdQ for ; Tue, 21 Jun 2016 10:17:39 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932960AbcFUARi (ORCPT ); Mon, 20 Jun 2016 20:17:38 -0400 Received: from ducie-dc1.codethink.co.uk ([185.25.241.215]:56317 "EHLO ducie-dc1.codethink.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932943AbcFUARc (ORCPT ); Mon, 20 Jun 2016 20:17:32 -0400 Received: from localhost (localhost [127.0.0.1]) by ducie-dc1.codethink.co.uk (Postfix) with ESMTP id 9D881462CFA; Tue, 21 Jun 2016 01:17:18 +0100 (BST) X-Virus-Scanned: Debian amavisd-new at ducie-dc1.codethink.co.uk Received: from ducie-dc1.codethink.co.uk ([127.0.0.1]) by localhost (ducie-dc1.codethink.co.uk [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UZ5TZtht8qLf; Tue, 21 Jun 2016 01:17:16 +0100 (BST) Received: from xylophone (shadbolt.e.decadent.org.uk [88.96.1.126]) by ducie-dc1.codethink.co.uk (Postfix) with ESMTPSA id 911AF4627A8; Tue, 21 Jun 2016 01:17:16 +0100 (BST) Message-ID: <1466468237.26723.20.camel@codethink.co.uk> Subject: [PATCH net-next] of_mdio: Enable fixed PHY support if driver is a module From: Ben Hutchings To: Florian Fainelli Cc: CT kernel , netdev@vger.kernel.org Date: Tue, 21 Jun 2016 01:17:17 +0100 Organization: Codethink Ltd. X-Mailer: Evolution 3.12.9-1+b1 Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The fixed_phy driver doesn't have to be built-in, and it's important that of_mdio supports it even if it's a module. Signed-off-by: Ben Hutchings Acked-by: Florian Fainelli --- Re-sending with the proper subject prefix. Ben. --- a/drivers/of/of_mdio.c +++ b/drivers/of/of_mdio.c @@ -274,7 +274,7 @@ struct phy_device *of_phy_attach(struct } EXPORT_SYMBOL(of_phy_attach); -#if defined(CONFIG_FIXED_PHY) +#if IS_ENABLED(CONFIG_FIXED_PHY) /* * of_phy_is_fixed_link() and of_phy_register_fixed_link() must * support two DT bindings: --- a/include/linux/of_mdio.h +++ b/include/linux/of_mdio.h @@ -69,7 +69,7 @@ static inline int of_mdio_parse_addr(str } #endif /* CONFIG_OF */ -#if defined(CONFIG_OF) && defined(CONFIG_FIXED_PHY) +#if defined(CONFIG_OF) && IS_ENABLED(CONFIG_FIXED_PHY) extern int of_phy_register_fixed_link(struct device_node *np); extern bool of_phy_is_fixed_link(struct device_node *np); #else