Author: marius
Date: Fri Apr 25 21:42:46 2014
New Revision: 264944
URL: http://svnweb.freebsd.org/changeset/base/264944
Log:
MFC: r260053
- There's no need to keep track of resource IDs.
- Simplify MSI allocation and release. For a single one, we don't need to
fiddle with the MSI count and pci_release_msi(9) is smart enough to just
do nothing in case of INTx.
- Don't allocate MSI as RF_SHAREABLE.
- Use DEVMETHOD_END.
- Use NULL instead of 0 for pointers.
Modified:
stable/9/sys/dev/iwn/if_iwn.c
stable/9/sys/dev/iwn/if_iwnvar.h
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/9/sys/dev/iwn/if_iwn.c
==============================================================================
--- stable/9/sys/dev/iwn/if_iwn.c Fri Apr 25 21:32:38 2014
(r264943)
+++ stable/9/sys/dev/iwn/if_iwn.c Fri Apr 25 21:42:46 2014
(r264944)
@@ -396,7 +396,8 @@ static device_method_t iwn_methods[] = {
DEVMETHOD(device_shutdown, iwn_shutdown),
DEVMETHOD(device_suspend, iwn_suspend),
DEVMETHOD(device_resume, iwn_resume),
- { 0, 0 }
+
+ DEVMETHOD_END
};
static driver_t iwn_driver = {
@@ -406,7 +407,7 @@ static driver_t iwn_driver = {
};
static devclass_t iwn_devclass;
-DRIVER_MODULE(iwn, pci, iwn_driver, iwn_devclass, 0, 0);
+DRIVER_MODULE(iwn, pci, iwn_driver, iwn_devclass, NULL, NULL);
MODULE_VERSION(iwn, 1);
@@ -436,7 +437,7 @@ iwn_attach(device_t dev)
struct ieee80211com *ic;
struct ifnet *ifp;
uint32_t reg;
- int i, error, result;
+ int i, error, rid;
uint8_t macaddr[IEEE80211_ADDR_LEN];
sc->sc_dev = dev;
@@ -466,8 +467,8 @@ iwn_attach(device_t dev)
/* Enable bus-mastering. */
pci_enable_busmaster(dev);
- sc->mem_rid = PCIR_BAR(0);
- sc->mem = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &sc->mem_rid,
+ rid = PCIR_BAR(0);
+ sc->mem = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid,
RF_ACTIVE);
if (sc->mem == NULL) {
device_printf(dev, "can't map mem space\n");
@@ -477,13 +478,13 @@ iwn_attach(device_t dev)
sc->sc_st = rman_get_bustag(sc->mem);
sc->sc_sh = rman_get_bushandle(sc->mem);
- sc->irq_rid = 0;
- if ((result = pci_msi_count(dev)) == 1 &&
- pci_alloc_msi(dev, &result) == 0)
- sc->irq_rid = 1;
+ i = 1;
+ rid = 0;
+ if (pci_alloc_msi(dev, &i) == 0)
+ rid = 1;
/* Install interrupt handler. */
- sc->irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &sc->irq_rid,
- RF_ACTIVE | RF_SHAREABLE);
+ sc->irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE |
+ (rid != 0 ? 0 : RF_SHAREABLE));
if (sc->irq == NULL) {
device_printf(dev, "can't map interrupt\n");
error = ENOMEM;
@@ -912,9 +913,9 @@ iwn_detach(device_t dev)
/* Uninstall interrupt handler. */
if (sc->irq != NULL) {
bus_teardown_intr(dev, sc->irq, sc->sc_ih);
- bus_release_resource(dev, SYS_RES_IRQ, sc->irq_rid, sc->irq);
- if (sc->irq_rid == 1)
- pci_release_msi(dev);
+ bus_release_resource(dev, SYS_RES_IRQ, rman_get_rid(sc->irq),
+ sc->irq);
+ pci_release_msi(dev);
}
/* Free DMA resources. */
@@ -928,7 +929,8 @@ iwn_detach(device_t dev)
iwn_free_fwmem(sc);
if (sc->mem != NULL)
- bus_release_resource(dev, SYS_RES_MEMORY, sc->mem_rid, sc->mem);
+ bus_release_resource(dev, SYS_RES_MEMORY,
+ rman_get_rid(sc->mem), sc->mem);
if (ifp != NULL)
if_free(ifp);
Modified: stable/9/sys/dev/iwn/if_iwnvar.h
==============================================================================
--- stable/9/sys/dev/iwn/if_iwnvar.h Fri Apr 25 21:32:38 2014
(r264943)
+++ stable/9/sys/dev/iwn/if_iwnvar.h Fri Apr 25 21:42:46 2014
(r264944)
@@ -254,11 +254,9 @@ struct iwn_softc {
struct iwn_tx_ring txq[IWN5000_NTXQUEUES];
struct iwn_rx_ring rxq;
- int mem_rid;
struct resource *mem;
bus_space_tag_t sc_st;
bus_space_handle_t sc_sh;
- int irq_rid;
struct resource *irq;
void *sc_ih;
bus_size_t sc_sz;
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
