From patchwork Sat Jan 19 09:02:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 213790 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 43F132C007A for ; Sat, 19 Jan 2013 20:07:37 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752105Ab3ASJGf (ORCPT ); Sat, 19 Jan 2013 04:06:35 -0500 Received: from mga11.intel.com ([192.55.52.93]:31720 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751551Ab3ASJDV (ORCPT ); Sat, 19 Jan 2013 04:03:21 -0500 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 19 Jan 2013 01:03:21 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.84,498,1355126400"; d="scan'208";a="278958251" Received: from jonmason-lab.ch.intel.com (HELO jonmason-lab) ([143.182.51.20]) by fmsmga002.fm.intel.com with SMTP; 19 Jan 2013 01:03:20 -0800 Received: by jonmason-lab (sSMTP sendmail emulation); Sat, 19 Jan 2013 02:03:20 -0700 From: Jon Mason To: Greg KH Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Dave Jiang , Nicholas Bellinger Subject: [PATCH 19/21] ntb_netdev: declare unused variables and fix missing initializer Date: Sat, 19 Jan 2013 02:02:33 -0700 Message-Id: <1358586155-23322-20-git-send-email-jon.mason@intel.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1358586155-23322-1-git-send-email-jon.mason@intel.com> References: <1358586155-23322-1-git-send-email-jon.mason@intel.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Tag qp in ntb_netdev_tx_handler and net_device in ntb_get_settings as unused function parameters. Also, correct missing initializer errors for 'struct device_driver' in ntb_netdev_client. This corrects issues found by 'EXTRA_CFLAGS=-W'. Signed-off-by: Jon Mason --- drivers/net/ntb_netdev.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/net/ntb_netdev.c b/drivers/net/ntb_netdev.c index 07c06cd..37173ce 100644 --- a/drivers/net/ntb_netdev.c +++ b/drivers/net/ntb_netdev.c @@ -125,8 +125,9 @@ static void ntb_netdev_rx_handler(struct ntb_transport_qp *qp, void *qp_data, } } -static void ntb_netdev_tx_handler(struct ntb_transport_qp *qp, void *qp_data, - void *data, int len) +static void +ntb_netdev_tx_handler(__attribute__((unused)) struct ntb_transport_qp *qp, + void *qp_data, void *data, int len) { struct net_device *ndev = qp_data; struct sk_buff *skb; @@ -284,7 +285,8 @@ static void ntb_get_drvinfo(struct net_device *ndev, strlcpy(info->bus_info, pci_name(dev->pdev), sizeof(info->bus_info)); } -static int ntb_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) +static int ntb_get_settings(__attribute__((unused)) struct net_device *dev, + struct ethtool_cmd *cmd) { cmd->supported = SUPPORTED_Backplane; cmd->advertising = ADVERTISED_Backplane; @@ -383,8 +385,10 @@ static void ntb_netdev_remove(struct pci_dev *pdev) } static struct ntb_client ntb_netdev_client = { - .driver.name = KBUILD_MODNAME, - .driver.owner = THIS_MODULE, + .driver = { + .name = KBUILD_MODNAME, + .owner = THIS_MODULE, + }, .probe = ntb_netdev_probe, .remove = ntb_netdev_remove, };