From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934107AbcI3QQB (ORCPT ); Fri, 30 Sep 2016 12:16:01 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:54945 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933082AbcI3QQA (ORCPT ); Fri, 30 Sep 2016 12:16:00 -0400 From: Arnd Bergmann To: Hariprasad S Cc: Arnd Bergmann , "David S. Miller" , Rahul Lakkireddy , Nicholas Bellinger , Varun Prakash , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] cxgb4: unexport cxgb4_dcb_enabled Date: Fri, 30 Sep 2016 18:15:33 +0200 Message-Id: <20160930161544.41614-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:/Dp/GiITgugSTFq4FEYp3PMCGyYG7D9dfJeBQ3dvqeAQSabttNe y6ZWwdo7XX0wDhv1BN7gP6LUQ4TxsmoaOmDoaWjCO1VdhkA05CTW8mp/vOrNLm26MSBatMO 6jI2xsQ7fBlmt1c2Hux5+vxLj1ZF0yE9aBBHZw6qTBpWaIEQCqcR6E9k66aVJMY5z8/8Jms 5mMxdtWgcvjj3w2duOQxA== X-UI-Out-Filterresults: notjunk:1;V01:K0:hOpBiEG4z3Q=:e1jyLm5ivbCgdThxQA0BLg iP317hB8wI/9fEDJGj1XsbXOcPHtGoDMBxUKHKMqznosqa3y+nGXR39P9JnCNCyj2rP615khQ VzG5U8belUL9DcnSMBH6Z7gmPlN8Trzu2ZGjwm979s1H+Cd8YtBZh8qjikxXQM9xeYaCSd1Dx zhOytqujtHR6ADYl02UKPZuQ4AImGPl8TTHlKqFzbbwuLVqnb0/pPDpewd8uq9MglNkGM2LGb 2o/hyHRGIcXiO8Rh0ZBjylKnPdaMxH5SZh+SnMqN2HjrcY87XOORpgbN4Ya2/F3j695KLdrHN vjCch3/+m7GdMREo8F3aO0BCww5C6DSLWIGicXbxpzBm52KYP2z3D433bOq4/p/XRsN4wRkKo evSEyPhZmkCHfrD4liR5DnIG7d0JyLBR9HSOFKKYW/6y20IvwYGnaJNeKiSAtFDHmRsA0MVtp TVi8p0XG4NvNWrpbqDJwJaqnmmlM6+YtEAyMD3U2S1argeOEHOck83WLD/vd/0A1B3AXsTAjl X3j7QAs4AEAuCNCVUNeRIO+YBUoPLA2jLqDGWM+DvGxbdOvzLf25fUesdrV3l+Cy6AqpuKsVu nSrFRFizRWjKvjVX0RrXVNJQz77MClAetN/mD7kzkU5atTuQQo8GZ0oQ6Zi76w3M4FRi3u+jT /alASm26uYvZbWa+TtMgj7REgu48PCZuMm6IlrQiGufvECLwhCOwO9OGhwYaVufUAQ50= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org A recent cleanup marked cxgb4_dcb_enabled as 'static', which is correct, but this ignored how the symbol is also exported. In addition, the export can be compiled out when modules are disabled, causing a harmless compiler warning in configurations for which it is not used at all: drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c:282:12: error: 'cxgb4_dcb_enabled' defined but not used [-Werror=unused-function] This removes the export and moves the function into the correct #ifdef so we only build it when there are users. Fixes: 50935857f878 ("cxgb4: mark symbols static where possible") Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c index c8a5c434ad2c..59f3772eb49d 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c @@ -277,11 +277,9 @@ static void dcb_tx_queue_prio_enable(struct net_device *dev, int enable) txq->dcb_prio = value; } } -#endif /* CONFIG_CHELSIO_T4_DCB */ static int cxgb4_dcb_enabled(const struct net_device *dev) { -#ifdef CONFIG_CHELSIO_T4_DCB struct port_info *pi = netdev_priv(dev); if (!pi->dcb.enabled) @@ -289,11 +287,8 @@ static int cxgb4_dcb_enabled(const struct net_device *dev) return ((pi->dcb.state == CXGB4_DCB_STATE_FW_ALLSYNCED) || (pi->dcb.state == CXGB4_DCB_STATE_HOST)); -#else - return 0; -#endif } -EXPORT_SYMBOL(cxgb4_dcb_enabled); +#endif /* CONFIG_CHELSIO_T4_DCB */ void t4_os_link_changed(struct adapter *adapter, int port_id, int link_stat) { -- 2.9.0