diff options
| author | dyoung <dyoung@NetBSD.org> | 2010-04-01 05:58:52 +0000 |
|---|---|---|
| committer | dyoung <dyoung@NetBSD.org> | 2010-04-01 05:58:52 +0000 |
| commit | fe84f32506d29f0f85bcf91386816e35d70c834f (patch) | |
| tree | 81502a487c748e8bffb1a22659a34e511321d41a /sys/dev | |
| parent | 2e75e5a699862007700744b5693e14a7041660f8 (diff) | |
Cosmetic: join a couple of lines. Stop storing the value of a BAR in a
temporary variable with the name 'csr'.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/cardbus/siisata_cardbus.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/sys/dev/cardbus/siisata_cardbus.c b/sys/dev/cardbus/siisata_cardbus.c index 9985e533021..58e206a9b5f 100644 --- a/sys/dev/cardbus/siisata_cardbus.c +++ b/sys/dev/cardbus/siisata_cardbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: siisata_cardbus.c,v 1.12 2010/03/18 20:54:56 dyoung Exp $ */ +/* $NetBSD: siisata_cardbus.c,v 1.13 2010/04/01 05:58:52 dyoung Exp $ */ /* Id: siisata_pci.c,v 1.11 2008/05/21 16:20:11 jakllsch Exp */ /* @@ -52,7 +52,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: siisata_cardbus.c,v 1.12 2010/03/18 20:54:56 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: siisata_cardbus.c,v 1.13 2010/04/01 05:58:52 dyoung Exp $"); #include <sys/types.h> #include <sys/malloc.h> @@ -175,9 +175,7 @@ siisata_cardbus_attach(device_t parent, device_t self, void *aux) { #define SIISATA_BAR0_SIZE 128 grsize = SIISATA_BAR0_SIZE; - csr = - Cardbus_conf_read(ct, ca->ca_tag, SIISATA_CARDBUS_BAR0); - base = PCI_MAPREG_MEM_ADDR(csr); + base = PCI_MAPREG_MEM_ADDR(Cardbus_conf_read(ct, ca->ca_tag, SIISATA_CARDBUS_BAR0)); memt = csc->sc_memt; if ((*cf->cardbus_space_alloc)(cc, csc->sc_rbus_memt, base, grsize, grsize - 1, grsize, 0, &base, &memh)) { @@ -186,8 +184,7 @@ siisata_cardbus_attach(device_t parent, device_t self, void *aux) SIISATANAME(sc)); return; } - Cardbus_conf_write(ct, ca->ca_tag, SIISATA_CARDBUS_BAR0, - base); + Cardbus_conf_write(ct, ca->ca_tag, SIISATA_CARDBUS_BAR0, base); } sc->sc_grt = memt; sc->sc_grh = memh; @@ -211,8 +208,7 @@ siisata_cardbus_attach(device_t parent, device_t self, void *aux) SIISATANAME(sc)); return; } - Cardbus_conf_write(ct, ca->ca_tag, SIISATA_CARDBUS_BAR1, - base); + Cardbus_conf_write(ct, ca->ca_tag, SIISATA_CARDBUS_BAR1, base); } sc->sc_prt = memt; sc->sc_prh = memh; |
