Module Name: src
Committed By: dyoung
Date: Thu Apr 1 05:58:52 UTC 2010
Modified Files:
src/sys/dev/cardbus: siisata_cardbus.c
Log Message:
Cosmetic: join a couple of lines. Stop storing the value of a BAR in a
temporary variable with the name 'csr'.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/cardbus/siisata_cardbus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/cardbus/siisata_cardbus.c
diff -u src/sys/dev/cardbus/siisata_cardbus.c:1.12 src/sys/dev/cardbus/siisata_cardbus.c:1.13
--- src/sys/dev/cardbus/siisata_cardbus.c:1.12 Thu Mar 18 20:54:56 2010
+++ src/sys/dev/cardbus/siisata_cardbus.c Thu Apr 1 05:58:52 2010
@@ -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 @@
{
#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 @@
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 @@
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;
