Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/458042/?format=api
{ "id": 458042, "url": "http://patchwork.ozlabs.org/api/patches/458042/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1428092835-16834-6-git-send-email-jeffrey.t.kirsher@intel.com/", "project": { "id": 46, "url": "http://patchwork.ozlabs.org/api/projects/46/?format=api", "name": "Intel Wired Ethernet development", "link_name": "intel-wired-lan", "list_id": "intel-wired-lan.osuosl.org", "list_email": "intel-wired-lan@osuosl.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<1428092835-16834-6-git-send-email-jeffrey.t.kirsher@intel.com>", "list_archive_url": null, "date": "2015-04-03T20:26:56", "name": "[net-next,06/25] fm10k: fix unused warnings", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "7c1a3b03748651a591eb330f6a5a2b8aa0366462", "submitter": { "id": 473, "url": "http://patchwork.ozlabs.org/api/people/473/?format=api", "name": "Kirsher, Jeffrey T", "email": "jeffrey.t.kirsher@intel.com" }, "delegate": { "id": 68, "url": "http://patchwork.ozlabs.org/api/users/68/?format=api", "username": "jtkirshe", "first_name": "Jeff", "last_name": "Kirsher", "email": "jeffrey.t.kirsher@intel.com" }, "mbox": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1428092835-16834-6-git-send-email-jeffrey.t.kirsher@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/458042/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/458042/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@lists.osuosl.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Received": [ "from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137])\n\tby ozlabs.org (Postfix) with ESMTP id 0827B14012F\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 4 Apr 2015 07:27:26 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 4BD85A3502;\n\tFri, 3 Apr 2015 20:27:26 +0000 (UTC)", "from fraxinus.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id V5ZxYuL_jOw5; Fri, 3 Apr 2015 20:27:22 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id CAE4EA40BA;\n\tFri, 3 Apr 2015 20:27:22 +0000 (UTC)", "from whitealder.osuosl.org (whitealder.osuosl.org\n\t[140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id 6AF001C107C\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 3 Apr 2015 20:27:21 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 6762992165\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 3 Apr 2015 20:27:21 +0000 (UTC)", "from whitealder.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id kmUvFfMZudfL for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 3 Apr 2015 20:27:19 +0000 (UTC)", "from mga09.intel.com (mga09.intel.com [134.134.136.24])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 075BD92163\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 3 Apr 2015 20:27:19 +0000 (UTC)", "from fmsmga003.fm.intel.com ([10.253.24.29])\n\tby orsmga102.jf.intel.com with ESMTP; 03 Apr 2015 13:27:18 -0700", "from lwang4-mobl1.amr.corp.intel.com (HELO\n\tjtkirshe-mobl.amr.corp.intel.com) ([10.254.109.203])\n\tby FMSMGA003.fm.intel.com with ESMTP; 03 Apr 2015 13:27:18 -0700" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.11,519,1422950400\"; d=\"scan'208\";a=\"476517873\"", "From": "Jeff Kirsher <jeffrey.t.kirsher@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Fri, 3 Apr 2015 13:26:56 -0700", "Message-Id": "<1428092835-16834-6-git-send-email-jeffrey.t.kirsher@intel.com>", "X-Mailer": "git-send-email 1.9.3", "In-Reply-To": "<1428092835-16834-1-git-send-email-jeffrey.t.kirsher@intel.com>", "References": "<1428092835-16834-1-git-send-email-jeffrey.t.kirsher@intel.com>", "Subject": "[Intel-wired-lan] [net-next 06/25] fm10k: fix unused warnings", "X-BeenThere": "intel-wired-lan@lists.osuosl.org", "X-Mailman-Version": "2.1.18-1", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.lists.osuosl.org>", "List-Unsubscribe": "<http://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@lists.osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@lists.osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@lists.osuosl.org?subject=help>", "List-Subscribe": "<http://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@lists.osuosl.org?subject=subscribe>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@lists.osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@lists.osuosl.org>" }, "content": "The were several functions which had parameters which were never or\nsometimes used in functions. To resolve possible compiler warnings,\nuse __always_unused or __maybe_unused kernel macros to resolve.\n\nSigned-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\nAcked-by: Matthew Vick <matthew.vick@intel.com>\n---\n drivers/net/ethernet/intel/fm10k/fm10k_dcbnl.c | 6 +++---\n drivers/net/ethernet/intel/fm10k/fm10k_debugfs.c | 8 +++++---\n drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 12 ++++++------\n drivers/net/ethernet/intel/fm10k/fm10k_iov.c | 6 +++---\n drivers/net/ethernet/intel/fm10k/fm10k_main.c | 18 ++++++------------\n drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 17 +++++++++--------\n drivers/net/ethernet/intel/fm10k/fm10k_ptp.c | 5 +++--\n 7 files changed, 35 insertions(+), 37 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_dcbnl.c b/drivers/net/ethernet/intel/fm10k/fm10k_dcbnl.c\nindex 212a92d..5c7a4d7 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_dcbnl.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_dcbnl.c\n@@ -1,5 +1,5 @@\n /* Intel Ethernet Switch Host Interface Driver\n- * Copyright(c) 2013 - 2014 Intel Corporation.\n+ * Copyright(c) 2013 - 2015 Intel Corporation.\n *\n * This program is free software; you can redistribute it and/or modify it\n * under the terms and conditions of the GNU General Public License,\n@@ -128,7 +128,7 @@ static int fm10k_dcbnl_ieee_setpfc(struct net_device *dev, struct ieee_pfc *pfc)\n *\n * Returns that we support only IEEE DCB for this interface\n **/\n-static u8 fm10k_dcbnl_getdcbx(struct net_device *dev)\n+static u8 fm10k_dcbnl_getdcbx(struct net_device __always_unused *dev)\n {\n \treturn DCB_CAP_DCBX_HOST | DCB_CAP_DCBX_VER_IEEE;\n }\n@@ -140,7 +140,7 @@ static u8 fm10k_dcbnl_getdcbx(struct net_device *dev)\n *\n * Returns error on attempt to enable anything but IEEE DCB for this interface\n **/\n-static u8 fm10k_dcbnl_setdcbx(struct net_device *dev, u8 mode)\n+static u8 fm10k_dcbnl_setdcbx(struct net_device __always_unused *dev, u8 mode)\n {\n \treturn (mode != (DCB_CAP_DCBX_HOST | DCB_CAP_DCBX_VER_IEEE)) ? 1 : 0;\n }\ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_debugfs.c b/drivers/net/ethernet/intel/fm10k/fm10k_debugfs.c\nindex 4327f86..f45b4d7 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_debugfs.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_debugfs.c\n@@ -1,5 +1,5 @@\n /* Intel Ethernet Switch Host Interface Driver\n- * Copyright(c) 2013 - 2014 Intel Corporation.\n+ * Copyright(c) 2013 - 2015 Intel Corporation.\n *\n * This program is free software; you can redistribute it and/or modify it\n * under the terms and conditions of the GNU General Public License,\n@@ -36,14 +36,16 @@ static void *fm10k_dbg_desc_seq_start(struct seq_file *s, loff_t *pos)\n \treturn (*pos < ring->count) ? pos : NULL;\n }\n \n-static void *fm10k_dbg_desc_seq_next(struct seq_file *s, void *v, loff_t *pos)\n+static void *fm10k_dbg_desc_seq_next(struct seq_file *s,\n+\t\t\t\t void __always_unused *v, loff_t *pos)\n {\n \tstruct fm10k_ring *ring = s->private;\n \n \treturn (++(*pos) < ring->count) ? pos : NULL;\n }\n \n-static void fm10k_dbg_desc_seq_stop(struct seq_file *s, void *v)\n+static void fm10k_dbg_desc_seq_stop(struct seq_file __always_unused *s,\n+\t\t\t\t __always_unused void *v)\n {\n \t/* Do nothing. */\n }\ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c\nindex 7dd3c9d..697a269 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c\n@@ -116,8 +116,7 @@ enum fm10k_self_test_types {\n \tFM10K_TEST_MAX = FM10K_TEST_LEN\n };\n \n-static void fm10k_get_strings(struct net_device *dev, u32 stringset,\n-\t\t\t u8 *data)\n+static void fm10k_get_strings(struct net_device *dev, u32 stringset, u8 *data)\n {\n \tchar *p = (char *)data;\n \tint i;\n@@ -166,7 +165,8 @@ static int fm10k_get_sset_count(struct net_device *dev, int sset)\n }\n \n static void fm10k_get_ethtool_stats(struct net_device *netdev,\n-\t\t\t\t struct ethtool_stats *stats, u64 *data)\n+\t\t\t\t struct ethtool_stats __always_unused *stats,\n+\t\t\t\t u64 *data)\n {\n \tconst int stat_count = sizeof(struct fm10k_queue_stats) / sizeof(u64);\n \tstruct fm10k_intfc *interface = netdev_priv(netdev);\n@@ -644,7 +644,7 @@ static int fm10k_get_rss_hash_opts(struct fm10k_intfc *interface,\n }\n \n static int fm10k_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd,\n-\t\t\t u32 *rule_locs)\n+\t\t\t u32 __always_unused *rule_locs)\n {\n \tstruct fm10k_intfc *interface = netdev_priv(dev);\n \tint ret = -EOPNOTSUPP;\n@@ -850,7 +850,7 @@ static void fm10k_self_test(struct net_device *dev,\n \t\teth_test->flags |= ETH_TEST_FL_FAILED;\n }\n \n-static u32 fm10k_get_reta_size(struct net_device *netdev)\n+static u32 fm10k_get_reta_size(struct net_device __always_unused *netdev)\n {\n \treturn FM10K_RETA_SIZE * FM10K_RETA_ENTRIES_PER_REG;\n }\n@@ -910,7 +910,7 @@ static int fm10k_set_reta(struct net_device *netdev, const u32 *indir)\n \treturn 0;\n }\n \n-static u32 fm10k_get_rssrk_size(struct net_device *netdev)\n+static u32 fm10k_get_rssrk_size(struct net_device __always_unused *netdev)\n {\n \treturn FM10K_RSSRK_SIZE * FM10K_RSSRK_ENTRIES_PER_REG;\n }\ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_iov.c b/drivers/net/ethernet/intel/fm10k/fm10k_iov.c\nindex a02308f..69cbfde 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_iov.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_iov.c\n@@ -1,5 +1,5 @@\n /* Intel Ethernet Switch Host Interface Driver\n- * Copyright(c) 2013 - 2014 Intel Corporation.\n+ * Copyright(c) 2013 - 2015 Intel Corporation.\n *\n * This program is free software; you can redistribute it and/or modify it\n * under the terms and conditions of the GNU General Public License,\n@@ -488,8 +488,8 @@ int fm10k_ndo_set_vf_vlan(struct net_device *netdev, int vf_idx, u16 vid,\n \treturn 0;\n }\n \n-int fm10k_ndo_set_vf_bw(struct net_device *netdev, int vf_idx, int unused,\n-\t\t\tint rate)\n+int fm10k_ndo_set_vf_bw(struct net_device *netdev, int vf_idx,\n+\t\t\tint __always_unused unused, int rate)\n {\n \tstruct fm10k_intfc *interface = netdev_priv(netdev);\n \tstruct fm10k_iov_data *iov_data = interface->iov_data;\ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_main.c b/drivers/net/ethernet/intel/fm10k/fm10k_main.c\nindex c325bc0..e2c27ba 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_main.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_main.c\n@@ -209,7 +209,7 @@ static inline bool fm10k_page_is_reserved(struct page *page)\n \n static bool fm10k_can_reuse_rx_page(struct fm10k_rx_buffer *rx_buffer,\n \t\t\t\t struct page *page,\n-\t\t\t\t unsigned int truesize)\n+\t\t\t\t unsigned int __maybe_unused truesize)\n {\n \t/* avoid re-using remote pages */\n \tif (unlikely(fm10k_page_is_reserved(page)))\n@@ -240,7 +240,6 @@ static bool fm10k_can_reuse_rx_page(struct fm10k_rx_buffer *rx_buffer,\n \n /**\n * fm10k_add_rx_frag - Add contents of Rx buffer to sk_buff\n- * @rx_ring: rx descriptor ring to transact packets on\n * @rx_buffer: buffer containing page to add\n * @rx_desc: descriptor containing length of buffer written by hardware\n * @skb: sk_buff to place the data into\n@@ -253,8 +252,7 @@ static bool fm10k_can_reuse_rx_page(struct fm10k_rx_buffer *rx_buffer,\n * The function will then update the page offset if necessary and return\n * true if the buffer can be reused by the interface.\n **/\n-static bool fm10k_add_rx_frag(struct fm10k_ring *rx_ring,\n-\t\t\t struct fm10k_rx_buffer *rx_buffer,\n+static bool fm10k_add_rx_frag(struct fm10k_rx_buffer *rx_buffer,\n \t\t\t union fm10k_rx_desc *rx_desc,\n \t\t\t struct sk_buff *skb)\n {\n@@ -330,7 +328,7 @@ static struct sk_buff *fm10k_fetch_rx_buffer(struct fm10k_ring *rx_ring,\n \t\t\t\t DMA_FROM_DEVICE);\n \n \t/* pull page into skb */\n-\tif (fm10k_add_rx_frag(rx_ring, rx_buffer, rx_desc, skb)) {\n+\tif (fm10k_add_rx_frag(rx_buffer, rx_desc, skb)) {\n \t\t/* hand second half of page back to the ring */\n \t\tfm10k_reuse_rx_page(rx_ring, rx_buffer);\n \t} else {\n@@ -412,7 +410,7 @@ static void fm10k_rx_hwtstamp(struct fm10k_ring *rx_ring,\n }\n \n static void fm10k_type_trans(struct fm10k_ring *rx_ring,\n-\t\t\t union fm10k_rx_desc *rx_desc,\n+\t\t\t union fm10k_rx_desc __maybe_unused *rx_desc,\n \t\t\t struct sk_buff *skb)\n {\n \tstruct net_device *dev = rx_ring->netdev;\n@@ -509,8 +507,6 @@ static bool fm10k_is_non_eop(struct fm10k_ring *rx_ring,\n \n /**\n * fm10k_pull_tail - fm10k specific version of skb_pull_tail\n- * @rx_ring: rx descriptor ring packet is being transacted on\n- * @rx_desc: pointer to the EOP Rx descriptor\n * @skb: pointer to current skb being adjusted\n *\n * This function is an fm10k specific version of __pskb_pull_tail. The\n@@ -520,9 +516,7 @@ static bool fm10k_is_non_eop(struct fm10k_ring *rx_ring,\n * As a result we can do things like drop a frag and maintain an accurate\n * truesize for the skb.\n */\n-static void fm10k_pull_tail(struct fm10k_ring *rx_ring,\n-\t\t\t union fm10k_rx_desc *rx_desc,\n-\t\t\t struct sk_buff *skb)\n+static void fm10k_pull_tail(struct sk_buff *skb)\n {\n \tstruct skb_frag_struct *frag = &skb_shinfo(skb)->frags[0];\n \tunsigned char *va;\n@@ -576,7 +570,7 @@ static bool fm10k_cleanup_headers(struct fm10k_ring *rx_ring,\n \n \t/* place header in linear portion of buffer */\n \tif (skb_is_nonlinear(skb))\n-\t\tfm10k_pull_tail(rx_ring, rx_desc, skb);\n+\t\tfm10k_pull_tail(skb);\n \n \t/* if eth_skb_pad returns an error the skb was freed */\n \tif (eth_skb_pad(skb))\ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\nindex c11e2c9..12a3044 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\n@@ -807,7 +807,7 @@ static void fm10k_napi_enable_all(struct fm10k_intfc *interface)\n \t}\n }\n \n-irqreturn_t fm10k_msix_clean_rings(int irq, void *data)\n+irqreturn_t fm10k_msix_clean_rings(int __always_unused irq, void *data)\n {\n \tstruct fm10k_q_vector *q_vector = data;\n \n@@ -817,7 +817,7 @@ irqreturn_t fm10k_msix_clean_rings(int irq, void *data)\n \treturn IRQ_HANDLED;\n }\n \n-static irqreturn_t fm10k_msix_mbx_vf(int irq, void *data)\n+static irqreturn_t fm10k_msix_mbx_vf(int __always_unused irq, void *data)\n {\n \tstruct fm10k_intfc *interface = data;\n \tstruct fm10k_hw *hw = &interface->hw;\n@@ -963,7 +963,7 @@ static void fm10k_reset_drop_on_empty(struct fm10k_intfc *interface, u32 eicr)\n \t}\n }\n \n-static irqreturn_t fm10k_msix_mbx_pf(int irq, void *data)\n+static irqreturn_t fm10k_msix_mbx_pf(int __always_unused irq, void *data)\n {\n \tstruct fm10k_intfc *interface = data;\n \tstruct fm10k_hw *hw = &interface->hw;\n@@ -1068,7 +1068,7 @@ static s32 fm10k_mbx_mac_addr(struct fm10k_hw *hw, u32 **results,\n }\n \n static s32 fm10k_1588_msg_vf(struct fm10k_hw *hw, u32 **results,\n-\t\t\t struct fm10k_mbx_info *mbx)\n+\t\t\t struct fm10k_mbx_info __always_unused *mbx)\n {\n \tstruct fm10k_intfc *interface;\n \tu64 timestamp;\n@@ -1088,7 +1088,7 @@ static s32 fm10k_1588_msg_vf(struct fm10k_hw *hw, u32 **results,\n \n /* generic error handler for mailbox issues */\n static s32 fm10k_mbx_error(struct fm10k_hw *hw, u32 **results,\n-\t\t\t struct fm10k_mbx_info *mbx)\n+\t\t\t struct fm10k_mbx_info __always_unused *mbx)\n {\n \tstruct fm10k_intfc *interface;\n \tstruct pci_dev *pdev;\n@@ -1164,7 +1164,7 @@ static s32 fm10k_lport_map(struct fm10k_hw *hw, u32 **results,\n }\n \n static s32 fm10k_update_pvid(struct fm10k_hw *hw, u32 **results,\n-\t\t\t struct fm10k_mbx_info *mbx)\n+\t\t\t struct fm10k_mbx_info __always_unused *mbx)\n {\n \tstruct fm10k_intfc *interface;\n \tu16 glort, pvid;\n@@ -1205,7 +1205,7 @@ static s32 fm10k_update_pvid(struct fm10k_hw *hw, u32 **results,\n }\n \n static s32 fm10k_1588_msg_pf(struct fm10k_hw *hw, u32 **results,\n-\t\t\t struct fm10k_mbx_info *mbx)\n+\t\t\t struct fm10k_mbx_info __always_unused *mbx)\n {\n \tstruct fm10k_swapi_1588_timestamp timestamp;\n \tstruct fm10k_iov_data *iov_data;\n@@ -1983,7 +1983,8 @@ static int fm10k_resume(struct pci_dev *pdev)\n * a sleep state. The fm10k hardware does not support wake on lan so the\n * driver simply needs to shut down the device so it is in a low power state.\n **/\n-static int fm10k_suspend(struct pci_dev *pdev, pm_message_t state)\n+static int fm10k_suspend(struct pci_dev *pdev,\n+\t\t\t pm_message_t __always_unused state)\n {\n \tstruct fm10k_intfc *interface = pci_get_drvdata(pdev);\n \tstruct net_device *netdev = interface->netdev;\ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_ptp.c b/drivers/net/ethernet/intel/fm10k/fm10k_ptp.c\nindex d966044..f8b95be 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_ptp.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_ptp.c\n@@ -1,5 +1,5 @@\n /* Intel Ethernet Switch Host Interface Driver\n- * Copyright(c) 2013 - 2014 Intel Corporation.\n+ * Copyright(c) 2013 - 2015 Intel Corporation.\n *\n * This program is free software; you can redistribute it and/or modify it\n * under the terms and conditions of the GNU General Public License,\n@@ -319,7 +319,8 @@ static int fm10k_ptp_settime(struct ptp_clock_info *ptp,\n }\n \n static int fm10k_ptp_enable(struct ptp_clock_info *ptp,\n-\t\t\t struct ptp_clock_request *rq, int on)\n+\t\t\t struct ptp_clock_request *rq,\n+\t\t\t int __always_unused on)\n {\n \tstruct ptp_clock_time *t = &rq->perout.period;\n \tstruct fm10k_intfc *interface;\n", "prefixes": [ "net-next", "06/25" ] }