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

Commit 547c474f authored by Ben Hutchings's avatar Ben Hutchings
Browse files

sfc: Remove device ID macros only used once 



The SFC9020/SFL9021 device IDs are only used in the device ID table,
where we can just as well use comments.

Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
parent 8431a27a

drivers/net/ethernet/sfc/efx.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -2235,9 +2235,9 @@ static DEFINE_PCI_DEVICE_TABLE(efx_pci_table) = { 
	{PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE,

	{PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE,

		    PCI_DEVICE_ID_SOLARFLARE_SFC4000B),

		    PCI_DEVICE_ID_SOLARFLARE_SFC4000B),

	 .driver_data = (unsigned long) &falcon_b0_nic_type},

	 .driver_data = (unsigned long) &falcon_b0_nic_type},

	{PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, BETHPAGE_A_P_DEVID),

	{PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, 0x0803),	/* SFC9020 */

	 .driver_data = (unsigned long) &siena_a0_nic_type},

	 .driver_data = (unsigned long) &siena_a0_nic_type},

	{PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, SIENA_A_P_DEVID),

	{PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, 0x0813),	/* SFL9021 */

	 .driver_data = (unsigned long) &siena_a0_nic_type},

	 .driver_data = (unsigned long) &siena_a0_nic_type},

	{0}			/* end of list */

	{0}			/* end of list */

};

};

drivers/net/ethernet/sfc/efx.h

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

#include "net_driver.h"

#include "filter.h"

#include "filter.h"





/* PCI IDs */

#define BETHPAGE_A_P_DEVID      0x0803

#define SIENA_A_P_DEVID         0x0813



/* Solarstorm controllers use BAR 0 for I/O space and BAR 2(&3) for memory */

/* Solarstorm controllers use BAR 0 for I/O space and BAR 2(&3) for memory */

#define EFX_MEM_BAR 2

#define EFX_MEM_BAR 2