Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755335AbcCTW7d (ORCPT ); Sun, 20 Mar 2016 18:59:33 -0400 Received: from bh-25.webhostbox.net ([208.91.199.152]:44209 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751126AbcCTW7Y (ORCPT ); Sun, 20 Mar 2016 18:59:24 -0400 Subject: Re: [PATCH] lan78xx: Protect runtime_auto check by #ifdef CONFIG_PM To: Geert Uytterhoeven , Woojung Huh , Microchip Linux Driver Support , "David S. Miller" References: <1458470636-18986-1-git-send-email-geert@linux-m68k.org> Cc: "Rafael J. Wysocki" , netdev@vger.kernel.org, linux-usb@vger.kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org From: Guenter Roeck Message-ID: <56EF2B44.9040807@roeck-us.net> Date: Sun, 20 Mar 2016 15:59:16 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 MIME-Version: 1.0 In-Reply-To: <1458470636-18986-1-git-send-email-geert@linux-m68k.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit X-Authenticated_sender: linux@roeck-us.net X-OutGoing-Spam-Status: No, score=-1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - bh-25.webhostbox.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - roeck-us.net X-Get-Message-Sender-Via: bh-25.webhostbox.net: authenticated_id: linux@roeck-us.net X-Authenticated-Sender: bh-25.webhostbox.net: linux@roeck-us.net X-Source: X-Source-Args: X-Source-Dir: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1829 Lines: 48 On 03/20/2016 03:43 AM, Geert Uytterhoeven wrote: > If CONFIG_PM=n: > > drivers/net/usb/lan78xx.c: In function ‘lan78xx_get_stats64’: > drivers/net/usb/lan78xx.c:3274: error: ‘struct dev_pm_info’ has no member named ‘runtime_auto’ > > If PM is disabled, the runtime_auto flag is not available, but auto > suspend is not enabled anyway. Hence protect the check for runtime_auto > by #ifdef CONFIG_PM to fix this. > > Fixes: a59f8c5b048dc938 ("lan78xx: add ndo_get_stats64") > Reported-by: Guenter Roeck > Signed-off-by: Geert Uytterhoeven > --- > Alternatively, we can add a dev_pm_runtime_auto_is_enabled() wrapper to > include/linux/pm.h, which always return false if CONFIG_PM is disabled. > > The only other user in non-core code (drivers/usb/core/sysfs.c) has a > big #ifdef CONFIG_PM check around all PM-related code. > > Thoughts? Not that it matters anymore since David reverted the original patch, but my reason for not sending a similar patch was that I wasn't sure if .runtime_auto should be accessed from drivers in the first place, or if there is some logical problem with the code. Guenter > --- > drivers/net/usb/lan78xx.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c > index d36d5ebf37f355f2..7b9ac47b2ecf9905 100644 > --- a/drivers/net/usb/lan78xx.c > +++ b/drivers/net/usb/lan78xx.c > @@ -3271,7 +3271,9 @@ struct rtnl_link_stats64 *lan78xx_get_stats64(struct net_device *netdev, > * periodic reading from HW will prevent from entering USB auto suspend. > * if autosuspend is disabled, read from HW. > */ > +#ifdef CONFIG_PM > if (!dev->udev->dev.power.runtime_auto) > +#endif > lan78xx_update_stats(dev); > > mutex_lock(&dev->stats.access_lock); >