Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys KNF. No functional change.
details: https://anonhg.NetBSD.org/src/rev/17fd67485c78
branches: trunk
changeset: 816520:17fd67485c78
user: msaitoh <msaitoh%NetBSD.org@localhost>
date: Mon Jul 11 11:31:49 2016 +0000
description:
KNF. No functional change.
diffstat:
sys/arch/i386/isa/ahc_isa.c | 16 +-
sys/arch/i386/pci/gcscide.c | 9 +-
sys/arch/i386/pci/geodewdg.c | 10 +-
sys/arch/i386/pci/piixpcib.c | 26 +-
sys/arch/i386/pnpbios/fdc_pnpbios.c | 19 +-
sys/arch/i386/pnpbios/sb_pnpbios.c | 7 +-
sys/arch/x86/pci/tcpcib.c | 7 +-
sys/arch/xen/xen/hypervisor.c | 21 +-
sys/dev/acpi/com_acpi.c | 8 +-
sys/dev/acpi/ym_acpi.c | 10 +-
sys/dev/cardbus/njs_cardbus.c | 10 +-
sys/dev/dm/device-mapper.c | 48 +++---
sys/dev/eisa/ahb.c | 51 +++---
sys/dev/eisa/ahc_eisa.c | 8 +-
sys/dev/eisa/eisa.c | 11 +-
sys/dev/eisa/uha_eisa.c | 10 +-
sys/dev/gpib/cs80bus.c | 10 +-
sys/dev/gpib/ct.c | 20 +-
sys/dev/gpib/gpib.c | 10 +-
sys/dev/gpib/rd.c | 7 +-
sys/dev/i2c/dbcool.c | 68 ++++----
sys/dev/ic/aha.c | 35 ++-
sys/dev/ic/i82586.c | 80 ++++++----
sys/dev/ic/tulip.c | 76 +++++----
sys/dev/ic/uha.c | 46 +++--
sys/dev/isa/addcom_isa.c | 7 +-
sys/dev/isa/ast.c | 7 +-
sys/dev/isa/boca.c | 7 +-
sys/dev/isa/cec.c | 8 +-
sys/dev/isa/gus.c | 74 +++++---
sys/dev/isa/if_lc_isa.c | 14 +-
sys/dev/isa/if_ntwoc_isa.c | 12 +-
sys/dev/isa/if_tr_isa.c | 10 +-
sys/dev/isa/moxa_isa.c | 7 +-
sys/dev/isa/rtfps.c | 7 +-
sys/dev/isa/sbdsp.c | 27 ++-
sys/dev/isa/soekrisgpio.c | 8 +-
sys/dev/isa/tcom.c | 7 +-
sys/dev/isa/wds.c | 43 +++--
sys/dev/isa/wt.c | 19 +-
sys/dev/isapnp/if_an_isapnp.c | 7 +-
sys/dev/mca/ed_mca.c | 8 +-
sys/dev/mca/edc_mca.c | 26 ++-
sys/dev/mca/if_elmc_mca.c | 64 ++++---
sys/dev/mca/if_ep_mca.c | 7 +-
sys/dev/mca/if_tra_mca.c | 10 +-
sys/dev/pci/gffb.c | 61 +++----
sys/dev/pci/gtp.c | 10 +-
sys/dev/pci/iavc_pci.c | 42 ++--
sys/dev/pci/if_vte.c | 35 ++-
sys/dev/pci/machfb.c | 121 +++++++-------
sys/dev/pci/njs_pci.c | 7 +-
sys/dev/pci/piixpm.c | 24 +-
sys/dev/pci/voodoofb.c | 275 ++++++++++++++++++-----------------
sys/dev/pcmcia/if_tr_pcmcia.c | 10 +-
sys/dev/pcmcia/isic_pcmcia.c | 25 ++-
sys/dev/usb/uark.c | 13 +-
sys/dev/usb/uscanner.c | 36 ++--
sys/dev/usb/uthum.c | 23 +-
sys/net/if_etherip.c | 42 ++--
60 files changed, 935 insertions(+), 791 deletions(-)
diffs (truncated from 5658 to 300 lines):
diff -r cf620cc76c17 -r 17fd67485c78 sys/arch/i386/isa/ahc_isa.c
--- a/sys/arch/i386/isa/ahc_isa.c Mon Jul 11 11:26:46 2016 +0000
+++ b/sys/arch/i386/isa/ahc_isa.c Mon Jul 11 11:31:49 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ahc_isa.c,v 1.40 2014/10/18 08:33:25 snj Exp $ */
+/* $NetBSD: ahc_isa.c,v 1.41 2016/07/11 11:31:49 msaitoh Exp $ */
/*
* Product specific probe and attach routines for:
@@ -110,7 +110,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahc_isa.c,v 1.40 2014/10/18 08:33:25 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahc_isa.c,v 1.41 2016/07/11 11:31:49 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -304,7 +304,7 @@
*/
int
ahc_isa_probe(device_t parent, cfdata_t match, void *aux)
-{
+{
struct isa_attach_args *ia = aux;
struct ahc_isa_slot *as;
@@ -433,8 +433,8 @@
ahc->ih = isa_intr_establish(ia->ia_ic, irq,
intrtype, IPL_BIO, ahc_intr, ahc);
if (ahc->ih == NULL) {
- aprint_error_dev(ahc->sc_dev, "couldn't establish %s interrupt\n",
- intrtypestr);
+ aprint_error_dev(ahc->sc_dev,
+ "couldn't establish %s interrupt\n", intrtypestr);
goto free_io;
}
@@ -448,7 +448,7 @@
}
/*
- * Now that we know we own the resources we need, do the
+ * Now that we know we own the resources we need, do the
* card initialization.
*/
aha2840_load_seeprom(ahc);
@@ -478,7 +478,7 @@
sd.sd_bsh = ahc->bsh;
sd.sd_control_offset = SEECTL_2840;
sd.sd_status_offset = STATUS_2840;
- sd.sd_dataout_offset = STATUS_2840;
+ sd.sd_dataout_offset = STATUS_2840;
sd.sd_chip = C46;
sd.sd_MS = 0;
sd.sd_RDY = EEPROM_TF;
@@ -539,7 +539,7 @@
if (sc.adapter_control & CFRESETB)
scsi_conf |= RESET_SCSI;
- if (sc.bios_control & CF284XEXTEND)
+ if (sc.bios_control & CF284XEXTEND)
ahc->flags |= AHC_EXTENDED_TRANS_A;
/* Set SCSICONF info */
ahc_outb(ahc, SCSICONF, scsi_conf);
diff -r cf620cc76c17 -r 17fd67485c78 sys/arch/i386/pci/gcscide.c
--- a/sys/arch/i386/pci/gcscide.c Mon Jul 11 11:26:46 2016 +0000
+++ b/sys/arch/i386/pci/gcscide.c Mon Jul 11 11:31:49 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: gcscide.c,v 1.15 2013/10/07 19:51:55 jakllsch Exp $ */
+/* $NetBSD: gcscide.c,v 1.16 2016/07/11 11:31:49 msaitoh Exp $ */
/*-
* Copyright (c) 2007 Juan Romero Pardines.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gcscide.c,v 1.15 2013/10/07 19:51:55 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gcscide.c,v 1.16 2016/07/11 11:31:49 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,7 +48,7 @@
#include <machine/cpufunc.h>
-/*
+/*
* 6.4 - ATA-5 Controller Register Definitions.
*/
#define GCSCIDE_MSR_ATAC_BASE 0x51300000
@@ -85,7 +85,8 @@
static int gcscide_match(device_t, cfdata_t, void *);
static void gcscide_attach(device_t, device_t, void *);
-static void gcscide_chip_map(struct pciide_softc *, const struct pci_attach_args *);
+static void gcscide_chip_map(struct pciide_softc *,
+ const struct pci_attach_args *);
static void gcscide_setup_channel(struct ata_channel *);
/* PIO Format 1 settings */
diff -r cf620cc76c17 -r 17fd67485c78 sys/arch/i386/pci/geodewdg.c
--- a/sys/arch/i386/pci/geodewdg.c Mon Jul 11 11:26:46 2016 +0000
+++ b/sys/arch/i386/pci/geodewdg.c Mon Jul 11 11:31:49 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: geodewdg.c,v 1.11 2011/07/01 17:37:26 dyoung Exp $ */
+/* $NetBSD: geodewdg.c,v 1.12 2016/07/11 11:31:49 msaitoh Exp $ */
/*-
* Copyright (c) 2005 David Young. All rights reserved.
@@ -63,7 +63,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: geodewdg.c,v 1.11 2011/07/01 17:37:26 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: geodewdg.c,v 1.12 2016/07/11 11:31:49 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -144,7 +144,7 @@
static void
geode_wdog_reset(struct geode_wdog_softc *sc)
{
- /* set countdown */
+ /* set countdown */
bus_space_write_2(sc->sc_gcb_dev->sc_iot, sc->sc_gcb_dev->sc_ioh,
SC1100_GCB_WDTO, sc->sc_countdown);
}
@@ -237,8 +237,8 @@
* Determine cause of the last reset, and issue a warning if it
* was due to watchdog expiry.
*/
- wdsts = bus_space_read_1(sc->sc_gcb_dev->sc_iot, sc->sc_gcb_dev->sc_ioh,
- SC1100_GCB_WDSTS);
+ wdsts = bus_space_read_1(sc->sc_gcb_dev->sc_iot,
+ sc->sc_gcb_dev->sc_ioh, SC1100_GCB_WDSTS);
GEODE_DPRINTF(("%s: status %#02" PRIx8 "\n", device_xname(self),
wdsts));
diff -r cf620cc76c17 -r 17fd67485c78 sys/arch/i386/pci/piixpcib.c
--- a/sys/arch/i386/pci/piixpcib.c Mon Jul 11 11:26:46 2016 +0000
+++ b/sys/arch/i386/pci/piixpcib.c Mon Jul 11 11:31:49 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: piixpcib.c,v 1.21 2011/07/01 17:37:27 dyoung Exp $ */
+/* $NetBSD: piixpcib.c,v 1.22 2016/07/11 11:31:49 msaitoh Exp $ */
/*-
* Copyright (c) 2004, 2006 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: piixpcib.c,v 1.21 2011/07/01 17:37:27 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: piixpcib.c,v 1.22 2016/07/11 11:31:49 msaitoh Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -135,7 +135,8 @@
/* Map edge/level control registers */
if (bus_space_map(sc->sc_iot, PIIX_REG_ELCR, PIIX_REG_ELCR_SIZE, 0,
&sc->sc_ioh)) {
- aprint_error_dev(self, "can't map edge/level control registers\n");
+ aprint_error_dev(self,
+ "can't map edge/level control registers\n");
return;
}
@@ -189,7 +190,8 @@
#define PIIXPCIB_SPEEDSTEP_LOW 1
static void
-piixpcib_int15_gsic_call(int *sig, int *smicmd, int *cmd, int *smidata, int *flags)
+piixpcib_int15_gsic_call(int *sig, int *smicmd, int *cmd, int *smidata,
+ int *flags)
{
struct bioscallregs regs;
@@ -243,8 +245,8 @@
#ifdef DIAGNOSTIC
if (function != PIIXPCIB_GETSTATE &&
function != PIIXPCIB_SETSTATE) {
- aprint_error_dev(sc->sc_dev, "GSI called with invalid function %d\n",
- function);
+ aprint_error_dev(sc->sc_dev,
+ "GSI called with invalid function %d\n", function);
return EINVAL;
}
#endif
@@ -289,7 +291,7 @@
rv = piixpcib_getset_state(sc, &state, PIIXPCIB_GETSTATE);
if (rv)
return rv;
-
+
return state & 1;
}
@@ -308,7 +310,7 @@
try = 5;
s = splhigh();
-
+
do {
rv = piixpcib_getset_state(sc, &state, PIIXPCIB_SETSTATE);
if (rv)
@@ -334,7 +336,8 @@
sc->sc_smi_cmd = smicmd;
sc->sc_smi_data = smidata;
if (cmd == 0x80) {
- aprint_debug_dev(sc->sc_dev, "GSIC returned cmd 0x80, should be 0x82\n");
+ aprint_debug_dev(sc->sc_dev,
+ "GSIC returned cmd 0x80, should be 0x82\n");
cmd = 0x82;
}
sc->sc_command = (sig & 0xffffff00) | (cmd & 0xff);
@@ -348,8 +351,9 @@
}
if (piixpcib_set_ownership(sc) != 0) {
- aprint_error_dev(sc->sc_dev, "unable to claim ownership from the BIOS\n");
- return; /* If we can't claim ownership from the BIOS, bail */
+ aprint_error_dev(sc->sc_dev,
+ "unable to claim ownership from the BIOS\n");
+ return; /* If we can't claim ownership from the BIOS, bail */
}
/* Put in machdep.speedstep_state (0 for low, 1 for high). */
diff -r cf620cc76c17 -r 17fd67485c78 sys/arch/i386/pnpbios/fdc_pnpbios.c
--- a/sys/arch/i386/pnpbios/fdc_pnpbios.c Mon Jul 11 11:26:46 2016 +0000
+++ b/sys/arch/i386/pnpbios/fdc_pnpbios.c Mon Jul 11 11:31:49 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fdc_pnpbios.c,v 1.18 2015/04/13 16:51:40 riastradh Exp $ */
+/* $NetBSD: fdc_pnpbios.c,v 1.19 2016/07/11 11:31:49 msaitoh Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdc_pnpbios.c,v 1.18 2015/04/13 16:51:40 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdc_pnpbios.c,v 1.19 2016/07/11 11:31:49 msaitoh Exp $");
@@ -86,7 +86,7 @@
struct fdc_softc *fdc = &pdc->sc_fdc;
struct pnpbiosdev_attach_args *aa = aux;
int size, base;
-
+
aprint_normal("\n");
fdc->sc_dev = self;
@@ -98,9 +98,9 @@
return;
}
- /*
+ /*
* Start accounting for "odd" pnpbios's. Some probe as 4 ports,
- * some as 6 and some don't give the ctl port back.
+ * some as 6 and some don't give the ctl port back.
*/
if (pnpbios_getiosize(aa->pbt, aa->resc, 0, &size)) {
@@ -125,14 +125,15 @@
}
break;
default:
- aprint_error_dev(self, "unknown size: %d of io mapping\n", size);
+ aprint_error_dev(self, "unknown size: %d of io mapping\n",
+ size);
return;
}
-
- /*
+
+ /*
* XXX: This is bad. If the pnpbios claims only 1 I/O range then it's
* omitting the controller I/O port. (One has to exist for there to
- * be a working fdc). Just try and force the mapping in.
+ * be a working fdc). Just try and force the mapping in.
*/
if (aa->resc->numio == 1) {
diff -r cf620cc76c17 -r 17fd67485c78 sys/arch/i386/pnpbios/sb_pnpbios.c
--- a/sys/arch/i386/pnpbios/sb_pnpbios.c Mon Jul 11 11:26:46 2016 +0000
+++ b/sys/arch/i386/pnpbios/sb_pnpbios.c Mon Jul 11 11:31:49 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sb_pnpbios.c,v 1.16 2011/07/01 18:14:15 dyoung Exp $ */
+/* $NetBSD: sb_pnpbios.c,v 1.17 2016/07/11 11:31:49 msaitoh Exp $ */
/*
* Copyright (c) 1999
* Matthias Drochner. All rights reserved.
@@ -26,7 +26,7 @@
*/
Home |
Main Index |
Thread Index |
Old Index