From patchwork Wed Oct 7 20:13:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 527407 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 35D0B140D6E for ; Thu, 8 Oct 2015 07:13:40 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755949AbbJGUNf (ORCPT ); Wed, 7 Oct 2015 16:13:35 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:58901 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752018AbbJGUNe (ORCPT ); Wed, 7 Oct 2015 16:13:34 -0400 Received: from wuerfel.localnet ([149.172.15.242]) by mrelayeu.kundenserver.de (mreue002) with ESMTPSA (Nemesis) id 0M2D36-1aZgEJ1kfc-00s6bT; Wed, 07 Oct 2015 22:13:23 +0200 From: Arnd Bergmann To: netdev@vger.kernel.org Cc: intel-wired-lan@lists.osuosl.org, Jesse Brandeburg , kbuild-all@01.org, Andrew Bowers , Jeff Kirsher , Shannon Nelson , Carolyn Wyborny , Don Skidmore , Matthew Vick , John Ronciak , Mitch Williams , David Miller Subject: [PATCH] i40evf: fix 32 bit build warnings Date: Wed, 07 Oct 2015 22:13:19 +0200 Message-ID: <6607276.TY67sbLLqL@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 X-Provags-ID: V03:K0:Hi1yXY4n+hwPuOrKhpGA9Lh3sO2Z7TmwEUcb8VjQ1hPfs+FX1pU K16q2yk9mg9D0l1D1uEgiJbZPA4mJzg0Of23JjzMhnewWCn1jCJiTMVRACyGd0OcXyvOAvs x4oL/w9d3AE+8KJR3WO3x/5XM3zy1WCBi+PbjxhpNJ5bERJ0Nga3P6zIkzJprKQNvQB7DaX xxBE/149QxDSDsDvsz5yw== X-UI-Out-Filterresults: notjunk:1; V01:K0:ctRmMMiev2E=:+TSnskiMC9/xA7iTUGbTco sFqBLXbND7sJb5l8pY7KlKgzz5PuTbH3gkb0C1XbYMPZZV0L1Y5Q7GLcJXAiMDUK2Nkm2lfox 7d5YsXV0h6e37nVx2kNQHIl+/zeBCrLBt1gPIeG3uNlC+JMrkYPfC3pJ8sfzm/nQf85Sl48m3 SPke5WwhJqeFCDGgAHJpbIp5nxYdDmzoM/I4TgKgYcrNguoumGE823Y+t/eTRA+mNb9AxxZxs JZbSHL1PY8i3Lf6sGWCsXoEaqJqinHAiqmuukm3WsQ9heJGy8CT1kfMXCvgjkr5GbzXV5OUXD cZ4MKMrS7XEUBGHikvA+yb7BZ5zAMv8IKQfvOjWWmDIGwkYtygLz+8MBYY4u5V2vALcPvp455 Pi4041byJ77tETQvlPJz8B7vefgOLlbMsqsM6a32n3Hu5vBBegsZ5qW7MGuPQqjRrqmWY87Uf tgF7xiRQQhuhkMkwsEhalH3H2FNtOLSscrcjgDn/Y3hm8TDu89ruBxRy4t+O8x9iFwtf7o15l GcsbMtIlFMrxJUEZetHV+FuF2j9lwhq/2fAM5HuNyEpt8Fc7W4Rr9ZjLul/RMOcIf2/PFOLqy ARHza16nD017Ys8XSgIxudXom2eDa3Q5q5yW0J/ZNauHw2Xs+OuWw1n1VurtVB8cRrQ+Mrko8 LGrigfnKznE1sdlSL2fw7+NwYTgUxaGGAAbTiMfsuA1j0FKTXCi1eP/QWKtI/cXCPOHmu8k0h Qzuk57NN1xhNy5xZ Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Jesse Brandeburg fixed a bug for 32-bit systems in the i40e driver in commit 9c70d7cebfec5 ("i40e: fix 32 bit build warnings"), but the same code still exists in the i40evf driver and causes compilation warnings in ARM and x86 allmodconfig: drivers/net/ethernet/intel/i40evf/i40e_common.c:445:68: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] drivers/net/ethernet/intel/i40evf/i40e_common.c:446:71: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] This applies the same fix by removing the broken code. Signed-off-by: Arnd Bergmann Acked-by: Jesse Brandeburg --- It would probably be a good idea to merge some of the duplicate code into a library module that gets used by both drivers to avoid having to fix bugs twice in the future. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/ethernet/intel/i40evf/i40e_common.c b/drivers/net/ethernet/intel/i40evf/i40e_common.c index 1950db10a414..92e180d9b86e 100644 --- a/drivers/net/ethernet/intel/i40evf/i40e_common.c +++ b/drivers/net/ethernet/intel/i40evf/i40e_common.c @@ -442,9 +442,6 @@ static i40e_status i40e_aq_get_set_rss_lut(struct i40e_hw *hw, I40E_AQC_SET_RSS_LUT_TABLE_TYPE_SHIFT) & I40E_AQC_SET_RSS_LUT_TABLE_TYPE_MASK)); - cmd_resp->addr_high = cpu_to_le32(high_16_bits((u64)lut)); - cmd_resp->addr_low = cpu_to_le32(lower_32_bits((u64)lut)); - status = i40evf_asq_send_command(hw, &desc, lut, lut_size, NULL); return status; @@ -519,8 +516,6 @@ static i40e_status i40e_aq_get_set_rss_key(struct i40e_hw *hw, I40E_AQC_SET_RSS_KEY_VSI_ID_SHIFT) & I40E_AQC_SET_RSS_KEY_VSI_ID_MASK)); cmd_resp->vsi_id |= cpu_to_le16((u16)I40E_AQC_SET_RSS_KEY_VSI_VALID); - cmd_resp->addr_high = cpu_to_le32(high_16_bits((u64)key)); - cmd_resp->addr_low = cpu_to_le32(lower_32_bits((u64)key)); status = i40evf_asq_send_command(hw, &desc, key, key_size, NULL);