Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b0be90c authored by Michael Buesch's avatar Michael Buesch Committed by John W. Linville
Browse files

b43/legacy: Remove firmware IDs 



This removes the "FWxx" ID strings from the b43 and b43legacy
drivers. They were once used to match a specific driver revision
to a set of firmware files. However, this is hardly useful today.
Additionally, the IDs are not updated and maintained properly, so
they might mislead users.

Signed-off-by: default avatarMichael Buesch <m@bues.ch>
Acked-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 8ad38d22

drivers/net/wireless/b43/b43.h

+0 −5
Original line number Diff line number Diff line
@@ -17,11 +17,6 @@ 
#include "phy_common.h"





/* The unique identifier of the firmware that's officially supported by

 * this driver version. */

#define B43_SUPPORTED_FIRMWARE_ID	"FW13"





#ifdef CONFIG_B43_DEBUG

# define B43_DEBUG	1

#else

drivers/net/wireless/b43/main.c

+1 −3
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ MODULE_AUTHOR("Michael Buesch"); 
MODULE_AUTHOR("Gábor Stefanik");

MODULE_LICENSE("GPL");



MODULE_FIRMWARE(B43_SUPPORTED_FIRMWARE_ID);

MODULE_FIRMWARE("b43/ucode11.fw");

MODULE_FIRMWARE("b43/ucode13.fw");

MODULE_FIRMWARE("b43/ucode14.fw");
@@ -5460,8 +5459,7 @@ static void b43_print_driverinfo(void) 
	feat_sdio = "S";

#endif

	printk(KERN_INFO "Broadcom 43xx driver loaded "

	       "[ Features: %s%s%s%s%s, Firmware-ID: "

	       B43_SUPPORTED_FIRMWARE_ID " ]\n",

	       "[ Features: %s%s%s%s%s ]\n",

	       feat_pci, feat_pcmcia, feat_nphy,

	       feat_leds, feat_sdio);

}

drivers/net/wireless/b43legacy/b43legacy.h

+0 −4
Original line number Diff line number Diff line
@@ -22,10 +22,6 @@ 
#include "phy.h"





/* The unique identifier of the firmware that's officially supported by this

 * driver version. */

#define B43legacy_SUPPORTED_FIRMWARE_ID	"FW10"



#define B43legacy_IRQWAIT_MAX_RETRIES	20



/* MMIO offsets */

drivers/net/wireless/b43legacy/main.c

+1 −3
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ MODULE_AUTHOR("Stefano Brivio"); 
MODULE_AUTHOR("Michael Buesch");

MODULE_LICENSE("GPL");



MODULE_FIRMWARE(B43legacy_SUPPORTED_FIRMWARE_ID);

MODULE_FIRMWARE("b43legacy/ucode2.fw");

MODULE_FIRMWARE("b43legacy/ucode4.fw");
@@ -3947,8 +3946,7 @@ static void b43legacy_print_driverinfo(void) 
	feat_dma = "D";

#endif

	printk(KERN_INFO "Broadcom 43xx-legacy driver loaded "

	       "[ Features: %s%s%s%s, Firmware-ID: "

	       B43legacy_SUPPORTED_FIRMWARE_ID " ]\n",

	       "[ Features: %s%s%s%s ]\n",

	       feat_pci, feat_leds, feat_pio, feat_dma);

}