Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pci_disable_retry() is now a no-op, so don't call it any more.

This commit is contained in:
dyoung 2008-03-11 20:39:24 +00:00
parent 974efd2037
commit e33cbf5cfc
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/dev/pci/if_ipw.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ipw.c,v 1.37 2008/02/29 06:13:39 dyoung Exp $ */
/* $NetBSD: if_ipw.c,v 1.38 2008/03/11 20:39:24 dyoung Exp $ */
/* FreeBSD: src/sys/dev/ipw/if_ipw.c,v 1.15 2005/11/13 17:17:40 damien Exp */
/*-
@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_ipw.c,v 1.37 2008/02/29 06:13:39 dyoung Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_ipw.c,v 1.38 2008/03/11 20:39:24 dyoung Exp $");
/*-
* Intel(R) PRO/Wireless 2100 MiniPCI driver
@ -94,8 +94,6 @@ static int ipw_match(struct device *, struct cfdata *, void *);
static void ipw_attach(struct device *, struct device *, void *);
static int ipw_detach(struct device *, int);
static bool ipw_resume(device_t PMF_FN_PROTO);
static int ipw_media_change(struct ifnet *);
static void ipw_media_status(struct ifnet *, struct ifmediareq *);
static int ipw_newstate(struct ieee80211com *, enum ieee80211_state, int);
@ -201,8 +199,6 @@ ipw_attach(struct device *parent, struct device *self, void *aux)
data |= PCI_COMMAND_MASTER_ENABLE;
pci_conf_write(sc->sc_pct, pa->pa_tag, PCI_COMMAND_STATUS_REG, data);
pci_disable_retry(sc->sc_pct, sc->sc_pcitag);
/* map the register window */
error = pci_mapreg_map(pa, IPW_PCI_BAR0, PCI_MAPREG_TYPE_MEM |
PCI_MAPREG_MEM_TYPE_32BIT, 0, &memt, &memh, &base, &sc->sc_sz);
@ -334,7 +330,7 @@ ipw_attach(struct device *parent, struct device *self, void *aux)
*/
sc->dwelltime = 100;
if (!pmf_device_register(self, NULL, ipw_resume))
if (!pmf_device_register(self, NULL, NULL))
aprint_error_dev(self, "couldn't establish power handler\n");
else
pmf_class_network_register(self, ifp);
@ -742,16 +738,6 @@ ipw_release(struct ipw_softc *sc)
}
static bool
ipw_resume(device_t dv PMF_FN_ARGS)
{
struct ipw_softc *sc = device_private(dv);
pci_disable_retry(sc->sc_pct, sc->sc_pcitag);
return true;
}
static int
ipw_media_change(struct ifnet *ifp)
{