Commit d530db0d authored Nov 16, 2010 by Namhyung Kim Committed by David S. Miller Nov 18, 2010

3c59x: fix build failure on !CONFIG_PCI



VORTEX_PCI() could return NULL so it needs to be casted before
accessing any member of struct pci_dev. This fixes following
build failure. Likewise VORTEX_EISA() was changed also.

  CC [M]  drivers/net/3c59x.o
drivers/net/3c59x.c: In function 'acpi_set_WOL':
drivers/net/3c59x.c:3211:39: warning: dereferencing 'void *' pointer
drivers/net/3c59x.c:3211:39: error: request for member 'current_state' in something not a structure or union
make[3]: *** [drivers/net/3c59x.o] Error 1
make[2]: *** [drivers/net/3c59x.o] Error 2
make[1]: *** [sub-make] Error 2
make: *** [all] Error 2

Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 1aa46ec9

drivers/net/3c59x.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -699,7 +699,8 @@ DEFINE_WINDOW_IO(32)
		#define DEVICE_PCI(dev) NULL
		#endif

		#define VORTEX_PCI(vp) (((vp)->gendev) ? DEVICE_PCI((vp)->gendev) : NULL)
		#define VORTEX_PCI(vp) \
		((struct pci_dev *) (((vp)->gendev) ? DEVICE_PCI((vp)->gendev) : NULL))

		#ifdef CONFIG_EISA
		#define DEVICE_EISA(dev) (((dev)->bus == &eisa_bus_type) ? to_eisa_device((dev)) : NULL)
		@@ -707,7 +708,8 @@ DEFINE_WINDOW_IO(32)
		#define DEVICE_EISA(dev) NULL
		#endif

		#define VORTEX_EISA(vp) (((vp)->gendev) ? DEVICE_EISA((vp)->gendev) : NULL)
		#define VORTEX_EISA(vp) \
		((struct eisa_device *) (((vp)->gendev) ? DEVICE_EISA((vp)->gendev) : NULL))

		/* The action to take with a media selection timer tick.
		Note that we deviate from the 3Com order by checking 10base2 before AUI.

Admin message