#include <linux/udp.h>
#include <linux/cache.h>
#include <asm/io.h>
-#include <asm/irq.h>
#include <asm/uaccess.h>
/* VLAN tagging feature enable/disable */
};
struct cp_private {
- void __iomem *regs;
+ void *regs;
struct net_device *dev;
spinlock_t lock;
u32 msg_enable;
#endif
unsigned int wol_enabled : 1; /* Is Wake-on-LAN enabled? */
+ u32 power_state[16];
struct mii_if_info mii_if;
};
#define EE_READ_CMD (6)
#define EE_ERASE_CMD (7)
-static int read_eeprom (void __iomem *ioaddr, int location, int addr_len)
+static int read_eeprom (void *ioaddr, int location, int addr_len)
{
int i;
unsigned retval = 0;
- void __iomem *ee_addr = ioaddr + Cfg9346;
+ void *ee_addr = ioaddr + Cfg9346;
int read_cmd = location | (EE_READ_CMD << addr_len);
writeb (EE_ENB & ~EE_CS, ee_addr);
struct net_device *dev;
struct cp_private *cp;
int rc;
- void __iomem *regs;
+ void *regs;
long pciaddr;
unsigned int addr_len, i, pci_using_dac;
u8 pci_rev;
spin_unlock_irqrestore (&cp->lock, flags);
if (cp->pdev && cp->wol_enabled) {
- pci_save_state (cp->pdev);
+ pci_save_state (cp->pdev, cp->power_state);
cp_set_d3_state (cp);
}
if (cp->pdev && cp->wol_enabled) {
pci_set_power_state (cp->pdev, 0);
- pci_restore_state (cp->pdev);
+ pci_restore_state (cp->pdev, cp->power_state);
}
cp_init_hw (cp);