From patchwork Sat Jan 16 15:39:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arend Van Spriel X-Patchwork-Id: 8049181 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5D1689F3F6 for ; Sat, 16 Jan 2016 15:39:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7AAF92021A for ; Sat, 16 Jan 2016 15:39:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6B17720219 for ; Sat, 16 Jan 2016 15:39:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752045AbcAPPjR (ORCPT ); Sat, 16 Jan 2016 10:39:17 -0500 Received: from mail-wm0-f48.google.com ([74.125.82.48]:35695 "EHLO mail-wm0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751930AbcAPPjQ (ORCPT ); Sat, 16 Jan 2016 10:39:16 -0500 Received: by mail-wm0-f48.google.com with SMTP id r129so4592967wmr.0 for ; Sat, 16 Jan 2016 07:39:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=2/uoyn4y+hRHXwO/UCl1a5yVivt5XH36nDfUvuB0D5M=; b=nEIoVBtaug6371SereUHABF9cAGYZxq/EGWo5vl+MJWA4xz9TM33ykNfJJSv2TycyB jgOiEk1b6wgYqMxNzdQTcx/VDg2XK6k9axL57RATeT79nwIClVbWU5R0ISjt+Jen721j Byury9PdwFAVj//zdN9L9eYHta0iL//ZoLBnYBddyKc9JzOl45ACHx5bWVxD3viZr7GW FEGLF8VSuWcBTvcCWCyTFY6nAo8AjIX5UA3QTe27sN7RTceCc9FJ2D2FK32f/eiNzKv+ FWfxMi0oljpU92UHzteVBcwBSLUHQof5NHblwbEH8dxWDo1A9CZBcsdYa5zskZHb9rc3 72oQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=2/uoyn4y+hRHXwO/UCl1a5yVivt5XH36nDfUvuB0D5M=; b=kMEoEJoGVeZejrq2Db3sJTNWewoPFX2riGy+61wZ7iYpauH0D5YszmG/Li/jo3HFWV q3HBtw4s5x00EZhiU82FiUMPALxqoNT85Zt5aL9XTzluebECv3ev7JZcYzTgkEnpM3vn +/jJfqaUl/rWVyCagnX87nQmkk8RPmxROVtHKcwZTJUp8hlOlO9D61HiebB86z/0OyZv KMms8stSlR/6pP5I81v/FAAONib67ehJuZwkW5apAJT8F8spjaDHy6/kBUPnve1ooRPa 02ii16/6/2RmIcM7Bty/W5bS5+6XNCfWUjtkFrvAxUsM/Z9QUhX8W6Nb9UYfucFgDsWO Qi+Q== X-Gm-Message-State: AG10YOSZbVE6xrgoOMA9DUax+XqZcK/sOB+KvZTTntgyQ9oqQd700xD6C+Otq+L+M8byeA== X-Received: by 10.28.221.85 with SMTP id u82mr4402174wmg.95.1452958755334; Sat, 16 Jan 2016 07:39:15 -0800 (PST) Received: from z30-mint (92-108-47-17.dynamic.upc.nl. [92.108.47.17]) by smtp.gmail.com with ESMTPSA id az10sm15458274wjc.28.2016.01.16.07.39.14 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Sat, 16 Jan 2016 07:39:14 -0800 (PST) Received: from arend by z30-mint with local (Exim 4.82) (envelope-from ) id 1aKSwd-0003D8-PG; Sat, 16 Jan 2016 16:39:15 +0100 From: Arend van Spriel To: Kalle Valo Cc: linux-wireless@vger.kernel.org, Arend van Spriel Subject: [PATCH] brcmfmac: fix BRCMF_FW_NVRAM_DEF macro for older gcc compilers Date: Sat, 16 Jan 2016 16:39:13 +0100 Message-Id: <1452958753-12307-1-git-send-email-aspriel@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP With gcc < 4.3 __UNIQUE_ID does not create unique ids with the macro BRCMF_FW_NVRAM_DEF. Fix this by removing the MODULE_FIRMWARE instance for the nvram file. This file is not in linux-firmware repo so it may not be needed anyway. Otherwise consider this as a temporary fix. Reported-by: Geert Uytterhoeven Signed-off-by: Arend van Spriel Acked-by: Kalle Valo Tested-by: Geert Uytterhoeven --- Hi Kalle, Here a quick fix for the __UNIQUE_ID issue. Looking at the other issue right now, which seems a bit more complicated. Regards, Arend --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h index ef06f57..d3c9f0d 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h @@ -47,8 +47,7 @@ static const char BRCM_ ## fw_nvram_name ## _FIRMWARE_NAME[] = \ BRCMF_FW_DEFAULT_PATH fw; \ static const char BRCM_ ## fw_nvram_name ## _NVRAM_NAME[] = \ BRCMF_FW_DEFAULT_PATH nvram; \ -MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH fw); \ -MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH nvram) +MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH fw); #define BRCMF_FW_DEF(fw_name, fw) \ static const char BRCM_ ## fw_name ## _FIRMWARE_NAME[] = \