summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2006-11-16 01:32:37 +0000
committerchristos <christos@NetBSD.org>2006-11-16 01:32:37 +0000
commit168cd830d22e1f4a4c2bde1105f9f94d40fb870d (patch)
treef82ce44db748b3513a12da35feca2a8d352de90f /sys/dev
parentc72ed40f2540010a7b00337d0da9266cc2092eb6 (diff)
__unused removal on arguments; approved by core.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/acpi/acpi.c16
-rw-r--r--sys/dev/acpi/acpi_acad.c12
-rw-r--r--sys/dev/acpi/acpi_apm.c24
-rw-r--r--sys/dev/acpi/acpi_bat.c12
-rw-r--r--sys/dev/acpi/acpi_button.c10
-rw-r--r--sys/dev/acpi/acpi_ec.c12
-rw-r--r--sys/dev/acpi/acpi_lid.c10
-rw-r--r--sys/dev/acpi/acpi_madt.c6
-rw-r--r--sys/dev/acpi/acpi_resource.c12
-rw-r--r--sys/dev/acpi/acpi_timer.c8
-rw-r--r--sys/dev/acpi/acpi_tz.c12
-rw-r--r--sys/dev/acpi/acpica/OsdMisc.c6
-rw-r--r--sys/dev/acpi/acpica/OsdSynch.c6
-rw-r--r--sys/dev/acpi/attimer_acpi.c10
-rw-r--r--sys/dev/acpi/com_acpi.c8
-rw-r--r--sys/dev/acpi/fdc_acpi.c10
-rw-r--r--sys/dev/acpi/joy_acpi.c8
-rw-r--r--sys/dev/acpi/lpt_acpi.c8
-rw-r--r--sys/dev/acpi/mpu_acpi.c8
-rw-r--r--sys/dev/acpi/pckbc_acpi.c8
-rw-r--r--sys/dev/acpi/pcppi_acpi.c8
-rw-r--r--sys/dev/acpi/wss_acpi.c8
-rw-r--r--sys/dev/acpi/ym_acpi.c8
-rw-r--r--sys/dev/apm/apm.c16
-rw-r--r--sys/dev/ata/ata.c18
-rw-r--r--sys/dev/ata/ata_raid.c16
-rw-r--r--sys/dev/ata/atareg.h6
-rw-r--r--sys/dev/ata/ld_ataraid.c14
-rw-r--r--sys/dev/ata/wd.c22
-rw-r--r--sys/dev/auconv.c12
-rw-r--r--sys/dev/audio.c32
-rw-r--r--sys/dev/aurateconv.c8
-rw-r--r--sys/dev/bluetooth/bthidev.c24
-rw-r--r--sys/dev/bluetooth/bthub.c14
-rw-r--r--sys/dev/bluetooth/btkbd.c14
-rw-r--r--sys/dev/bluetooth/btms.c14
-rw-r--r--sys/dev/bluetooth/btsco.c36
-rw-r--r--sys/dev/cardbus/adv_cardbus.c8
-rw-r--r--sys/dev/cardbus/ahc_cardbus.c8
-rw-r--r--sys/dev/cardbus/cardbus.c14
-rw-r--r--sys/dev/cardbus/cardbus_map.c6
-rw-r--r--sys/dev/cardbus/cardslot.c12
-rw-r--r--sys/dev/cardbus/com_cardbus.c8
-rw-r--r--sys/dev/cardbus/ehci_cardbus.c10
-rw-r--r--sys/dev/cardbus/fwohci_cardbus.c10
-rw-r--r--sys/dev/cardbus/if_ath_cardbus.c10
-rw-r--r--sys/dev/cardbus/if_atw_cardbus.c10
-rw-r--r--sys/dev/cardbus/if_ex_cardbus.c10
-rw-r--r--sys/dev/cardbus/if_fxp_cardbus.c10
-rw-r--r--sys/dev/cardbus/if_ral_cardbus.c12
-rw-r--r--sys/dev/cardbus/if_re_cardbus.c12
-rw-r--r--sys/dev/cardbus/if_rtk_cardbus.c10
-rw-r--r--sys/dev/cardbus/if_rtw_cardbus.c10
-rw-r--r--sys/dev/cardbus/if_tlp_cardbus.c12
-rw-r--r--sys/dev/cardbus/njata_cardbus.c10
-rw-r--r--sys/dev/cardbus/njs_cardbus.c8
-rw-r--r--sys/dev/cardbus/ohci_cardbus.c10
-rw-r--r--sys/dev/cardbus/uhci_cardbus.c10
-rw-r--r--sys/dev/ccd.c16
-rw-r--r--sys/dev/cgd.c10
-rw-r--r--sys/dev/clockctl.c10
-rw-r--r--sys/dev/cons.c6
-rw-r--r--sys/dev/dksubr.c16
-rw-r--r--sys/dev/dkwedge/dk.c28
-rw-r--r--sys/dev/dkwedge/dkwedge_bsdlabel.c6
-rw-r--r--sys/dev/eisa/ahb.c10
-rw-r--r--sys/dev/eisa/ahc_eisa.c8
-rw-r--r--sys/dev/eisa/bha_eisa.c8
-rw-r--r--sys/dev/eisa/cac_eisa.c8
-rw-r--r--sys/dev/eisa/dpt_eisa.c8
-rw-r--r--sys/dev/eisa/eisa.c8
-rw-r--r--sys/dev/eisa/eisabusprint.c4
-rw-r--r--sys/dev/eisa/if_ep_eisa.c8
-rw-r--r--sys/dev/eisa/if_fea.c10
-rw-r--r--sys/dev/eisa/if_tlp_eisa.c8
-rw-r--r--sys/dev/eisa/mlx_eisa.c8
-rw-r--r--sys/dev/eisa/uha_eisa.c8
-rw-r--r--sys/dev/firmload.c6
-rw-r--r--sys/dev/fss.c20
-rw-r--r--sys/dev/gpio/gpio.c30
-rw-r--r--sys/dev/gpio/gpioow.c10
-rw-r--r--sys/dev/hpc/apm/apmdev.c26
-rw-r--r--sys/dev/hpc/btnmgr.c18
-rw-r--r--sys/dev/hpc/hpcapm.c14
-rw-r--r--sys/dev/hpc/hpcfb.c26
-rw-r--r--sys/dev/hpc/hpckbd.c22
-rw-r--r--sys/dev/hpc/hpf1275a_tty.c26
-rw-r--r--sys/dev/hpc/video_subr.c12
-rw-r--r--sys/dev/i2c/adt7463.c14
-rw-r--r--sys/dev/i2c/i2c.c14
-rw-r--r--sys/dev/i2c/i2c_bitbang.c6
-rw-r--r--sys/dev/i2o/dpti.c16
-rw-r--r--sys/dev/i2o/iop.c18
-rw-r--r--sys/dev/i2o/iopsp.c10
-rw-r--r--sys/dev/i2o/ld_iop.c8
-rw-r--r--sys/dev/ic/aac.c8
-rw-r--r--sys/dev/ic/ad1848.c10
-rw-r--r--sys/dev/ic/advlib.c6
-rw-r--r--sys/dev/ic/aha.c6
-rw-r--r--sys/dev/ic/aic6360.c6
-rw-r--r--sys/dev/ic/aic79xx.c32
-rw-r--r--sys/dev/ic/aic79xx_inline.h20
-rw-r--r--sys/dev/ic/aic79xx_osm.c12
-rw-r--r--sys/dev/ic/aic79xx_osm.h48
-rw-r--r--sys/dev/ic/aic7xxx.c22
-rw-r--r--sys/dev/ic/aic7xxx_inline.h6
-rw-r--r--sys/dev/ic/aic7xxx_osm.c14
-rw-r--r--sys/dev/ic/aic7xxx_osm.h40
-rw-r--r--sys/dev/ic/ath.c20
-rw-r--r--sys/dev/ic/athrate-sample.c10
-rw-r--r--sys/dev/ic/atw.c8
-rw-r--r--sys/dev/ic/ax88190.c6
-rw-r--r--sys/dev/ic/cac.c6
-rw-r--r--sys/dev/ic/ciss.c8
-rw-r--r--sys/dev/ic/com.c20
-rw-r--r--sys/dev/ic/cy.c12
-rw-r--r--sys/dev/ic/depca.c8
-rw-r--r--sys/dev/ic/dp8390.c6
-rw-r--r--sys/dev/ic/dpt.c10
-rw-r--r--sys/dev/ic/elink3.c6
-rw-r--r--sys/dev/ic/hd64570.c10
-rw-r--r--sys/dev/ic/i82365.c6
-rw-r--r--sys/dev/ic/i82557.c8
-rw-r--r--sys/dev/ic/i82586.c8
-rw-r--r--sys/dev/ic/icp.c12
-rw-r--r--sys/dev/ic/icp_ioctl.c8
-rw-r--r--sys/dev/ic/icpsp.c6
-rw-r--r--sys/dev/ic/interwave.c28
-rw-r--r--sys/dev/ic/isp.c6
-rw-r--r--sys/dev/ic/isp_inline.h14
-rw-r--r--sys/dev/ic/isp_netbsd.c6
-rw-r--r--sys/dev/ic/joy.c18
-rw-r--r--sys/dev/ic/lance.c6
-rw-r--r--sys/dev/ic/ld_aac.c8
-rw-r--r--sys/dev/ic/ld_cac.c8
-rw-r--r--sys/dev/ic/ld_icp.c6
-rw-r--r--sys/dev/ic/ld_mlx.c8
-rw-r--r--sys/dev/ic/lpt.c16
-rw-r--r--sys/dev/ic/mb86950.c8
-rw-r--r--sys/dev/ic/mb89352.c8
-rw-r--r--sys/dev/ic/mlx.c20
-rw-r--r--sys/dev/ic/mpu.c8
-rw-r--r--sys/dev/ic/mtd803.c10
-rw-r--r--sys/dev/ic/ncr5380sbc.c6
-rw-r--r--sys/dev/ic/ncr53c9x.c12
-rw-r--r--sys/dev/ic/ne2000.c6
-rw-r--r--sys/dev/ic/ninjaata32.c12
-rw-r--r--sys/dev/ic/ninjascsi32.c6
-rw-r--r--sys/dev/ic/opl.c12
-rw-r--r--sys/dev/ic/pcdisplay_chars.c6
-rw-r--r--sys/dev/ic/pdq_ifsubr.c6
-rw-r--r--sys/dev/ic/rrunner.c16
-rw-r--r--sys/dev/ic/rt2560.c12
-rw-r--r--sys/dev/ic/rt2661.c16
-rw-r--r--sys/dev/ic/rtl8169.c6
-rw-r--r--sys/dev/ic/rtl81x9.c6
-rw-r--r--sys/dev/ic/rtw.c28
-rw-r--r--sys/dev/ic/rtwphy.c12
-rw-r--r--sys/dev/ic/rtwphyio.c6
-rw-r--r--sys/dev/ic/siop_common.c8
-rw-r--r--sys/dev/ic/sl811hs.c50
-rw-r--r--sys/dev/ic/smc91cxx.c6
-rw-r--r--sys/dev/ic/spic.c8
-rw-r--r--sys/dev/ic/tcic2.c6
-rw-r--r--sys/dev/ic/tropic.c6
-rw-r--r--sys/dev/ic/uha.c6
-rw-r--r--sys/dev/ic/vga.c10
-rw-r--r--sys/dev/ic/vga_raster.c18
-rw-r--r--sys/dev/ic/wi.c14
-rw-r--r--sys/dev/ieee1394/firewire.c6
-rw-r--r--sys/dev/ieee1394/fw_port.h34
-rw-r--r--sys/dev/ieee1394/fwdev.c6
-rw-r--r--sys/dev/ieee1394/fwdma.c8
-rw-r--r--sys/dev/ieee1394/fwohci.c10
-rw-r--r--sys/dev/ieee1394/if_fwip.c4
-rw-r--r--sys/dev/ieee1394/sbp.c4
-rw-r--r--sys/dev/ir/irframe.c16
-rw-r--r--sys/dev/ir/irframe_tty.c30
-rw-r--r--sys/dev/isa/ad1848_isa.c8
-rw-r--r--sys/dev/isa/addcom_isa.c8
-rw-r--r--sys/dev/isa/adv_isa.c8
-rw-r--r--sys/dev/isa/aha_isa.c8
-rw-r--r--sys/dev/isa/aic_isa.c8
-rw-r--r--sys/dev/isa/aria.c22
-rw-r--r--sys/dev/isa/ast.c8
-rw-r--r--sys/dev/isa/attimer_isa.c8
-rw-r--r--sys/dev/isa/aztech.c12
-rw-r--r--sys/dev/isa/bha_isa.c8
-rw-r--r--sys/dev/isa/boca.c8
-rw-r--r--sys/dev/isa/cms.c12
-rw-r--r--sys/dev/isa/com_isa.c8
-rw-r--r--sys/dev/isa/com_multi.c8
-rw-r--r--sys/dev/isa/cy_isa.c8
-rw-r--r--sys/dev/isa/depca_isa.c8
-rw-r--r--sys/dev/isa/dpt_isa.c8
-rw-r--r--sys/dev/isa/ess.c26
-rw-r--r--sys/dev/isa/ess_isa.c8
-rw-r--r--sys/dev/isa/fd.c14
-rw-r--r--sys/dev/isa/fdc_isa.c10
-rw-r--r--sys/dev/isa/gus.c26
-rw-r--r--sys/dev/isa/i82365_isa.c8
-rw-r--r--sys/dev/isa/if_ai.c10
-rw-r--r--sys/dev/isa/if_ate.c8
-rw-r--r--sys/dev/isa/if_cs_isa.c8
-rw-r--r--sys/dev/isa/if_ec.c10
-rw-r--r--sys/dev/isa/if_ef.c8
-rw-r--r--sys/dev/isa/if_eg.c10
-rw-r--r--sys/dev/isa/if_el.c8
-rw-r--r--sys/dev/isa/if_ep_isa.c8
-rw-r--r--sys/dev/isa/if_fmv_isa.c8
-rw-r--r--sys/dev/isa/if_ix.c10
-rw-r--r--sys/dev/isa/if_iy.c8
-rw-r--r--sys/dev/isa/if_lc_isa.c8
-rw-r--r--sys/dev/isa/if_le_isa.c16
-rw-r--r--sys/dev/isa/if_ne_isa.c8
-rw-r--r--sys/dev/isa/if_ntwoc_isa.c10
-rw-r--r--sys/dev/isa/if_sm_isa.c8
-rw-r--r--sys/dev/isa/if_tr_isa.c6
-rw-r--r--sys/dev/isa/if_tribm_isa.c6
-rw-r--r--sys/dev/isa/if_trtcm_isa.c8
-rw-r--r--sys/dev/isa/if_we_isa.c8
-rw-r--r--sys/dev/isa/ioat66.c8
-rw-r--r--sys/dev/isa/isa.c14
-rw-r--r--sys/dev/isa/isabusprint.c4
-rw-r--r--sys/dev/isa/isic_isa.c6
-rw-r--r--sys/dev/isa/it.c8
-rw-r--r--sys/dev/isa/joy_isa.c8
-rw-r--r--sys/dev/isa/lm_isa.c8
-rw-r--r--sys/dev/isa/lpt_isa.c10
-rw-r--r--sys/dev/isa/mcd.c24
-rw-r--r--sys/dev/isa/midi_pcppi.c13
-rw-r--r--sys/dev/isa/moxa_isa.c8
-rw-r--r--sys/dev/isa/mpu_isa.c8
-rw-r--r--sys/dev/isa/mpu_sb.c8
-rw-r--r--sys/dev/isa/mpu_ym.c8
-rw-r--r--sys/dev/isa/nca_isa.c8
-rw-r--r--sys/dev/isa/nsclpcsio_isa.c12
-rw-r--r--sys/dev/isa/opl_ess.c8
-rw-r--r--sys/dev/isa/opl_isa.c8
-rw-r--r--sys/dev/isa/opl_sb.c8
-rw-r--r--sys/dev/isa/opl_wss.c8
-rw-r--r--sys/dev/isa/opl_ym.c8
-rw-r--r--sys/dev/isa/pas.c8
-rw-r--r--sys/dev/isa/pcdisplay.c28
-rw-r--r--sys/dev/isa/pckbc_isa.c8
-rw-r--r--sys/dev/isa/pcppi.c10
-rw-r--r--sys/dev/isa/radiotrack.c12
-rw-r--r--sys/dev/isa/radiotrack2.c12
-rw-r--r--sys/dev/isa/rtfps.c8
-rw-r--r--sys/dev/isa/satlink.c22
-rw-r--r--sys/dev/isa/sb_isa.c6
-rw-r--r--sys/dev/isa/sbdsp.c24
-rw-r--r--sys/dev/isa/seagate.c14
-rw-r--r--sys/dev/isa/sf16fmr2.c12
-rw-r--r--sys/dev/isa/slhci_isa.c8
-rw-r--r--sys/dev/isa/spkr.c24
-rw-r--r--sys/dev/isa/tcic2_isa.c8
-rw-r--r--sys/dev/isa/tcom.c8
-rw-r--r--sys/dev/isa/uha_isa.c8
-rw-r--r--sys/dev/isa/vga_isa.c8
-rw-r--r--sys/dev/isa/wdc_isa.c8
-rw-r--r--sys/dev/isa/wds.c10
-rw-r--r--sys/dev/isa/wss.c8
-rw-r--r--sys/dev/isa/wss_isa.c6
-rw-r--r--sys/dev/isa/wt.c28
-rw-r--r--sys/dev/isapnp/aha_isapnp.c8
-rw-r--r--sys/dev/isapnp/aic_isapnp.c8
-rw-r--r--sys/dev/isapnp/com_isapnp.c8
-rw-r--r--sys/dev/isapnp/ess_isapnp.c8
-rw-r--r--sys/dev/isapnp/gus_isapnp.c8
-rw-r--r--sys/dev/isapnp/i82365_isapnp.c8
-rw-r--r--sys/dev/isapnp/if_an_isapnp.c8
-rw-r--r--sys/dev/isapnp/if_ep_isapnp.c8
-rw-r--r--sys/dev/isapnp/if_fmv_isapnp.c8
-rw-r--r--sys/dev/isapnp/if_le_isapnp.c8
-rw-r--r--sys/dev/isapnp/if_ne_isapnp.c8
-rw-r--r--sys/dev/isapnp/if_tr_isapnp.c8
-rw-r--r--sys/dev/isapnp/isapnp.c10
-rw-r--r--sys/dev/isapnp/isic_isapnp.c8
-rw-r--r--sys/dev/isapnp/joy_isapnp.c8
-rw-r--r--sys/dev/isapnp/mpu_isapnp.c8
-rw-r--r--sys/dev/isapnp/sb_isapnp.c8
-rw-r--r--sys/dev/isapnp/wdc_isapnp.c8
-rw-r--r--sys/dev/isapnp/wss_isapnp.c8
-rw-r--r--sys/dev/isapnp/ym_isapnp.c8
-rw-r--r--sys/dev/kttcp.c10
-rw-r--r--sys/dev/ld.c14
-rw-r--r--sys/dev/lockstat.c18
-rw-r--r--sys/dev/mca/aha_mca.c8
-rw-r--r--sys/dev/mca/com_mca.c8
-rw-r--r--sys/dev/mca/ed_mca.c14
-rw-r--r--sys/dev/mca/edc_mca.c8
-rw-r--r--sys/dev/mca/esp_mca.c35
-rw-r--r--sys/dev/mca/if_ate_mca.c8
-rw-r--r--sys/dev/mca/if_elmc_mca.c8
-rw-r--r--sys/dev/mca/if_ep_mca.c8
-rw-r--r--sys/dev/mca/if_le_mca.c8
-rw-r--r--sys/dev/mca/if_ne_mca.c8
-rw-r--r--sys/dev/mca/if_tr_mca.c8
-rw-r--r--sys/dev/mca/if_tra_mca.c8
-rw-r--r--sys/dev/mca/if_we_mca.c8
-rw-r--r--sys/dev/mca/mca.c6
-rw-r--r--sys/dev/mca/mcabusprint.c4
-rw-r--r--sys/dev/md.c22
-rw-r--r--sys/dev/md_root.c6
-rw-r--r--sys/dev/microcode/aic7xxx/aic79xx_seq.h2
-rw-r--r--sys/dev/microcode/aic7xxx/aic7xxx_seq.h6
-rw-r--r--sys/dev/midi.c20
-rw-r--r--sys/dev/midictl.c12
-rw-r--r--sys/dev/midisyn.c18
-rw-r--r--sys/dev/mii/acphy.c8
-rw-r--r--sys/dev/mii/amhphy.c8
-rw-r--r--sys/dev/mii/bmtphy.c8
-rw-r--r--sys/dev/mii/brgphy.c10
-rw-r--r--sys/dev/mii/ciphy.c8
-rw-r--r--sys/dev/mii/dmphy.c8
-rw-r--r--sys/dev/mii/exphy.c8
-rw-r--r--sys/dev/mii/gentbi.c8
-rw-r--r--sys/dev/mii/glxtphy.c8
-rw-r--r--sys/dev/mii/gphyter.c8
-rw-r--r--sys/dev/mii/icsphy.c8
-rw-r--r--sys/dev/mii/igphy.c8
-rw-r--r--sys/dev/mii/ikphy.c8
-rw-r--r--sys/dev/mii/inphy.c8
-rw-r--r--sys/dev/mii/iophy.c8
-rw-r--r--sys/dev/mii/lxtphy.c8
-rw-r--r--sys/dev/mii/makphy.c8
-rw-r--r--sys/dev/mii/mii_physubr.c8
-rw-r--r--sys/dev/mii/nsphy.c8
-rw-r--r--sys/dev/mii/nsphyter.c8
-rw-r--r--sys/dev/mii/pnaphy.c8
-rw-r--r--sys/dev/mii/qsphy.c8
-rw-r--r--sys/dev/mii/rgephy.c8
-rw-r--r--sys/dev/mii/rlphy.c8
-rw-r--r--sys/dev/mii/sqphy.c8
-rw-r--r--sys/dev/mii/tlphy.c8
-rw-r--r--sys/dev/mii/tqphy.c8
-rw-r--r--sys/dev/mii/ukphy.c10
-rw-r--r--sys/dev/mii/urlphy.c8
-rw-r--r--sys/dev/mm.c8
-rw-r--r--sys/dev/mulaw.c8
-rw-r--r--sys/dev/onewire/onewire.c14
-rw-r--r--sys/dev/onewire/onewire_subr.c4
-rw-r--r--sys/dev/onewire/owtemp.c10
-rw-r--r--sys/dev/pci/aac_pci.c8
-rw-r--r--sys/dev/pci/acardide.c8
-rw-r--r--sys/dev/pci/aceride.c8
-rw-r--r--sys/dev/pci/adv_pci.c8
-rw-r--r--sys/dev/pci/adw_pci.c8
-rw-r--r--sys/dev/pci/agp.c18
-rw-r--r--sys/dev/pci/agp_ali.c6
-rw-r--r--sys/dev/pci/agp_amd.c6
-rw-r--r--sys/dev/pci/agp_i810.c8
-rw-r--r--sys/dev/pci/agp_intel.c6
-rw-r--r--sys/dev/pci/agp_sis.c6
-rw-r--r--sys/dev/pci/agp_via.c6
-rw-r--r--sys/dev/pci/agpbusprint.c4
-rw-r--r--sys/dev/pci/ahc_pci.c8
-rw-r--r--sys/dev/pci/ahd_pci.c10
-rw-r--r--sys/dev/pci/amdpm.c8
-rw-r--r--sys/dev/pci/amdpm_smbus.c10
-rw-r--r--sys/dev/pci/amr.c16
-rw-r--r--sys/dev/pci/artsata.c12
-rw-r--r--sys/dev/pci/auacer.c28
-rw-r--r--sys/dev/pci/auich.c26
-rw-r--r--sys/dev/pci/auixp.c28
-rw-r--r--sys/dev/pci/autri.c30
-rw-r--r--sys/dev/pci/auvia.c22
-rw-r--r--sys/dev/pci/azalia.c24
-rw-r--r--sys/dev/pci/azalia_codec.c14
-rw-r--r--sys/dev/pci/bha_pci.c8
-rw-r--r--sys/dev/pci/bktr/bktr_card.c12
-rw-r--r--sys/dev/pci/bktr/bktr_core.c12
-rw-r--r--sys/dev/pci/bktr/bktr_os.c20
-rw-r--r--sys/dev/pci/cac_pci.c8
-rw-r--r--sys/dev/pci/ciss_pci.c8
-rw-r--r--sys/dev/pci/cmdide.c8
-rw-r--r--sys/dev/pci/cmpci.c22
-rw-r--r--sys/dev/pci/com_puc.c8
-rw-r--r--sys/dev/pci/cs4280.c18
-rw-r--r--sys/dev/pci/cs4281.c14
-rw-r--r--sys/dev/pci/cs428x.c12
-rw-r--r--sys/dev/pci/cy_pci.c8
-rw-r--r--sys/dev/pci/cypide.c8
-rw-r--r--sys/dev/pci/cz.c16
-rw-r--r--sys/dev/pci/dpt_pci.c8
-rw-r--r--sys/dev/pci/eap.c30
-rw-r--r--sys/dev/pci/ehci_pci.c8
-rw-r--r--sys/dev/pci/emuxki.c24
-rw-r--r--sys/dev/pci/esa.c30
-rw-r--r--sys/dev/pci/esiop_pci.c8
-rw-r--r--sys/dev/pci/esm.c38
-rw-r--r--sys/dev/pci/eso.c26
-rw-r--r--sys/dev/pci/fms.c28
-rw-r--r--sys/dev/pci/fwohci_pci.c8
-rw-r--r--sys/dev/pci/geodeide.c8
-rw-r--r--sys/dev/pci/gtp.c16
-rw-r--r--sys/dev/pci/hifn7751.c10
-rw-r--r--sys/dev/pci/hptide.c8
-rw-r--r--sys/dev/pci/i82365_pci.c8
-rw-r--r--sys/dev/pci/iavc_pci.c10
-rw-r--r--sys/dev/pci/icp_pci.c38
-rw-r--r--sys/dev/pci/if_an_pci.c8
-rw-r--r--sys/dev/pci/if_ath_pci.c10
-rw-r--r--sys/dev/pci/if_atw_pci.c8
-rw-r--r--sys/dev/pci/if_bce.c6
-rw-r--r--sys/dev/pci/if_bge.c14
-rw-r--r--sys/dev/pci/if_dge.c12
-rw-r--r--sys/dev/pci/if_en_pci.c10
-rw-r--r--sys/dev/pci/if_ep_pci.c8
-rw-r--r--sys/dev/pci/if_epic_pci.c8
-rw-r--r--sys/dev/pci/if_esh_pci.c8
-rw-r--r--sys/dev/pci/if_ex_pci.c8
-rw-r--r--sys/dev/pci/if_fpa.c10
-rw-r--r--sys/dev/pci/if_fxp_pci.c8
-rw-r--r--sys/dev/pci/if_hme_pci.c8
-rw-r--r--sys/dev/pci/if_ipw.c14
-rw-r--r--sys/dev/pci/if_iwi.c16
-rw-r--r--sys/dev/pci/if_le_pci.c8
-rw-r--r--sys/dev/pci/if_lmc.c22
-rw-r--r--sys/dev/pci/if_msk.c16
-rw-r--r--sys/dev/pci/if_mtd_pci.c8
-rw-r--r--sys/dev/pci/if_ne_pci.c8
-rw-r--r--sys/dev/pci/if_nfe.c12
-rw-r--r--sys/dev/pci/if_ntwoc_pci.c8
-rw-r--r--sys/dev/pci/if_pcn.c8
-rw-r--r--sys/dev/pci/if_ral_pci.c10
-rw-r--r--sys/dev/pci/if_re_pci.c6
-rw-r--r--sys/dev/pci/if_rtk_pci.c8
-rw-r--r--sys/dev/pci/if_sf_pci.c8
-rw-r--r--sys/dev/pci/if_sip.c14
-rw-r--r--sys/dev/pci/if_sk.c14
-rw-r--r--sys/dev/pci/if_ste.c8
-rw-r--r--sys/dev/pci/if_stge.c8
-rw-r--r--sys/dev/pci/if_ti.c10
-rw-r--r--sys/dev/pci/if_tl.c14
-rw-r--r--sys/dev/pci/if_tlp_pci.c36
-rw-r--r--sys/dev/pci/if_txp.c10
-rw-r--r--sys/dev/pci/if_vge.c8
-rw-r--r--sys/dev/pci/if_vr.c8
-rw-r--r--sys/dev/pci/if_wi_pci.c8
-rw-r--r--sys/dev/pci/if_wpi.c14
-rw-r--r--sys/dev/pci/if_xge.c12
-rw-r--r--sys/dev/pci/ifpci.c14
-rw-r--r--sys/dev/pci/ifpci2.c14
-rw-r--r--sys/dev/pci/iha_pci.c8
-rw-r--r--sys/dev/pci/iop_pci.c8
-rw-r--r--sys/dev/pci/isic_pci.c12
-rw-r--r--sys/dev/pci/isp_pci.c8
-rw-r--r--sys/dev/pci/iteide.c8
-rw-r--r--sys/dev/pci/iwic_pci.c12
-rw-r--r--sys/dev/pci/ixpide.c8
-rw-r--r--sys/dev/pci/joy_eap.c6
-rw-r--r--sys/dev/pci/joy_eso.c8
-rw-r--r--sys/dev/pci/joy_pci.c8
-rw-r--r--sys/dev/pci/ld_amr.c8
-rw-r--r--sys/dev/pci/ld_twa.c10
-rw-r--r--sys/dev/pci/ld_twe.c8
-rw-r--r--sys/dev/pci/lpt_puc.c8
-rw-r--r--sys/dev/pci/machfb.c18
-rw-r--r--sys/dev/pci/mlx_pci.c8
-rw-r--r--sys/dev/pci/mly.c22
-rw-r--r--sys/dev/pci/mpt_pci.c8
-rw-r--r--sys/dev/pci/mpu_cmpci.c8
-rw-r--r--sys/dev/pci/mpu_eso.c8
-rw-r--r--sys/dev/pci/mpu_fms.c8
-rw-r--r--sys/dev/pci/mpu_yds.c8
-rw-r--r--sys/dev/pci/neo.c32
-rw-r--r--sys/dev/pci/njs_pci.c8
-rw-r--r--sys/dev/pci/oboe.c22
-rw-r--r--sys/dev/pci/ohci_pci.c8
-rw-r--r--sys/dev/pci/opl_cmpci.c8
-rw-r--r--sys/dev/pci/opl_eso.c8
-rw-r--r--sys/dev/pci/opl_fms.c8
-rw-r--r--sys/dev/pci/opl_sv.c8
-rw-r--r--sys/dev/pci/opl_yds.c8
-rw-r--r--sys/dev/pci/optiide.c8
-rw-r--r--sys/dev/pci/pccbb.c16
-rw-r--r--sys/dev/pci/pci.c14
-rw-r--r--sys/dev/pci/pci_map.c6
-rw-r--r--sys/dev/pci/pci_subr.c12
-rw-r--r--sys/dev/pci/pci_usrreq.c14
-rw-r--r--sys/dev/pci/pciide.c8
-rw-r--r--sys/dev/pci/pciide_common.c6
-rw-r--r--sys/dev/pci/pcscp.c8
-rw-r--r--sys/dev/pci/pdcide.c8
-rw-r--r--sys/dev/pci/pdcsata.c10
-rw-r--r--sys/dev/pci/piixide.c8
-rw-r--r--sys/dev/pci/piixpm.c6
-rw-r--r--sys/dev/pci/ppb.c8
-rw-r--r--sys/dev/pci/puc.c8
-rw-r--r--sys/dev/pci/rccide.c8
-rw-r--r--sys/dev/pci/satalink.c8
-rw-r--r--sys/dev/pci/siop_pci.c8
-rw-r--r--sys/dev/pci/siside.c8
-rw-r--r--sys/dev/pci/slide.c8
-rw-r--r--sys/dev/pci/stpcide.c8
-rw-r--r--sys/dev/pci/sv.c24
-rw-r--r--sys/dev/pci/svwsata.c10
-rw-r--r--sys/dev/pci/trm.c8
-rw-r--r--sys/dev/pci/twa.c22
-rw-r--r--sys/dev/pci/twe.c20
-rw-r--r--sys/dev/pci/ubsec.c12
-rw-r--r--sys/dev/pci/uhci_pci.c8
-rw-r--r--sys/dev/pci/vga_pci.c12
-rw-r--r--sys/dev/pci/viaenv.c10
-rw-r--r--sys/dev/pci/viaide.c8
-rw-r--r--sys/dev/pci/viapm.c8
-rw-r--r--sys/dev/pci/weasel_pci.c8
-rw-r--r--sys/dev/pci/yds.c26
-rw-r--r--sys/dev/pckbport/pckbd.c14
-rw-r--r--sys/dev/pckbport/pms.c12
-rw-r--r--sys/dev/pckbport/synaptics.c4
-rw-r--r--sys/dev/pcmcia/aic_pcmcia.c8
-rw-r--r--sys/dev/pcmcia/bt3c.c12
-rw-r--r--sys/dev/pcmcia/com_pcmcia.c8
-rw-r--r--sys/dev/pcmcia/esl.c28
-rw-r--r--sys/dev/pcmcia/esl_pcmcia.c8
-rw-r--r--sys/dev/pcmcia/esp_pcmcia.c10
-rw-r--r--sys/dev/pcmcia/if_an_pcmcia.c10
-rw-r--r--sys/dev/pcmcia/if_awi_pcmcia.c10
-rw-r--r--sys/dev/pcmcia/if_cnw.c10
-rw-r--r--sys/dev/pcmcia/if_cs_pcmcia.c10
-rw-r--r--sys/dev/pcmcia/if_ep_pcmcia.c6
-rw-r--r--sys/dev/pcmcia/if_mbe_pcmcia.c10
-rw-r--r--sys/dev/pcmcia/if_ne_pcmcia.c8
-rw-r--r--sys/dev/pcmcia/if_ray.c12
-rw-r--r--sys/dev/pcmcia/if_sm_pcmcia.c8
-rw-r--r--sys/dev/pcmcia/if_tr_pcmcia.c8
-rw-r--r--sys/dev/pcmcia/if_wi_pcmcia.c10
-rw-r--r--sys/dev/pcmcia/if_xi.c8
-rw-r--r--sys/dev/pcmcia/isic_pcmcia.c10
-rw-r--r--sys/dev/pcmcia/isic_pcmcia_elsa_mcall.c18
-rw-r--r--sys/dev/pcmcia/mhzc.c16
-rw-r--r--sys/dev/pcmcia/opl_esl.c8
-rw-r--r--sys/dev/pcmcia/pcmcia.c10
-rw-r--r--sys/dev/pcmcia/pcmcia_cis.c12
-rw-r--r--sys/dev/pcmcia/pcmcom.c14
-rw-r--r--sys/dev/pcmcia/spc_pcmcia.c8
-rw-r--r--sys/dev/pcmcia/wdc_pcmcia.c8
-rw-r--r--sys/dev/pcmcia/xirc.c14
-rw-r--r--sys/dev/radio.c16
-rw-r--r--sys/dev/raidframe/rf_acctrace.c6
-rw-r--r--sys/dev/raidframe/rf_alloclist.c6
-rw-r--r--sys/dev/raidframe/rf_callback.c6
-rw-r--r--sys/dev/raidframe/rf_chaindecluster.c10
-rw-r--r--sys/dev/raidframe/rf_copyback.c6
-rw-r--r--sys/dev/raidframe/rf_cvscan.c8
-rw-r--r--sys/dev/raidframe/rf_dagdegrd.c20
-rw-r--r--sys/dev/raidframe/rf_dagdegwr.c14
-rw-r--r--sys/dev/raidframe/rf_dagffrd.c16
-rw-r--r--sys/dev/raidframe/rf_dagffwr.c20
-rw-r--r--sys/dev/raidframe/rf_dagfuncs.c14
-rw-r--r--sys/dev/raidframe/rf_dagutils.c14
-rw-r--r--sys/dev/raidframe/rf_debugMem.c6
-rw-r--r--sys/dev/raidframe/rf_decluster.c10
-rw-r--r--sys/dev/raidframe/rf_declusterPQ.c6
-rw-r--r--sys/dev/raidframe/rf_diskqueue.c6
-rw-r--r--sys/dev/raidframe/rf_disks.c14
-rw-r--r--sys/dev/raidframe/rf_driver.c6
-rw-r--r--sys/dev/raidframe/rf_engine.c6
-rw-r--r--sys/dev/raidframe/rf_evenodd.c16
-rw-r--r--sys/dev/raidframe/rf_fifo.c8
-rw-r--r--sys/dev/raidframe/rf_interdecluster.c14
-rw-r--r--sys/dev/raidframe/rf_map.c6
-rw-r--r--sys/dev/raidframe/rf_mcpair.c6
-rw-r--r--sys/dev/raidframe/rf_netbsdkintf.c34
-rw-r--r--sys/dev/raidframe/rf_nwayxor.c6
-rw-r--r--sys/dev/raidframe/rf_paritylogDiskMgr.c6
-rw-r--r--sys/dev/raidframe/rf_paritylogging.c18
-rw-r--r--sys/dev/raidframe/rf_parityloggingdags.c22
-rw-r--r--sys/dev/raidframe/rf_parityscan.c8
-rw-r--r--sys/dev/raidframe/rf_psstatus.c12
-rw-r--r--sys/dev/raidframe/rf_raid0.c28
-rw-r--r--sys/dev/raidframe/rf_raid1.c14
-rw-r--r--sys/dev/raidframe/rf_raid4.c20
-rw-r--r--sys/dev/raidframe/rf_raid5.c18
-rw-r--r--sys/dev/raidframe/rf_raid5_rotatedspare.c10
-rw-r--r--sys/dev/raidframe/rf_reconmap.c6
-rw-r--r--sys/dev/raidframe/rf_reconstruct.c20
-rw-r--r--sys/dev/raidframe/rf_revent.c6
-rw-r--r--sys/dev/raidframe/rf_sstf.c16
-rw-r--r--sys/dev/raidframe/rf_stripelocks.c8
-rw-r--r--sys/dev/raidframe/rf_utils.c8
-rw-r--r--sys/dev/rasops/rasops.c8
-rw-r--r--sys/dev/rnd.c18
-rw-r--r--sys/dev/scsipi/atapiconf.c14
-rw-r--r--sys/dev/scsipi/cd.c32
-rw-r--r--sys/dev/scsipi/ch.c16
-rw-r--r--sys/dev/scsipi/scsi_base.c6
-rw-r--r--sys/dev/scsipi/scsiconf.c18
-rw-r--r--sys/dev/scsipi/scsipi_base.c6
-rw-r--r--sys/dev/scsipi/scsipi_base.h4
-rw-r--r--sys/dev/scsipi/scsipiconf.h32
-rw-r--r--sys/dev/scsipi/sd.c20
-rw-r--r--sys/dev/scsipi/ses.c26
-rw-r--r--sys/dev/scsipi/ss.c18
-rw-r--r--sys/dev/scsipi/ss_mustek.c6
-rw-r--r--sys/dev/scsipi/ss_scanjet.c6
-rw-r--r--sys/dev/scsipi/st.c22
-rw-r--r--sys/dev/scsipi/st_atapi.c8
-rw-r--r--sys/dev/scsipi/st_scsi.c6
-rw-r--r--sys/dev/scsipi/uk.c18
-rw-r--r--sys/dev/sequencer.c24
-rw-r--r--sys/dev/sysmon/sysmon.c10
-rw-r--r--sys/dev/sysmon/sysmon_envsys.c16
-rw-r--r--sys/dev/sysmon/sysmon_power.c22
-rw-r--r--sys/dev/sysmon/sysmon_taskq.c8
-rw-r--r--sys/dev/sysmon/sysmon_wdog.c18
-rw-r--r--sys/dev/usb/ehci.c24
-rw-r--r--sys/dev/usb/if_atu.c14
-rw-r--r--sys/dev/usb/if_aue.c8
-rw-r--r--sys/dev/usb/if_axe.c6
-rw-r--r--sys/dev/usb/if_cdce.c6
-rw-r--r--sys/dev/usb/if_cue.c6
-rw-r--r--sys/dev/usb/if_kue.c6
-rw-r--r--sys/dev/usb/if_udav.c10
-rw-r--r--sys/dev/usb/if_upl.c12
-rw-r--r--sys/dev/usb/if_ural.c12
-rw-r--r--sys/dev/usb/if_url.c10
-rw-r--r--sys/dev/usb/ohci.c24
-rw-r--r--sys/dev/usb/uaudio.c22
-rw-r--r--sys/dev/usb/ubsa.c16
-rw-r--r--sys/dev/usb/ubt.c8
-rw-r--r--sys/dev/usb/ucom.c14
-rw-r--r--sys/dev/usb/ucycom.c16
-rw-r--r--sys/dev/usb/uftdi.c8
-rw-r--r--sys/dev/usb/ugen.c14
-rw-r--r--sys/dev/usb/uhci.c18
-rw-r--r--sys/dev/usb/uhid.c26
-rw-r--r--sys/dev/usb/uhub.c6
-rw-r--r--sys/dev/usb/uipaq.c4
-rw-r--r--sys/dev/usb/uirda.c20
-rw-r--r--sys/dev/usb/ukbd.c14
-rw-r--r--sys/dev/usb/ulpt.c22
-rw-r--r--sys/dev/usb/umass.c6
-rw-r--r--sys/dev/usb/umass_isdata.c18
-rw-r--r--sys/dev/usb/umass_scsipi.c8
-rw-r--r--sys/dev/usb/umct.c16
-rw-r--r--sys/dev/usb/umidi.c14
-rw-r--r--sys/dev/usb/umodem_common.c20
-rw-r--r--sys/dev/usb/ums.c14
-rw-r--r--sys/dev/usb/uplcom.c16
-rw-r--r--sys/dev/usb/urio.c14
-rw-r--r--sys/dev/usb/usb.c20
-rw-r--r--sys/dev/usb/usb_mem.c6
-rw-r--r--sys/dev/usb/usb_port.h10
-rw-r--r--sys/dev/usb/usb_subr.c6
-rw-r--r--sys/dev/usb/usbdi.c6
-rw-r--r--sys/dev/usb/usbdi_util.c12
-rw-r--r--sys/dev/usb/uscanner.c22
-rw-r--r--sys/dev/usb/usscanner.c14
-rw-r--r--sys/dev/usb/ustir.c20
-rw-r--r--sys/dev/usb/utoppy.c24
-rw-r--r--sys/dev/usb/uvisor.c6
-rw-r--r--sys/dev/usb/uvscom.c20
-rw-r--r--sys/dev/usb/uyap.c6
-rw-r--r--sys/dev/verified_exec.c22
-rw-r--r--sys/dev/vnd.c32
-rw-r--r--sys/dev/wscons/tpcalib.c6
-rw-r--r--sys/dev/wscons/wsdisplay.c36
-rw-r--r--sys/dev/wscons/wsdisplay_compat_usl.c10
-rw-r--r--sys/dev/wscons/wsdisplay_vcons.c12
-rw-r--r--sys/dev/wscons/wsemul_dumb.c10
-rw-r--r--sys/dev/wscons/wsemul_sun.c6
-rw-r--r--sys/dev/wscons/wsemul_vt100.c6
-rw-r--r--sys/dev/wscons/wsevent.c6
-rw-r--r--sys/dev/wscons/wskbd.c24
-rw-r--r--sys/dev/wscons/wsmouse.c20
-rw-r--r--sys/dev/wscons/wsmux.c12
-rw-r--r--sys/dev/wsfont/wsfontdev.c18
671 files changed, 3939 insertions, 3933 deletions
diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c
index 73e5241f3b5..9d4917e1edb 100644
--- a/sys/dev/acpi/acpi.c
+++ b/sys/dev/acpi/acpi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.96 2006/10/12 01:30:54 christos Exp $ */
+/* $NetBSD: acpi.c,v 1.97 2006/11/16 01:32:47 christos Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.96 2006/10/12 01:30:54 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.97 2006/11/16 01:32:47 christos Exp $");
#include "opt_acpi.h"
#include "opt_pcifixup.h"
@@ -268,8 +268,8 @@ acpi_OsGetRootPointer(UINT32 Flags, ACPI_POINTER *PhysicalAddress)
* Autoconfiguration `match' routine.
*/
static int
-acpi_match(struct device *parent __unused, struct cfdata *match __unused,
- void *aux __unused)
+acpi_match(struct device *parent, struct cfdata *match,
+ void *aux)
{
/*
* XXX Check other locators? Hard to know -- machine
@@ -289,7 +289,7 @@ acpi_match(struct device *parent __unused, struct cfdata *match __unused,
* and enable the ACPI subsystem.
*/
static void
-acpi_attach(struct device *parent __unused, struct device *self, void *aux)
+acpi_attach(struct device *parent, struct device *self, void *aux)
{
struct acpi_softc *sc = (void *) self;
struct acpibus_attach_args *aa = aux;
@@ -405,7 +405,7 @@ acpi_attach(struct device *parent __unused, struct device *self, void *aux)
* might confuse us.
*/
static void
-acpi_shutdown(void *arg __unused)
+acpi_shutdown(void *arg)
{
/* nothing */
}
@@ -568,7 +568,7 @@ acpi_activate_device(ACPI_HANDLE handle, ACPI_DEVICE_INFO **di)
*/
static ACPI_STATUS
acpi_make_devnode(ACPI_HANDLE handle, UINT32 level, void *context,
- void **status __unused)
+ void **status)
{
struct acpi_make_devnode_state *state = context;
#if defined(ACPI_DEBUG) || defined(ACPI_EXTRA_DEBUG)
@@ -1031,7 +1031,7 @@ acpi_set_wake_gpe(ACPI_HANDLE handle)
*****************************************************************************/
static int
-is_available_state(struct acpi_softc *sc __unused, int state)
+is_available_state(struct acpi_softc *sc, int state)
{
UINT8 type_a, type_b;
diff --git a/sys/dev/acpi/acpi_acad.c b/sys/dev/acpi/acpi_acad.c
index 97286d547e4..97a7b45ff45 100644
--- a/sys/dev/acpi/acpi_acad.c
+++ b/sys/dev/acpi/acpi_acad.c
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_acad.c,v 1.20 2006/10/12 01:30:54 christos Exp $ */
+/* $NetBSD: acpi_acad.c,v 1.21 2006/11/16 01:32:47 christos Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_acad.c,v 1.20 2006/10/12 01:30:54 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_acad.c,v 1.21 2006/11/16 01:32:47 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -137,7 +137,7 @@ static int acpiacad_streinfo(struct sysmon_envsys *, struct envsys_basic_info *)
* Autoconfiguration `match' routine.
*/
static int
-acpiacad_match(struct device *parent __unused, struct cfdata *match __unused,
+acpiacad_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct acpi_attach_args *aa = aux;
@@ -154,7 +154,7 @@ acpiacad_match(struct device *parent __unused, struct cfdata *match __unused,
* Autoconfiguration `attach' routine.
*/
static void
-acpiacad_attach(struct device *parent __unused, struct device *self, void *aux)
+acpiacad_attach(struct device *parent, struct device *self, void *aux)
{
struct acpiacad_softc *sc = (void *) self;
struct acpi_attach_args *aa = aux;
@@ -255,7 +255,7 @@ acpiacad_clear_status(struct acpiacad_softc *sc)
* Callback from ACPI interrupt handler to notify us of an event.
*/
static void
-acpiacad_notify_handler(ACPI_HANDLE handle __unused, UINT32 notify,
+acpiacad_notify_handler(ACPI_HANDLE handle, UINT32 notify,
void *context)
{
struct acpiacad_softc *sc = context;
@@ -348,7 +348,7 @@ acpiacad_gtredata(struct sysmon_envsys *sme, struct envsys_tre_data *tred)
static int
-acpiacad_streinfo(struct sysmon_envsys *sme __unused,
+acpiacad_streinfo(struct sysmon_envsys *sme,
struct envsys_basic_info *binfo)
{
diff --git a/sys/dev/acpi/acpi_apm.c b/sys/dev/acpi/acpi_apm.c
index c02b854d8b4..9ba1a58d0ee 100644
--- a/sys/dev/acpi/acpi_apm.c
+++ b/sys/dev/acpi/acpi_apm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_apm.c,v 1.7 2006/10/12 06:56:48 xtraeme Exp $ */
+/* $NetBSD: acpi_apm.c,v 1.8 2006/11/16 01:32:47 christos Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_apm.c,v 1.7 2006/10/12 06:56:48 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_apm.c,v 1.8 2006/11/16 01:32:47 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -114,15 +114,15 @@ CFATTACH_DECL(acpiapm, sizeof(struct apm_softc),
static int
/*ARGSUSED*/
-acpiapm_match(struct device *parent __unused,
- struct cfdata *match __unused, void *aux __unused)
+acpiapm_match(struct device *parent,
+ struct cfdata *match, void *aux)
{
return apm_match();
}
static void
/*ARGSUSED*/
-acpiapm_attach(struct device *parent, struct device *self, void *aux __unused)
+acpiapm_attach(struct device *parent, struct device *self, void *aux)
{
struct apm_softc *sc = (struct apm_softc *)self;
@@ -224,14 +224,14 @@ SYSCTL_SETUP(sysctl_acpiapm_setup, "sysctl machdep.acpiapm subtree setup")
static void
/*ARGSUSED*/
-acpiapm_disconnect(void *opaque __unused)
+acpiapm_disconnect(void *opaque)
{
return;
}
static void
/*ARGSUSED*/
-acpiapm_enable(void *opaque __unused, int onoff __unused)
+acpiapm_enable(void *opaque, int onoff)
{
return;
}
@@ -268,7 +268,7 @@ acpiapm_set_powstate(void *opaque, u_int devid, u_int powstat)
static int
/*ARGSUSED*/
-acpiapm_get_powstat(void *opaque __unused, u_int batteryid __unused,
+acpiapm_get_powstat(void *opaque, u_int batteryid,
struct apm_power_info *pinfo)
{
#define APM_BATT_FLAG_WATERMARK_MASK (APM_BATT_FLAG_CRITICAL | \
@@ -383,7 +383,7 @@ acpiapm_get_powstat(void *opaque __unused, u_int batteryid __unused,
static int
/*ARGSUSED*/
-acpiapm_get_event(void *opaque __unused, u_int *event_type, u_int *event_info)
+acpiapm_get_event(void *opaque, u_int *event_type, u_int *event_info)
{
if (capability_changed) {
capability_changed = 0;
@@ -403,21 +403,21 @@ acpiapm_get_event(void *opaque __unused, u_int *event_type, u_int *event_info)
static void
/*ARGSUSED*/
-acpiapm_cpu_busy(void *opaque __unused)
+acpiapm_cpu_busy(void *opaque)
{
return;
}
static void
/*ARGSUSED*/
-acpiapm_cpu_idle(void *opaque __unused)
+acpiapm_cpu_idle(void *opaque)
{
return;
}
static void
/*ARGSUSED*/
-acpiapm_get_capabilities(void *opaque __unused, u_int *numbatts,
+acpiapm_get_capabilities(void *opaque, u_int *numbatts,
u_int *capflags)
{
*numbatts = 1;
diff --git a/sys/dev/acpi/acpi_bat.c b/sys/dev/acpi/acpi_bat.c
index 4e5d7d83040..304e1cf4561 100644
--- a/sys/dev/acpi/acpi_bat.c
+++ b/sys/dev/acpi/acpi_bat.c
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_bat.c,v 1.44 2006/10/12 01:30:54 christos Exp $ */
+/* $NetBSD: acpi_bat.c,v 1.45 2006/11/16 01:32:47 christos Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -86,7 +86,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.44 2006/10/12 01:30:54 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.45 2006/11/16 01:32:47 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -240,7 +240,7 @@ static int acpibat_streinfo(struct sysmon_envsys *, struct envsys_basic_info *);
* Autoconfiguration `match' routine.
*/
static int
-acpibat_match(struct device *parent __unused, struct cfdata *match __unused,
+acpibat_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct acpi_attach_args *aa = aux;
@@ -257,7 +257,7 @@ acpibat_match(struct device *parent __unused, struct cfdata *match __unused,
* Autoconfiguration `attach' routine.
*/
static void
-acpibat_attach(struct device *parent __unused, struct device *self, void *aux)
+acpibat_attach(struct device *parent, struct device *self, void *aux)
{
struct acpibat_softc *sc = (void *) self;
struct acpi_attach_args *aa = aux;
@@ -660,7 +660,7 @@ acpibat_update(void *arg)
* Callback from ACPI interrupt handler to notify us of an event.
*/
static void
-acpibat_notify_handler(ACPI_HANDLE handle __unused, UINT32 notify,
+acpibat_notify_handler(ACPI_HANDLE handle, UINT32 notify,
void *context)
{
struct acpibat_softc *sc = context;
@@ -783,7 +783,7 @@ acpibat_gtredata(struct sysmon_envsys *sme, struct envsys_tre_data *tred)
}
static int
-acpibat_streinfo(struct sysmon_envsys *sme __unused,
+acpibat_streinfo(struct sysmon_envsys *sme,
struct envsys_basic_info *binfo)
{
diff --git a/sys/dev/acpi/acpi_button.c b/sys/dev/acpi/acpi_button.c
index 0b8d0f56e5e..7ea40c40035 100644
--- a/sys/dev/acpi/acpi_button.c
+++ b/sys/dev/acpi/acpi_button.c
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_button.c,v 1.21 2006/10/12 01:30:54 christos Exp $ */
+/* $NetBSD: acpi_button.c,v 1.22 2006/11/16 01:32:47 christos Exp $ */
/*
* Copyright 2001, 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_button.c,v 1.21 2006/10/12 01:30:54 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_button.c,v 1.22 2006/11/16 01:32:47 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -86,7 +86,7 @@ static void acpibut_notify_handler(ACPI_HANDLE, UINT32, void *);
* Autoconfiguration `match' routine.
*/
static int
-acpibut_match(struct device *parent __unused, struct cfdata *match __unused,
+acpibut_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct acpi_attach_args *aa = aux;
@@ -109,7 +109,7 @@ acpibut_match(struct device *parent __unused, struct cfdata *match __unused,
* Autoconfiguration `attach' routine.
*/
static void
-acpibut_attach(struct device *parent __unused, struct device *self, void *aux)
+acpibut_attach(struct device *parent, struct device *self, void *aux)
{
struct acpibut_softc *sc = (void *) self;
struct acpi_attach_args *aa = aux;
@@ -178,7 +178,7 @@ acpibut_pressed_event(void *arg)
* Callback from ACPI interrupt handler to notify us of an event.
*/
static void
-acpibut_notify_handler(ACPI_HANDLE handle __unused, UINT32 notify,
+acpibut_notify_handler(ACPI_HANDLE handle, UINT32 notify,
void *context)
{
struct acpibut_softc *sc = context;
diff --git a/sys/dev/acpi/acpi_ec.c b/sys/dev/acpi/acpi_ec.c
index c4544efe9b9..87e950d5d79 100644
--- a/sys/dev/acpi/acpi_ec.c
+++ b/sys/dev/acpi/acpi_ec.c
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_ec.c,v 1.39 2006/10/12 01:30:54 christos Exp $ */
+/* $NetBSD: acpi_ec.c,v 1.40 2006/11/16 01:32:47 christos Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -172,7 +172,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.39 2006/10/12 01:30:54 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.40 2006/11/16 01:32:47 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -348,7 +348,7 @@ EcUnlock(struct acpi_ec_softc *sc)
* Autoconfiguration `match' routine.
*/
static int
-acpiec_match(struct device *parent __unused, struct cfdata *match __unused,
+acpiec_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct acpi_attach_args *aa = aux;
@@ -481,7 +481,7 @@ acpiec_early_attach(struct device *parent)
* Autoconfiguration `attach' routine.
*/
static void
-acpiec_attach(struct device *parent __unused, struct device *self, void *aux)
+acpiec_attach(struct device *parent, struct device *self, void *aux)
{
struct acpi_ec_softc *sc = (void *) self;
struct acpi_attach_args *aa = aux;
@@ -747,7 +747,7 @@ EcGpeHandler(void *Context)
}
static ACPI_STATUS
-EcSpaceSetup(ACPI_HANDLE Region __unused, UINT32 Function, void *Context,
+EcSpaceSetup(ACPI_HANDLE Region, UINT32 Function, void *Context,
void **RegionContext)
{
@@ -766,7 +766,7 @@ EcSpaceSetup(ACPI_HANDLE Region __unused, UINT32 Function, void *Context,
static ACPI_STATUS
EcSpaceHandler(UINT32 Function, ACPI_PHYSICAL_ADDRESS Address, UINT32 width,
- ACPI_INTEGER *Value, void *Context, void *RegionContext __unused)
+ ACPI_INTEGER *Value, void *Context, void *RegionContext)
{
struct acpi_ec_softc *sc = Context;
ACPI_STATUS rv = AE_OK;
diff --git a/sys/dev/acpi/acpi_lid.c b/sys/dev/acpi/acpi_lid.c
index d6705bf1dbc..447952bc966 100644
--- a/sys/dev/acpi/acpi_lid.c
+++ b/sys/dev/acpi/acpi_lid.c
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_lid.c,v 1.20 2006/10/12 01:30:54 christos Exp $ */
+/* $NetBSD: acpi_lid.c,v 1.21 2006/11/16 01:32:47 christos Exp $ */
/*
* Copyright 2001, 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_lid.c,v 1.20 2006/10/12 01:30:54 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_lid.c,v 1.21 2006/11/16 01:32:47 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -78,7 +78,7 @@ static void acpilid_notify_handler(ACPI_HANDLE, UINT32, void *);
* Autoconfiguration `match' routine.
*/
static int
-acpilid_match(struct device *parent __unused, struct cfdata *match __unused,
+acpilid_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct acpi_attach_args *aa = aux;
@@ -95,7 +95,7 @@ acpilid_match(struct device *parent __unused, struct cfdata *match __unused,
* Autoconfiguration `attach' routine.
*/
static void
-acpilid_attach(struct device *parent __unused, struct device *self, void *aux)
+acpilid_attach(struct device *parent, struct device *self, void *aux)
{
struct acpilid_softc *sc = (void *) self;
struct acpi_attach_args *aa = aux;
@@ -151,7 +151,7 @@ acpilid_status_changed(void *arg)
* Callback from ACPI interrupt handler to notify us of an event.
*/
static void
-acpilid_notify_handler(ACPI_HANDLE handle __unused, UINT32 notify,
+acpilid_notify_handler(ACPI_HANDLE handle, UINT32 notify,
void *context)
{
struct acpilid_softc *sc = context;
diff --git a/sys/dev/acpi/acpi_madt.c b/sys/dev/acpi/acpi_madt.c
index ff1b4f7afc5..d3b553554dd 100644
--- a/sys/dev/acpi/acpi_madt.c
+++ b/sys/dev/acpi/acpi_madt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_madt.c,v 1.16 2006/10/12 01:30:54 christos Exp $ */
+/* $NetBSD: acpi_madt.c,v 1.17 2006/11/16 01:32:47 christos Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_madt.c,v 1.16 2006/10/12 01:30:54 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_madt.c,v 1.17 2006/11/16 01:32:47 christos Exp $");
#include <sys/param.h>
#include <sys/ioctl.h>
@@ -193,7 +193,7 @@ acpi_madt_print(void)
}
static ACPI_STATUS
-acpi_madt_print_entry(APIC_HEADER *hdrp, void *aux __unused)
+acpi_madt_print_entry(APIC_HEADER *hdrp, void *aux)
{
switch (hdrp->Type) {
case APIC_PROCESSOR:
diff --git a/sys/dev/acpi/acpi_resource.c b/sys/dev/acpi/acpi_resource.c
index 0116d8d5efe..d4b8eeb70c9 100644
--- a/sys/dev/acpi/acpi_resource.c
+++ b/sys/dev/acpi/acpi_resource.c
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_resource.c,v 1.20 2006/10/12 01:30:54 christos Exp $ */
+/* $NetBSD: acpi_resource.c,v 1.21 2006/11/16 01:32:47 christos Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_resource.c,v 1.20 2006/10/12 01:30:54 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_resource.c,v 1.21 2006/11/16 01:32:47 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -564,7 +564,7 @@ const struct acpi_resource_parse_ops acpi_resource_parse_ops_default = {
};
static void
-acpi_res_parse_init(struct device *dev __unused, void *arg, void **contextp)
+acpi_res_parse_init(struct device *dev, void *arg, void **contextp)
{
struct acpi_resources *res = arg;
@@ -755,8 +755,8 @@ acpi_res_parse_drq(struct device *dev, void *context, uint32_t drq)
}
static void
-acpi_res_parse_start_dep(struct device *dev, void *context __unused,
- int preference __unused)
+acpi_res_parse_start_dep(struct device *dev, void *context,
+ int preference)
{
printf("%s: ACPI: dependant functions not supported\n",
@@ -764,7 +764,7 @@ acpi_res_parse_start_dep(struct device *dev, void *context __unused,
}
static void
-acpi_res_parse_end_dep(struct device *dev __unused, void *context __unused)
+acpi_res_parse_end_dep(struct device *dev, void *context)
{
/* Nothing to do. */
diff --git a/sys/dev/acpi/acpi_timer.c b/sys/dev/acpi/acpi_timer.c
index 9c2750fbd9f..166ecceb04e 100644
--- a/sys/dev/acpi/acpi_timer.c
+++ b/sys/dev/acpi/acpi_timer.c
@@ -1,7 +1,7 @@
-/* $NetBSD: acpi_timer.c,v 1.7 2006/10/12 01:30:54 christos Exp $ */
+/* $NetBSD: acpi_timer.c,v 1.8 2006/11/16 01:32:47 christos Exp $ */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_timer.c,v 1.7 2006/10/12 01:30:54 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_timer.c,v 1.8 2006/11/16 01:32:47 christos Exp $");
#include <sys/types.h>
#include <dev/acpi/acpi_timer.h>
@@ -60,7 +60,7 @@ acpitimer_init()
}
static u_int
-acpitimer_read_fast(struct timecounter *tc __unused)
+acpitimer_read_fast(struct timecounter *tc)
{
uint32_t t;
@@ -73,7 +73,7 @@ acpitimer_read_fast(struct timecounter *tc __unused)
* is a chance that a transition is hit.
*/
static u_int
-acpitimer_read_safe(struct timecounter *tc __unused)
+acpitimer_read_safe(struct timecounter *tc)
{
uint32_t t1, t2, t3;
diff --git a/sys/dev/acpi/acpi_tz.c b/sys/dev/acpi/acpi_tz.c
index 6c87c3addb1..edbdff3eb6c 100644
--- a/sys/dev/acpi/acpi_tz.c
+++ b/sys/dev/acpi/acpi_tz.c
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_tz.c,v 1.19 2006/10/12 01:30:54 christos Exp $ */
+/* $NetBSD: acpi_tz.c,v 1.20 2006/11/16 01:32:47 christos Exp $ */
/*
* Copyright (c) 2003 Jared D. McNeill <jmcneill@invisible.ca>
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_tz.c,v 1.19 2006/10/12 01:30:54 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_tz.c,v 1.20 2006/11/16 01:32:47 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -146,7 +146,7 @@ CFATTACH_DECL(acpitz, sizeof(struct acpitz_softc), acpitz_match,
* acpitz_match: autoconf(9) match routine
*/
static int
-acpitz_match(struct device *parent __unused, struct cfdata *match __unused,
+acpitz_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct acpi_attach_args *aa = aux;
@@ -161,7 +161,7 @@ acpitz_match(struct device *parent __unused, struct cfdata *match __unused,
* acpitz_attach: autoconf(9) attach routine
*/
static void
-acpitz_attach(struct device *parent __unused, struct device *self, void *aux)
+acpitz_attach(struct device *parent, struct device *self, void *aux)
{
struct acpitz_softc *sc = (struct acpitz_softc *)self;
struct acpi_attach_args *aa = aux;
@@ -507,7 +507,7 @@ acpitz_get_zone(void *opaque, int verbose)
static void
-acpitz_notify_handler(ACPI_HANDLE hdl __unused, UINT32 notify, void *opaque)
+acpitz_notify_handler(ACPI_HANDLE hdl, UINT32 notify, void *opaque)
{
struct acpitz_softc *sc = opaque;
ACPI_OSD_EXEC_CALLBACK func = NULL;
@@ -631,7 +631,7 @@ acpitz_gtredata(struct sysmon_envsys *sme, struct envsys_tre_data *tred)
}
static int
-acpitz_streinfo(struct sysmon_envsys *sme __unused,
+acpitz_streinfo(struct sysmon_envsys *sme,
struct envsys_basic_info *binfo)
{
diff --git a/sys/dev/acpi/acpica/OsdMisc.c b/sys/dev/acpi/acpica/OsdMisc.c
index bd97ce6bc5a..a79aefb8f3b 100644
--- a/sys/dev/acpi/acpica/OsdMisc.c
+++ b/sys/dev/acpi/acpica/OsdMisc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: OsdMisc.c,v 1.4 2006/10/12 01:30:55 christos Exp $ */
+/* $NetBSD: OsdMisc.c,v 1.5 2006/11/16 01:32:47 christos Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: OsdMisc.c,v 1.4 2006/10/12 01:30:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: OsdMisc.c,v 1.5 2006/11/16 01:32:47 christos Exp $");
#include "opt_acpi.h"
#include "opt_ddb.h"
@@ -153,7 +153,7 @@ AcpiOsGetLine(char *Buffer)
}
ACPI_STATUS
-AcpiOsTableOverride(ACPI_TABLE_HEADER *ExistingTable __unused,
+AcpiOsTableOverride(ACPI_TABLE_HEADER *ExistingTable,
ACPI_TABLE_HEADER **NewTable)
{
#ifndef ACPI_DSDT_OVERRIDE
diff --git a/sys/dev/acpi/acpica/OsdSynch.c b/sys/dev/acpi/acpica/OsdSynch.c
index 965ca97c448..ad2e273e7f3 100644
--- a/sys/dev/acpi/acpica/OsdSynch.c
+++ b/sys/dev/acpi/acpica/OsdSynch.c
@@ -1,4 +1,4 @@
-/* $NetBSD: OsdSynch.c,v 1.2 2006/10/12 01:30:55 christos Exp $ */
+/* $NetBSD: OsdSynch.c,v 1.3 2006/11/16 01:32:47 christos Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: OsdSynch.c,v 1.2 2006/10/12 01:30:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: OsdSynch.c,v 1.3 2006/11/16 01:32:47 christos Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@@ -322,7 +322,7 @@ AcpiOsAcquireLock(ACPI_HANDLE Handle)
* Release a lock.
*/
void
-AcpiOsReleaseLock(ACPI_HANDLE Handle, ACPI_NATIVE_UINT Flags __unused)
+AcpiOsReleaseLock(ACPI_HANDLE Handle, ACPI_NATIVE_UINT Flags)
{
struct acpi_lock *al = (void *) Handle;
diff --git a/sys/dev/acpi/attimer_acpi.c b/sys/dev/acpi/attimer_acpi.c
index 66216650d04..ab80232d778 100644
--- a/sys/dev/acpi/attimer_acpi.c
+++ b/sys/dev/acpi/attimer_acpi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: attimer_acpi.c,v 1.4 2006/10/12 01:30:54 christos Exp $ */
+/* $NetBSD: attimer_acpi.c,v 1.5 2006/11/16 01:32:47 christos Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: attimer_acpi.c,v 1.4 2006/10/12 01:30:54 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: attimer_acpi.c,v 1.5 2006/11/16 01:32:47 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -102,8 +102,8 @@ static const char * const attimer_acpi_ids[] = {
* attimer_acpi_match: autoconf(9) match routine
*/
static int
-attimer_acpi_match(struct device *parent __unused,
- struct cfdata *match __unused, void *aux)
+attimer_acpi_match(struct device *parent,
+ struct cfdata *match, void *aux)
{
struct acpi_attach_args *aa = aux;
@@ -117,7 +117,7 @@ attimer_acpi_match(struct device *parent __unused,
* attimer_acpi_attach: autoconf(9) attach routine
*/
static void
-attimer_acpi_attach(struct device *parent __unused, struct device *self,
+attimer_acpi_attach(struct device *parent, struct device *self,
void *aux)
{
struct attimer_softc *sc = (struct attimer_softc *)self;
diff --git a/sys/dev/acpi/com_acpi.c b/sys/dev/acpi/com_acpi.c
index bf583592fdc..fbd626ab42f 100644
--- a/sys/dev/acpi/com_acpi.c
+++ b/sys/dev/acpi/com_acpi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com_acpi.c,v 1.21 2006/10/12 01:30:54 christos Exp $ */
+/* $NetBSD: com_acpi.c,v 1.22 2006/11/16 01:32:47 christos Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <jmcneill@invisible.ca>
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_acpi.c,v 1.21 2006/10/12 01:30:54 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_acpi.c,v 1.22 2006/11/16 01:32:47 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -78,7 +78,7 @@ static const char * const com_acpi_ids[] = {
* com_acpi_match: autoconf(9) match routine
*/
static int
-com_acpi_match(struct device *parent __unused, struct cfdata *match __unused,
+com_acpi_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct acpi_attach_args *aa = aux;
@@ -93,7 +93,7 @@ com_acpi_match(struct device *parent __unused, struct cfdata *match __unused,
* com_acpi_attach: autoconf(9) attach routine
*/
static void
-com_acpi_attach(struct device *parent __unused, struct device *self, void *aux)
+com_acpi_attach(struct device *parent, struct device *self, void *aux)
{
struct com_acpi_softc *asc = (struct com_acpi_softc *)self;
struct com_softc *sc = &asc->sc_com;
diff --git a/sys/dev/acpi/fdc_acpi.c b/sys/dev/acpi/fdc_acpi.c
index f339cdab565..10d34f67fbc 100644
--- a/sys/dev/acpi/fdc_acpi.c
+++ b/sys/dev/acpi/fdc_acpi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fdc_acpi.c,v 1.29 2006/10/12 01:30:54 christos Exp $ */
+/* $NetBSD: fdc_acpi.c,v 1.30 2006/11/16 01:32:47 christos Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <jmcneill@invisible.ca>
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdc_acpi.c,v 1.29 2006/10/12 01:30:54 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdc_acpi.c,v 1.30 2006/11/16 01:32:47 christos Exp $");
#include "rnd.h"
@@ -93,7 +93,7 @@ static const char * const fdc_acpi_ids[] = {
* fdc_acpi_match: autoconf(9) match routine
*/
static int
-fdc_acpi_match(struct device *parent __unused, struct cfdata *match __unused,
+fdc_acpi_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct acpi_attach_args *aa = aux;
@@ -108,7 +108,7 @@ fdc_acpi_match(struct device *parent __unused, struct cfdata *match __unused,
* fdc_acpi_attach: autoconf(9) attach routine
*/
static void
-fdc_acpi_attach(struct device *parent __unused, struct device *self, void *aux)
+fdc_acpi_attach(struct device *parent, struct device *self, void *aux)
{
struct fdc_acpi_softc *asc = (struct fdc_acpi_softc *)self;
struct fdc_softc *sc = &asc->sc_fdc;
@@ -333,7 +333,7 @@ out:
}
static const struct fd_type *
-fdc_acpi_nvtotype(char *fdc __unused, int nvraminfo, int drive)
+fdc_acpi_nvtotype(char *fdc, int nvraminfo, int drive)
{
int type;
diff --git a/sys/dev/acpi/joy_acpi.c b/sys/dev/acpi/joy_acpi.c
index e12128e3e5d..4e51fe452c5 100644
--- a/sys/dev/acpi/joy_acpi.c
+++ b/sys/dev/acpi/joy_acpi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: joy_acpi.c,v 1.4 2006/10/12 01:30:55 christos Exp $ */
+/* $NetBSD: joy_acpi.c,v 1.5 2006/11/16 01:32:47 christos Exp $ */
/*
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: joy_acpi.c,v 1.4 2006/10/12 01:30:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: joy_acpi.c,v 1.5 2006/11/16 01:32:47 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -106,7 +106,7 @@ static const char * const joy_acpi_ids[] = {
* joy_acpi_match: autoconf(9) match routine
*/
static int
-joy_acpi_match(struct device *parent __unused, struct cfdata *match __unused,
+joy_acpi_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct acpi_attach_args *aa = aux;
@@ -121,7 +121,7 @@ joy_acpi_match(struct device *parent __unused, struct cfdata *match __unused,
* joy_acpi_attach: autoconf(9) attach routine
*/
static void
-joy_acpi_attach(struct device *parent __unused, struct device *self, void *aux)
+joy_acpi_attach(struct device *parent, struct device *self, void *aux)
{
struct joy_acpi_softc *asc = (struct joy_acpi_softc *)self;
struct joy_softc *sc = &asc->sc_joy;
diff --git a/sys/dev/acpi/lpt_acpi.c b/sys/dev/acpi/lpt_acpi.c
index 19061dbc2f7..ead751619f0 100644
--- a/sys/dev/acpi/lpt_acpi.c
+++ b/sys/dev/acpi/lpt_acpi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lpt_acpi.c,v 1.13 2006/10/12 01:30:55 christos Exp $ */
+/* $NetBSD: lpt_acpi.c,v 1.14 2006/11/16 01:32:47 christos Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <jmcneill@invisible.ca>
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lpt_acpi.c,v 1.13 2006/10/12 01:30:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpt_acpi.c,v 1.14 2006/11/16 01:32:47 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -71,7 +71,7 @@ static const char * const lpt_acpi_ids[] = {
* lpt_acpi_match: autoconf(9) match routine
*/
static int
-lpt_acpi_match(struct device *parent __unused, struct cfdata *match __unused,
+lpt_acpi_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct acpi_attach_args *aa = aux;
@@ -86,7 +86,7 @@ lpt_acpi_match(struct device *parent __unused, struct cfdata *match __unused,
* lpt_acpi_attach: autoconf(9) attach routine
*/
static void
-lpt_acpi_attach(struct device *parent __unused, struct device *self, void *aux)
+lpt_acpi_attach(struct device *parent, struct device *self, void *aux)
{
struct lpt_acpi_softc *asc = (struct lpt_acpi_softc *)self;
struct lpt_softc *sc = &asc->sc_lpt;
diff --git a/sys/dev/acpi/mpu_acpi.c b/sys/dev/acpi/mpu_acpi.c
index 1147827a887..41e18246d8a 100644
--- a/sys/dev/acpi/mpu_acpi.c
+++ b/sys/dev/acpi/mpu_acpi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mpu_acpi.c,v 1.4 2006/10/12 01:30:55 christos Exp $ */
+/* $NetBSD: mpu_acpi.c,v 1.5 2006/11/16 01:32:47 christos Exp $ */
/*
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpu_acpi.c,v 1.4 2006/10/12 01:30:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpu_acpi.c,v 1.5 2006/11/16 01:32:47 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -110,7 +110,7 @@ static const char * const mpu_acpi_ids[] = {
* mpu_acpi_match: autoconf(9) match routine
*/
static int
-mpu_acpi_match(struct device *parent __unused, struct cfdata *match __unused,
+mpu_acpi_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct acpi_attach_args *aa = aux;
@@ -125,7 +125,7 @@ mpu_acpi_match(struct device *parent __unused, struct cfdata *match __unused,
* mpu_acpi_attach: autoconf(9) attach routine
*/
static void
-mpu_acpi_attach(struct device *parent __unused, struct device *self, void *aux)
+mpu_acpi_attach(struct device *parent, struct device *self, void *aux)
{
struct mpu_acpi_softc *asc = (struct mpu_acpi_softc *)self;
struct mpu_softc *sc = &asc->sc_mpu;
diff --git a/sys/dev/acpi/pckbc_acpi.c b/sys/dev/acpi/pckbc_acpi.c
index 3c88d0afb55..a9f9247ebae 100644
--- a/sys/dev/acpi/pckbc_acpi.c
+++ b/sys/dev/acpi/pckbc_acpi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbc_acpi.c,v 1.18 2006/10/12 01:30:55 christos Exp $ */
+/* $NetBSD: pckbc_acpi.c,v 1.19 2006/11/16 01:32:47 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pckbc_acpi.c,v 1.18 2006/10/12 01:30:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbc_acpi.c,v 1.19 2006/11/16 01:32:47 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -117,7 +117,7 @@ static const char * const pckbc_acpi_ids_ms[] = {
* pckbc_acpi_match: autoconf(9) match routine
*/
static int
-pckbc_acpi_match(struct device *parent __unused, struct cfdata *match __unused,
+pckbc_acpi_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct acpi_attach_args *aa = aux;
@@ -136,7 +136,7 @@ pckbc_acpi_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-pckbc_acpi_attach(struct device *parent __unused, struct device *self,
+pckbc_acpi_attach(struct device *parent, struct device *self,
void *aux)
{
struct pckbc_acpi_softc *psc = (void *) self;
diff --git a/sys/dev/acpi/pcppi_acpi.c b/sys/dev/acpi/pcppi_acpi.c
index 62b402007c6..2e7162f0865 100644
--- a/sys/dev/acpi/pcppi_acpi.c
+++ b/sys/dev/acpi/pcppi_acpi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pcppi_acpi.c,v 1.4 2006/10/12 01:30:55 christos Exp $ */
+/* $NetBSD: pcppi_acpi.c,v 1.5 2006/11/16 01:32:47 christos Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcppi_acpi.c,v 1.4 2006/10/12 01:30:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcppi_acpi.c,v 1.5 2006/11/16 01:32:47 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -106,7 +106,7 @@ static const char * const pcppi_acpi_ids[] = {
* pcppi_acpi_match: autoconf(9) match routine
*/
static int
-pcppi_acpi_match(struct device *parent __unused, struct cfdata *match __unused,
+pcppi_acpi_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct acpi_attach_args *aa = aux;
@@ -121,7 +121,7 @@ pcppi_acpi_match(struct device *parent __unused, struct cfdata *match __unused,
* pcppi_acpi_attach: autoconf(9) attach routine
*/
static void
-pcppi_acpi_attach(struct device *parent __unused, struct device *self,
+pcppi_acpi_attach(struct device *parent, struct device *self,
void *aux)
{
struct pcppi_acpi_softc *asc = (struct pcppi_acpi_softc *)self;
diff --git a/sys/dev/acpi/wss_acpi.c b/sys/dev/acpi/wss_acpi.c
index 7a97143a4b6..b67889a9b00 100644
--- a/sys/dev/acpi/wss_acpi.c
+++ b/sys/dev/acpi/wss_acpi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wss_acpi.c,v 1.16 2006/10/12 01:30:55 christos Exp $ */
+/* $NetBSD: wss_acpi.c,v 1.17 2006/11/16 01:32:47 christos Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <jmcneill@invisible.ca>
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wss_acpi.c,v 1.16 2006/10/12 01:30:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wss_acpi.c,v 1.17 2006/11/16 01:32:47 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -97,7 +97,7 @@ wss_acpi_hints_index(idstr)
* wss_acpi_match: autoconf(9) match routine
*/
static int
-wss_acpi_match(struct device *parent __unused, struct cfdata *match __unused,
+wss_acpi_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct acpi_attach_args *aa = aux;
@@ -113,7 +113,7 @@ wss_acpi_match(struct device *parent __unused, struct cfdata *match __unused,
* wss_acpi_attach: autoconf(9) attach routine
*/
static void
-wss_acpi_attach(struct device *parent __unused, struct device *self, void *aux)
+wss_acpi_attach(struct device *parent, struct device *self, void *aux)
{
struct wss_softc *sc = (struct wss_softc *)self;
struct acpi_attach_args *aa = aux;
diff --git a/sys/dev/acpi/ym_acpi.c b/sys/dev/acpi/ym_acpi.c
index dcf8ffa8c98..c0b54320c21 100644
--- a/sys/dev/acpi/ym_acpi.c
+++ b/sys/dev/acpi/ym_acpi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ym_acpi.c,v 1.2 2006/10/12 01:30:55 christos Exp $ */
+/* $NetBSD: ym_acpi.c,v 1.3 2006/11/16 01:32:47 christos Exp $ */
/*
* Copyright (c) 2006 Jasper Wallace <jasper@pointless.net>
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ym_acpi.c,v 1.2 2006/10/12 01:30:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ym_acpi.c,v 1.3 2006/11/16 01:32:47 christos Exp $");
#include "mpu_ym.h"
@@ -58,7 +58,7 @@ CFATTACH_DECL(ym_acpi, sizeof(struct ym_softc), ym_acpi_match,
* ym_acpi_match: autoconf(9) match routine
*/
static int
-ym_acpi_match(struct device *parent __unused, struct cfdata *match __unused,
+ym_acpi_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct acpi_attach_args *aa = aux;
@@ -76,7 +76,7 @@ ym_acpi_match(struct device *parent __unused, struct cfdata *match __unused,
* ym_acpi_attach: autoconf(9) attach routine
*/
static void
-ym_acpi_attach(struct device *parent __unused, struct device *self, void *aux)
+ym_acpi_attach(struct device *parent, struct device *self, void *aux)
{
struct ym_softc *sc = (struct ym_softc *)self;
struct acpi_attach_args *aa = aux;
diff --git a/sys/dev/apm/apm.c b/sys/dev/apm/apm.c
index a06c722da92..5b3f19fdd35 100644
--- a/sys/dev/apm/apm.c
+++ b/sys/dev/apm/apm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: apm.c,v 1.7 2006/10/12 06:56:48 xtraeme Exp $ */
+/* $NetBSD: apm.c,v 1.8 2006/11/16 01:32:47 christos Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: apm.c,v 1.7 2006/10/12 06:56:48 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: apm.c,v 1.8 2006/11/16 01:32:47 christos Exp $");
#include "opt_apm.h"
@@ -359,7 +359,7 @@ apm_standby(struct apm_softc *sc)
}
static void
-apm_resume(struct apm_softc *sc, u_int event_type, u_int event_info __unused)
+apm_resume(struct apm_softc *sc, u_int event_type, u_int event_info)
{
if (sc->sc_power_state == PWR_RESUME) {
@@ -733,7 +733,7 @@ apm_thread(void *arg)
}
int
-apmopen(dev_t dev, int flag, int mode __unused, struct lwp *l __unused)
+apmopen(dev_t dev, int flag, int mode, struct lwp *l)
{
int unit = APMUNIT(dev);
int ctl = APM(dev);
@@ -782,8 +782,8 @@ apmopen(dev_t dev, int flag, int mode __unused, struct lwp *l __unused)
}
int
-apmclose(dev_t dev, int flag __unused, int mode __unused,
- struct lwp *l __unused)
+apmclose(dev_t dev, int flag, int mode,
+ struct lwp *l)
{
struct apm_softc *sc = apm_cd.cd_devs[APMUNIT(dev)];
int ctl = APM(dev);
@@ -810,7 +810,7 @@ apmclose(dev_t dev, int flag __unused, int mode __unused,
int
apmioctl(dev_t dev, u_long cmd, caddr_t data, int flag,
- struct lwp *l __unused)
+ struct lwp *l)
{
struct apm_softc *sc = apm_cd.cd_devs[APMUNIT(dev)];
struct apm_power_info *powerp;
@@ -937,7 +937,7 @@ filt_apmrdetach(struct knote *kn)
}
static int
-filt_apmread(struct knote *kn, long hint __unused)
+filt_apmread(struct knote *kn, long hint)
{
struct apm_softc *sc = kn->kn_hook;
diff --git a/sys/dev/ata/ata.c b/sys/dev/ata/ata.c
index 4717af27222..b2527fb305d 100644
--- a/sys/dev/ata/ata.c
+++ b/sys/dev/ata/ata.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ata.c,v 1.82 2006/10/25 17:33:02 bouyer Exp $ */
+/* $NetBSD: ata.c,v 1.83 2006/11/16 01:32:47 christos Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.82 2006/10/25 17:33:02 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.83 2006/11/16 01:32:47 christos Exp $");
#ifndef ATADEBUG
#define ATADEBUG
@@ -390,7 +390,7 @@ atabus_create_thread(void *arg)
* Autoconfiguration match routine.
*/
static int
-atabus_match(struct device *parent __unused, struct cfdata *cf, void *aux)
+atabus_match(struct device *parent, struct cfdata *cf, void *aux)
{
struct ata_channel *chp = aux;
@@ -410,7 +410,7 @@ atabus_match(struct device *parent __unused, struct cfdata *cf, void *aux)
* Autoconfiguration attach routine.
*/
static void
-atabus_attach(struct device *parent __unused, struct device *self, void *aux)
+atabus_attach(struct device *parent, struct device *self, void *aux)
{
struct atabus_softc *sc = (void *) self;
struct ata_channel *chp = aux;
@@ -1376,8 +1376,8 @@ ata_probe_caps(struct ata_drive_datas *drvp)
/* management of the /dev/atabus* devices */
int
-atabusopen(dev_t dev, int flag __unused, int fmt __unused,
- struct lwp *l __unused)
+atabusopen(dev_t dev, int flag, int fmt,
+ struct lwp *l)
{
struct atabus_softc *sc;
int error, unit = minor(dev);
@@ -1399,8 +1399,8 @@ atabusopen(dev_t dev, int flag __unused, int fmt __unused,
int
-atabusclose(dev_t dev, int flag __unused, int fmt __unused,
- struct lwp *l __unused)
+atabusclose(dev_t dev, int flag, int fmt,
+ struct lwp *l)
{
struct atabus_softc *sc = atabus_cd.cd_devs[minor(dev)];
@@ -1413,7 +1413,7 @@ atabusclose(dev_t dev, int flag __unused, int fmt __unused,
int
atabusioctl(dev_t dev, u_long cmd, caddr_t addr, int flag,
- struct lwp *l __unused)
+ struct lwp *l)
{
struct atabus_softc *sc = atabus_cd.cd_devs[minor(dev)];
struct ata_channel *chp = sc->sc_chan;
diff --git a/sys/dev/ata/ata_raid.c b/sys/dev/ata/ata_raid.c
index 5b3bf08917d..1710230699d 100644
--- a/sys/dev/ata/ata_raid.c
+++ b/sys/dev/ata/ata_raid.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ata_raid.c,v 1.19 2006/10/12 01:30:55 christos Exp $ */
+/* $NetBSD: ata_raid.c,v 1.20 2006/11/16 01:32:47 christos Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata_raid.c,v 1.19 2006/10/12 01:30:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata_raid.c,v 1.20 2006/11/16 01:32:47 christos Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -91,7 +91,7 @@ CFATTACH_DECL(ataraid, sizeof(struct device),
* Pseudo-device attach routine.
*/
void
-ataraidattach(int count __unused)
+ataraidattach(int count)
{
/*
@@ -127,7 +127,7 @@ ata_raid_type_name(u_int type)
* Autoconfiguration finalizer for ATA RAID.
*/
static int
-ata_raid_finalize(struct device *self __unused)
+ata_raid_finalize(struct device *self)
{
static struct cfdata ataraid_cfdata = {
.cf_name = "ataraid",
@@ -172,8 +172,8 @@ ata_raid_finalize(struct device *self __unused)
* Autoconfiguration glue: match routine.
*/
static int
-ataraid_match(struct device *parent __unused, struct cfdata *cf __unused,
- void *aux __unused)
+ataraid_match(struct device *parent, struct cfdata *cf,
+ void *aux)
{
/* pseudo-device; always present */
@@ -186,8 +186,8 @@ ataraid_match(struct device *parent __unused, struct cfdata *cf __unused,
* Autoconfiguration glue: attach routine. We attach the children.
*/
static void
-ataraid_attach(struct device *parent __unused, struct device *self,
- void *aux __unused)
+ataraid_attach(struct device *parent, struct device *self,
+ void *aux)
{
struct ataraid_array_info *aai;
int locs[ATARAIDCF_NLOCS];
diff --git a/sys/dev/ata/atareg.h b/sys/dev/ata/atareg.h
index f45125c0ab3..fbb9fe3dafc 100644
--- a/sys/dev/ata/atareg.h
+++ b/sys/dev/ata/atareg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: atareg.h,v 1.28 2006/09/30 15:56:18 itohy Exp $ */
+/* $NetBSD: atareg.h,v 1.29 2006/11/16 01:32:47 christos Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer.
@@ -147,7 +147,7 @@
#include <dev/ata/ataconf.h>
/* Convert a 32-bit command to a 48-bit command. */
-static __inline int __unused
+static __inline int
atacmd_to48(int cmd32)
{
switch (cmd32) {
@@ -178,7 +178,7 @@ atacmd_to48(int cmd32)
#ifdef _KERNEL
/* Convert a 32-bit command to a Native SATA Queued command. */
-static __inline int __unused
+static __inline int
atacmd_tostatq(int cmd32)
{
switch (cmd32) {
diff --git a/sys/dev/ata/ld_ataraid.c b/sys/dev/ata/ld_ataraid.c
index b9d5ea14672..89dc017c717 100644
--- a/sys/dev/ata/ld_ataraid.c
+++ b/sys/dev/ata/ld_ataraid.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_ataraid.c,v 1.17 2006/10/12 01:30:55 christos Exp $ */
+/* $NetBSD: ld_ataraid.c,v 1.18 2006/11/16 01:32:47 christos Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_ataraid.c,v 1.17 2006/10/12 01:30:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_ataraid.c,v 1.18 2006/11/16 01:32:47 christos Exp $");
#include "rnd.h"
@@ -113,15 +113,15 @@ struct cbuf {
#define CBUF_PUT(cbp) pool_put(&ld_ataraid_cbufpl, (cbp))
static int
-ld_ataraid_match(struct device *parent __unused,
- struct cfdata *match __unused, void *aux __unused)
+ld_ataraid_match(struct device *parent,
+ struct cfdata *match, void *aux)
{
return (1);
}
static void
-ld_ataraid_attach(struct device *parent __unused, struct device *self,
+ld_ataraid_attach(struct device *parent, struct device *self,
void *aux)
{
struct ld_ataraid_softc *sc = (void *) self;
@@ -525,8 +525,8 @@ out:
}
static int
-ld_ataraid_dump(struct ld_softc *sc __unused, void *data __unused,
- int blkno __unused, int blkcnt __unused)
+ld_ataraid_dump(struct ld_softc *sc, void *data,
+ int blkno, int blkcnt)
{
return (EIO);
diff --git a/sys/dev/ata/wd.c b/sys/dev/ata/wd.c
index 5928ceabb67..5885d18aefb 100644
--- a/sys/dev/ata/wd.c
+++ b/sys/dev/ata/wd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wd.c,v 1.334 2006/11/09 19:43:05 bouyer Exp $ */
+/* $NetBSD: wd.c,v 1.335 2006/11/16 01:32:48 christos Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.334 2006/11/09 19:43:05 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.335 2006/11/16 01:32:48 christos Exp $");
#ifndef ATADEBUG
#define ATADEBUG
@@ -278,7 +278,7 @@ wd_lookup_quirks(const char *name)
}
int
-wdprobe(struct device *parent __unused, struct cfdata *match, void *aux)
+wdprobe(struct device *parent, struct cfdata *match, void *aux)
{
struct ata_device *adev = aux;
@@ -294,7 +294,7 @@ wdprobe(struct device *parent __unused, struct cfdata *match, void *aux)
}
void
-wdattach(struct device *parent __unused, struct device *self, void *aux)
+wdattach(struct device *parent, struct device *self, void *aux)
{
struct wd_softc *wd = (void *)self;
struct ata_device *adev= aux;
@@ -429,7 +429,7 @@ wdattach(struct device *parent __unused, struct device *self, void *aux)
}
int
-wdactivate(struct device *self __unused, enum devact act)
+wdactivate(struct device *self, enum devact act)
{
int rv = 0;
@@ -448,7 +448,7 @@ wdactivate(struct device *self __unused, enum devact act)
}
int
-wddetach(struct device *self, int flags __unused)
+wddetach(struct device *self, int flags)
{
struct wd_softc *sc = (struct wd_softc *)self;
int s, bmaj, cmaj, i, mn;
@@ -875,7 +875,7 @@ wdrestart(void *v)
}
int
-wdread(dev_t dev, struct uio *uio, int flags __unused)
+wdread(dev_t dev, struct uio *uio, int flags)
{
ATADEBUG_PRINT(("wdread\n"), DEBUG_XFERS);
@@ -883,7 +883,7 @@ wdread(dev_t dev, struct uio *uio, int flags __unused)
}
int
-wdwrite(dev_t dev, struct uio *uio, int flags __unused)
+wdwrite(dev_t dev, struct uio *uio, int flags)
{
ATADEBUG_PRINT(("wdwrite\n"), DEBUG_XFERS);
@@ -891,7 +891,7 @@ wdwrite(dev_t dev, struct uio *uio, int flags __unused)
}
int
-wdopen(dev_t dev, int flag __unused, int fmt, struct lwp *l __unused)
+wdopen(dev_t dev, int flag, int fmt, struct lwp *l)
{
struct wd_softc *wd;
int part, error;
@@ -979,7 +979,7 @@ wdopen(dev_t dev, int flag __unused, int fmt, struct lwp *l __unused)
}
int
-wdclose(dev_t dev, int flag __unused, int fmt, struct lwp *l __unused)
+wdclose(dev_t dev, int flag, int fmt, struct lwp *l)
{
struct wd_softc *wd = device_lookup(&wd_cd, WDUNIT(dev));
int part = WDPART(dev);
@@ -1684,7 +1684,7 @@ bad144intern(struct wd_softc *wd)
#endif
static void
-wd_params_to_properties(struct wd_softc *wd, struct ataparams *params __unused)
+wd_params_to_properties(struct wd_softc *wd, struct ataparams *params)
{
prop_dictionary_t disk_info, odisk_info, geom;
const char *cp;
diff --git a/sys/dev/auconv.c b/sys/dev/auconv.c
index 85c41394bcb..ad56a9e94c6 100644
--- a/sys/dev/auconv.c
+++ b/sys/dev/auconv.c
@@ -1,4 +1,4 @@
-/* $NetBSD: auconv.c,v 1.18 2006/10/12 01:30:50 christos Exp $ */
+/* $NetBSD: auconv.c,v 1.19 2006/11/16 01:32:44 christos Exp $ */
/*
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auconv.c,v 1.18 2006/10/12 01:30:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auconv.c,v 1.19 2006/11/16 01:32:44 christos Exp $");
#include <sys/types.h>
#include <sys/audioio.h>
@@ -250,8 +250,8 @@ auconv_nocontext_filter_dtor(struct stream_filter *this)
static int \
name##_fetch_to(stream_fetcher_t *, audio_stream_t *, int); \
stream_filter_t * \
-name(struct audio_softc *sc __unused, const audio_params_t *from __unused, \
- const audio_params_t *to __unused) \
+name(struct audio_softc *sc, const audio_params_t *from, \
+ const audio_params_t *to) \
{ \
return auconv_nocontext_filter_factory(name##_fetch_to); \
} \
@@ -480,7 +480,7 @@ DEFINE_FILTER(linear16_to_linear8)
*/
int
auconv_set_converter(const struct audio_format *formats, int nformats,
- int mode, const audio_params_t *param, int rateconv __unused,
+ int mode, const audio_params_t *param, int rateconv,
stream_filter_list_t *list)
{
audio_params_t work;
@@ -791,7 +791,7 @@ auconv_dump_params(const audio_params_t *p)
}
#else
static void
-auconv_dump_params(const audio_params_t *p __unused)
+auconv_dump_params(const audio_params_t *p)
{
}
#endif /* AUCONV_DEBUG */
diff --git a/sys/dev/audio.c b/sys/dev/audio.c
index ad9a1dbdaa3..2ea82d47203 100644
--- a/sys/dev/audio.c
+++ b/sys/dev/audio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: audio.c,v 1.214 2006/11/01 10:13:37 cbiere Exp $ */
+/* $NetBSD: audio.c,v 1.215 2006/11/16 01:32:44 christos Exp $ */
/*
* Copyright (c) 1991-1993 Regents of the University of California.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.214 2006/11/01 10:13:37 cbiere Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.215 2006/11/16 01:32:44 christos Exp $");
#include "audio.h"
#if NAUDIO > 0
@@ -247,7 +247,7 @@ CFATTACH_DECL(audio, sizeof(struct audio_softc),
extern struct cfdriver audio_cd;
int
-audioprobe(struct device *parent __unused, struct cfdata *match __unused,
+audioprobe(struct device *parent, struct cfdata *match,
void *aux)
{
struct audio_attach_args *sa;
@@ -481,7 +481,7 @@ audioactivate(struct device *self, enum devact act)
}
int
-audiodetach(struct device *self, int flags __unused)
+audiodetach(struct device *self, int flags)
{
struct audio_softc *sc;
int maj, mn;
@@ -1312,8 +1312,8 @@ audio_wakeup(int *chan)
}
int
-audio_open(dev_t dev, struct audio_softc *sc, int flags, int ifmt __unused,
- struct lwp *l __unused)
+audio_open(dev_t dev, struct audio_softc *sc, int flags, int ifmt,
+ struct lwp *l)
{
int error;
u_int mode;
@@ -1507,8 +1507,8 @@ audio_drain(struct audio_softc *sc)
*/
/* ARGSUSED */
int
-audio_close(struct audio_softc *sc, int flags, int ifmt __unused,
- struct lwp *l __unused)
+audio_close(struct audio_softc *sc, int flags, int ifmt,
+ struct lwp *l)
{
const struct audio_hw_if *hw;
int s;
@@ -1783,7 +1783,7 @@ audio_silence_copyout(struct audio_softc *sc, int n, struct uio *uio)
static int
uio_fetcher_fetch_to(stream_fetcher_t *self, audio_stream_t *p,
- int max_used __unused)
+ int max_used)
{
uio_fetcher_t *this;
int size;
@@ -1824,8 +1824,8 @@ uio_fetcher_fetch_to(stream_fetcher_t *self, audio_stream_t *p,
}
static int
-null_fetcher_fetch_to(stream_fetcher_t *self __unused,
- audio_stream_t *p __unused, int max_used __unused)
+null_fetcher_fetch_to(stream_fetcher_t *self,
+ audio_stream_t *p, int max_used)
{
return 0;
@@ -2240,7 +2240,7 @@ filt_audiordetach(struct knote *kn)
}
static int
-filt_audioread(struct knote *kn, long hint __unused)
+filt_audioread(struct knote *kn, long hint)
{
struct audio_softc *sc;
int s;
@@ -2273,7 +2273,7 @@ filt_audiowdetach(struct knote *kn)
}
static int
-filt_audiowrite(struct knote *kn, long hint __unused)
+filt_audiowrite(struct knote *kn, long hint)
{
struct audio_softc *sc;
audio_stream_t *stream;
@@ -3582,8 +3582,8 @@ audiogetinfo(struct audio_softc *sc, struct audio_info *ai)
* Mixer driver
*/
int
-mixer_open(dev_t dev __unused, struct audio_softc *sc, int flags __unused,
- int ifmt __unused, struct lwp *l __unused)
+mixer_open(dev_t dev, struct audio_softc *sc, int flags,
+ int ifmt, struct lwp *l)
{
if (sc->hw_if == NULL)
return ENXIO;
@@ -3634,7 +3634,7 @@ mixer_signal(struct audio_softc *sc)
*/
/* ARGSUSED */
int
-mixer_close(struct audio_softc *sc, int flags __unused, int ifmt __unused,
+mixer_close(struct audio_softc *sc, int flags, int ifmt,
struct lwp *l)
{
diff --git a/sys/dev/aurateconv.c b/sys/dev/aurateconv.c
index e78c29b6334..5bdf0fafb3b 100644
--- a/sys/dev/aurateconv.c
+++ b/sys/dev/aurateconv.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aurateconv.c,v 1.16 2006/10/12 01:30:50 christos Exp $ */
+/* $NetBSD: aurateconv.c,v 1.17 2006/11/16 01:32:44 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aurateconv.c,v 1.16 2006/10/12 01:30:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aurateconv.c,v 1.17 2006/11/16 01:32:44 christos Exp $");
#include <sys/systm.h>
#include <sys/types.h>
@@ -100,7 +100,7 @@ static int32_t int32_mask[33] = {
};
stream_filter_t *
-aurateconv(struct audio_softc *sc __unused, const audio_params_t *from,
+aurateconv(struct audio_softc *sc, const audio_params_t *from,
const audio_params_t *to)
{
aurateconv_t *this;
@@ -335,7 +335,7 @@ aurateconv_fetch_to(stream_fetcher_t *self, audio_stream_t *dst, int max_used)
#define AURATECONV_SLINEAR(BITS, EN) \
static int \
aurateconv_slinear##BITS##_##EN (aurateconv_t *this, audio_stream_t *dst, \
- int m, int frame_src, int frame_dst __unused) \
+ int m, int frame_src, int frame_dst) \
{ \
uint8_t *w; \
const uint8_t *r; \
diff --git a/sys/dev/bluetooth/bthidev.c b/sys/dev/bluetooth/bthidev.c
index 6d056fba592..2d1f6358026 100644
--- a/sys/dev/bluetooth/bthidev.c
+++ b/sys/dev/bluetooth/bthidev.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bthidev.c,v 1.6 2006/10/12 01:30:55 christos Exp $ */
+/* $NetBSD: bthidev.c,v 1.7 2006/11/16 01:32:48 christos Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bthidev.c,v 1.6 2006/10/12 01:30:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bthidev.c,v 1.7 2006/11/16 01:32:48 christos Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -151,7 +151,7 @@ static const struct btproto bthidev_int_proto = {
*/
static int
-bthidev_match(struct device *self __unused, struct cfdata *cfdata __unused,
+bthidev_match(struct device *self, struct cfdata *cfdata,
void *aux)
{
prop_dictionary_t dict = aux;
@@ -165,7 +165,7 @@ bthidev_match(struct device *self __unused, struct cfdata *cfdata __unused,
}
static void
-bthidev_attach(struct device *parent __unused, struct device *self, void *aux)
+bthidev_attach(struct device *parent, struct device *self, void *aux)
{
struct bthidev_softc *sc = (struct bthidev_softc *)self;
prop_dictionary_t dict = aux;
@@ -518,7 +518,7 @@ bthidev_connect(struct bthidev_softc *sc)
*/
static void
-bthidev_connecting(void *arg __unused)
+bthidev_connecting(void *arg)
{
/* dont care */
@@ -596,7 +596,7 @@ bthidev_int_connected(void *arg)
* schedule another try otherwise just give up. They will contact us.
*/
static void
-bthidev_ctl_disconnected(void *arg, int err __unused)
+bthidev_ctl_disconnected(void *arg, int err)
{
struct bthidev_softc *sc = arg;
@@ -629,7 +629,7 @@ bthidev_ctl_disconnected(void *arg, int err __unused)
}
static void
-bthidev_int_disconnected(void *arg, int err __unused)
+bthidev_int_disconnected(void *arg, int err)
{
struct bthidev_softc *sc = arg;
@@ -667,7 +667,7 @@ bthidev_int_disconnected(void *arg, int err __unused)
* be called when the connection is open, so nothing else to do here
*/
static void *
-bthidev_ctl_newconn(void *arg, struct sockaddr_bt *laddr __unused,
+bthidev_ctl_newconn(void *arg, struct sockaddr_bt *laddr,
struct sockaddr_bt *raddr)
{
struct bthidev_softc *sc = arg;
@@ -684,7 +684,7 @@ bthidev_ctl_newconn(void *arg, struct sockaddr_bt *laddr __unused,
}
static void *
-bthidev_int_newconn(void *arg, struct sockaddr_bt *laddr __unused,
+bthidev_int_newconn(void *arg, struct sockaddr_bt *laddr,
struct sockaddr_bt *raddr)
{
struct bthidev_softc *sc = arg;
@@ -701,7 +701,7 @@ bthidev_int_newconn(void *arg, struct sockaddr_bt *laddr __unused,
}
static void
-bthidev_complete(void *arg __unused, int count __unused)
+bthidev_complete(void *arg, int count)
{
/* dont care */
@@ -797,8 +797,8 @@ release:
*/
static void
-bthidev_null(struct bthidev *dev __unused, uint8_t *report __unused,
- int len __unused)
+bthidev_null(struct bthidev *dev, uint8_t *report,
+ int len)
{
/*
diff --git a/sys/dev/bluetooth/bthub.c b/sys/dev/bluetooth/bthub.c
index 1b7665ca013..909fad5024f 100644
--- a/sys/dev/bluetooth/bthub.c
+++ b/sys/dev/bluetooth/bthub.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bthub.c,v 1.7 2006/10/12 01:30:55 christos Exp $ */
+/* $NetBSD: bthub.c,v 1.8 2006/11/16 01:32:48 christos Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bthub.c,v 1.7 2006/10/12 01:30:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bthub.c,v 1.8 2006/11/16 01:32:48 christos Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -91,15 +91,15 @@ static int bthub_pioctl(dev_t, unsigned long, prop_dictionary_t, int, struct lwp
*/
static int
-bthub_match(struct device *self __unused, struct cfdata *cfdata __unused,
- void *arg __unused)
+bthub_match(struct device *self, struct cfdata *cfdata,
+ void *arg)
{
return 1;
}
static void
-bthub_attach(struct device *parent __unused, struct device *self, void *aux)
+bthub_attach(struct device *parent, struct device *self, void *aux)
{
struct bthub_softc *sc = (struct bthub_softc *)self;
bdaddr_t *addr = aux;
@@ -174,8 +174,8 @@ bthubioctl(dev_t devno, unsigned long cmd, caddr_t data, int flag, struct lwp *l
}
static int
-bthub_pioctl(dev_t devno __unused, unsigned long cmd, prop_dictionary_t dict,
- int flag __unused, struct lwp *l __unused)
+bthub_pioctl(dev_t devno, unsigned long cmd, prop_dictionary_t dict,
+ int flag, struct lwp *l)
{
struct bthub_softc *sc;
struct btdev *dev;
diff --git a/sys/dev/bluetooth/btkbd.c b/sys/dev/bluetooth/btkbd.c
index 23dc3685052..40f4491cd68 100644
--- a/sys/dev/bluetooth/btkbd.c
+++ b/sys/dev/bluetooth/btkbd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: btkbd.c,v 1.4 2006/10/12 01:30:55 christos Exp $ */
+/* $NetBSD: btkbd.c,v 1.5 2006/11/16 01:32:48 christos Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btkbd.c,v 1.4 2006/10/12 01:30:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btkbd.c,v 1.5 2006/11/16 01:32:48 christos Exp $");
#include <sys/param.h>
#include <sys/callout.h>
@@ -164,7 +164,7 @@ static void btkbd_repeat(void *);
*/
static int
-btkbd_match(struct device *self __unused, struct cfdata *cfdata __unused,
+btkbd_match(struct device *self, struct cfdata *cfdata,
void *aux)
{
struct bthidev_attach_args *ba = aux;
@@ -177,7 +177,7 @@ btkbd_match(struct device *self __unused, struct cfdata *cfdata __unused,
}
static void
-btkbd_attach(struct device *parent __unused, struct device *self, void *aux)
+btkbd_attach(struct device *parent, struct device *self, void *aux)
{
struct btkbd_softc *sc = (struct btkbd_softc *)self;
struct bthidev_attach_args *ba = aux;
@@ -337,8 +337,8 @@ btkbd_set_leds(void *self, int leds)
}
static int
-btkbd_ioctl(void *self, unsigned long cmd, caddr_t data, int flag __unused,
- struct lwp *l __unused)
+btkbd_ioctl(void *self, unsigned long cmd, caddr_t data, int flag,
+ struct lwp *l)
{
struct btkbd_softc *sc = (struct btkbd_softc *)self;
@@ -429,7 +429,7 @@ static const u_int8_t btkbd_trtab[256] = {
#define REP_DELAYN 100
static void
-btkbd_input(struct bthidev *self, uint8_t *data, int len __unused)
+btkbd_input(struct bthidev *self, uint8_t *data, int len)
{
struct btkbd_softc *sc = (struct btkbd_softc *)self;
struct btkbd_data *ud = &sc->sc_ndata;
diff --git a/sys/dev/bluetooth/btms.c b/sys/dev/bluetooth/btms.c
index 845afbe8c98..8c72c971482 100644
--- a/sys/dev/bluetooth/btms.c
+++ b/sys/dev/bluetooth/btms.c
@@ -1,4 +1,4 @@
-/* $NetBSD: btms.c,v 1.4 2006/11/12 19:00:43 plunky Exp $ */
+/* $NetBSD: btms.c,v 1.5 2006/11/16 01:32:48 christos Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btms.c,v 1.4 2006/11/12 19:00:43 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btms.c,v 1.5 2006/11/16 01:32:48 christos Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -111,7 +111,7 @@ static void btms_input(struct bthidev *, uint8_t *, int);
*/
static int
-btms_match(struct device *parent __unused, struct cfdata *match __unused,
+btms_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct bthidev_attach_args *ba = aux;
@@ -124,7 +124,7 @@ btms_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-btms_attach(struct device *parent __unused, struct device *self, void *aux)
+btms_attach(struct device *parent, struct device *self, void *aux)
{
struct btms_softc *sc = (struct btms_softc *)self;
struct bthidev_attach_args *ba = aux;
@@ -286,8 +286,8 @@ btms_wsmouse_enable(void *self)
}
static int
-btms_wsmouse_ioctl(void *self __unused, unsigned long cmd, caddr_t data,
- int flag __unused, struct lwp *l __unused)
+btms_wsmouse_ioctl(void *self, unsigned long cmd, caddr_t data,
+ int flag, struct lwp *l)
{
/* struct btms_softc *sc = (struct btms_softc *)self; */
@@ -317,7 +317,7 @@ btms_wsmouse_disable(void *self)
*/
static void
-btms_input(struct bthidev *self, uint8_t *data, int len __unused)
+btms_input(struct bthidev *self, uint8_t *data, int len)
{
struct btms_softc *sc = (struct btms_softc *)self;
int dx, dy, dz, dw;
diff --git a/sys/dev/bluetooth/btsco.c b/sys/dev/bluetooth/btsco.c
index 3a92090d603..ce7e5194103 100644
--- a/sys/dev/bluetooth/btsco.c
+++ b/sys/dev/bluetooth/btsco.c
@@ -1,4 +1,4 @@
-/* $NetBSD: btsco.c,v 1.10 2006/10/12 01:30:55 christos Exp $ */
+/* $NetBSD: btsco.c,v 1.11 2006/11/16 01:32:48 christos Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btsco.c,v 1.10 2006/10/12 01:30:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btsco.c,v 1.11 2006/11/16 01:32:48 christos Exp $");
#include <sys/param.h>
#include <sys/audioio.h>
@@ -254,7 +254,7 @@ static void btsco_intr(void *);
*/
static int
-btsco_match(struct device *self __unused, struct cfdata *cfdata __unused,
+btsco_match(struct device *self, struct cfdata *cfdata,
void *aux)
{
prop_dictionary_t dict = aux;
@@ -271,7 +271,7 @@ btsco_match(struct device *self __unused, struct cfdata *cfdata __unused,
}
static void
-btsco_attach(struct device *parent __unused, struct device *self, void *aux)
+btsco_attach(struct device *parent, struct device *self, void *aux)
{
struct btsco_softc *sc = (struct btsco_softc *)self;
prop_dictionary_t dict = aux;
@@ -393,7 +393,7 @@ btsco_detach(struct device *self, int flags)
*/
static void
-btsco_sco_connecting(void *arg __unused)
+btsco_sco_connecting(void *arg)
{
/* struct btsco_softc *sc = arg; */
@@ -468,7 +468,7 @@ btsco_sco_disconnected(void *arg, int err)
}
static void *
-btsco_sco_newconn(void *arg, struct sockaddr_bt *laddr __unused,
+btsco_sco_newconn(void *arg, struct sockaddr_bt *laddr,
struct sockaddr_bt *raddr)
{
struct btsco_softc *sc = arg;
@@ -547,7 +547,7 @@ btsco_sco_input(void *arg, struct mbuf *m)
*/
static int
-btsco_open(void *hdl, int flags __unused)
+btsco_open(void *hdl, int flags)
{
struct sockaddr_bt sa;
struct btsco_softc *sc = hdl;
@@ -678,7 +678,7 @@ btsco_close(void *hdl)
}
static int
-btsco_query_encoding(void *hdl __unused, struct audio_encoding *ae)
+btsco_query_encoding(void *hdl, struct audio_encoding *ae)
{
/* struct btsco_softc *sc = hdl; */
int err = 0;
@@ -699,7 +699,7 @@ btsco_query_encoding(void *hdl __unused, struct audio_encoding *ae)
}
static int
-btsco_set_params(void *hdl __unused, int setmode, int usemode __unused,
+btsco_set_params(void *hdl, int setmode, int usemode,
audio_params_t *play, audio_params_t *rec,
stream_filter_list_t *pfil, stream_filter_list_t *rfil)
{
@@ -737,8 +737,8 @@ btsco_set_params(void *hdl __unused, int setmode, int usemode __unused,
* If we have an MTU value to use, round the blocksize to that.
*/
static int
-btsco_round_blocksize(void *hdl, int bs, int mode __unused,
- const audio_params_t *param __unused)
+btsco_round_blocksize(void *hdl, int bs, int mode,
+ const audio_params_t *param)
{
struct btsco_softc *sc = hdl;
@@ -871,7 +871,7 @@ btsco_halt_input(void *hdl)
}
static int
-btsco_getdev(void *hdl __unused, struct audio_device *ret)
+btsco_getdev(void *hdl, struct audio_device *ret)
{
*ret = btsco_device;
@@ -879,7 +879,7 @@ btsco_getdev(void *hdl __unused, struct audio_device *ret)
}
static int
-btsco_setfd(void *hdl __unused, int fd __unused)
+btsco_setfd(void *hdl, int fd)
{
DPRINTF("set %s duplex\n", fd ? "full" : "half");
@@ -955,7 +955,7 @@ btsco_get_port(void *hdl, mixer_ctrl_t *mc)
}
static int
-btsco_query_devinfo(void *hdl __unused, mixer_devinfo_t *di)
+btsco_query_devinfo(void *hdl, mixer_devinfo_t *di)
{
/* struct btsco_softc *sc = hdl; */
int err = 0;
@@ -1054,7 +1054,7 @@ btsco_freem(void *hdl, void *addr, struct malloc_type *type)
}
static int
-btsco_get_props(void *hdl __unused)
+btsco_get_props(void *hdl)
{
return AUDIO_PROP_FULLDUPLEX;
@@ -1065,8 +1065,8 @@ btsco_get_props(void *hdl __unused)
* to the device and mixer.
*/
static int
-btsco_dev_ioctl(void *hdl, u_long cmd, caddr_t addr, int flag __unused,
- struct lwp *l __unused)
+btsco_dev_ioctl(void *hdl, u_long cmd, caddr_t addr, int flag,
+ struct lwp *l)
{
struct btsco_softc *sc = hdl;
struct btsco_info *bi = (struct btsco_info *)addr;
@@ -1157,7 +1157,7 @@ btsco_intr(void *arg)
* that we dont release it before its free.
*/
static void
-btsco_extfree(struct mbuf *m, caddr_t addr __unused, size_t size __unused,
+btsco_extfree(struct mbuf *m, caddr_t addr, size_t size,
void *arg)
{
struct btsco_softc *sc = arg;
diff --git a/sys/dev/cardbus/adv_cardbus.c b/sys/dev/cardbus/adv_cardbus.c
index fb4bfc6cb3b..17b8d84200f 100644
--- a/sys/dev/cardbus/adv_cardbus.c
+++ b/sys/dev/cardbus/adv_cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: adv_cardbus.c,v 1.14 2006/10/12 01:30:55 christos Exp $ */
+/* $NetBSD: adv_cardbus.c,v 1.15 2006/11/16 01:32:48 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adv_cardbus.c,v 1.14 2006/10/12 01:30:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adv_cardbus.c,v 1.15 2006/11/16 01:32:48 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -97,7 +97,7 @@ CFATTACH_DECL(adv_cardbus, sizeof(struct adv_cardbus_softc),
adv_cardbus_match, adv_cardbus_attach, adv_cardbus_detach, NULL);
int
-adv_cardbus_match(struct device *parent __unused, struct cfdata *match __unused,
+adv_cardbus_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct cardbus_attach_args *ca = aux;
@@ -110,7 +110,7 @@ adv_cardbus_match(struct device *parent __unused, struct cfdata *match __unused,
}
void
-adv_cardbus_attach(struct device *parent __unused, struct device *self,
+adv_cardbus_attach(struct device *parent, struct device *self,
void *aux)
{
struct cardbus_attach_args *ca = aux;
diff --git a/sys/dev/cardbus/ahc_cardbus.c b/sys/dev/cardbus/ahc_cardbus.c
index e616716691c..aade4bfa024 100644
--- a/sys/dev/cardbus/ahc_cardbus.c
+++ b/sys/dev/cardbus/ahc_cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ahc_cardbus.c,v 1.20 2006/10/12 01:30:55 christos Exp $ */
+/* $NetBSD: ahc_cardbus.c,v 1.21 2006/11/16 01:32:48 christos Exp $ */
/*-
* Copyright (c) 2000, 2005 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahc_cardbus.c,v 1.20 2006/10/12 01:30:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahc_cardbus.c,v 1.21 2006/11/16 01:32:48 christos Exp $");
#include "opt_ahc_cardbus.h"
@@ -101,7 +101,7 @@ CFATTACH_DECL(ahc_cardbus, sizeof(struct ahc_cardbus_softc),
ahc_cardbus_match, ahc_cardbus_attach, ahc_cardbus_detach, ahc_activate);
int
-ahc_cardbus_match(struct device *parent __unused, struct cfdata *match __unused,
+ahc_cardbus_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct cardbus_attach_args *ca = aux;
@@ -114,7 +114,7 @@ ahc_cardbus_match(struct device *parent __unused, struct cfdata *match __unused,
}
void
-ahc_cardbus_attach(struct device *parent __unused, struct device *self,
+ahc_cardbus_attach(struct device *parent, struct device *self,
void *aux)
{
struct cardbus_attach_args *ca = aux;
diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c
index e8242424e74..9a8d62f1d87 100644
--- a/sys/dev/cardbus/cardbus.c
+++ b/sys/dev/cardbus/cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cardbus.c,v 1.73 2006/10/12 01:30:55 christos Exp $ */
+/* $NetBSD: cardbus.c,v 1.74 2006/11/16 01:32:48 christos Exp $ */
/*
* Copyright (c) 1997, 1998, 1999 and 2000
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cardbus.c,v 1.73 2006/10/12 01:30:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cardbus.c,v 1.74 2006/11/16 01:32:48 christos Exp $");
#include "opt_cardbus.h"
@@ -100,7 +100,7 @@ struct cfdriver cardbus_cd = {
STATIC int
-cardbusmatch(struct device *parent __unused, struct cfdata *cf, void *aux)
+cardbusmatch(struct device *parent, struct cfdata *cf, void *aux)
{
struct cbslot_attach_args *cba = aux;
@@ -114,7 +114,7 @@ cardbusmatch(struct device *parent __unused, struct cfdata *cf, void *aux)
}
STATIC void
-cardbusattach(struct device *parent __unused, struct device *self, void *aux)
+cardbusattach(struct device *parent, struct device *self, void *aux)
{
struct cardbus_softc *sc = device_private(self);
struct cbslot_attach_args *cba = aux;
@@ -282,7 +282,7 @@ cardbus_read_tuples(struct cardbus_attach_args *ca, cardbusreg_t cis_ptr,
}
static void
-parse_tuple(u_int8_t *tuple, int len __unused, void *data)
+parse_tuple(u_int8_t *tuple, int len, void *data)
{
struct cardbus_cis_info *cis = data;
char *p;
@@ -407,7 +407,7 @@ cardbus_attach_card(struct cardbus_softc *sc)
}
int
-cardbus_rescan(struct device *self, const char *ifattr __unused,
+cardbus_rescan(struct device *self, const char *ifattr,
const int *locators)
{
struct cardbus_softc *sc = device_private(self);
@@ -1054,7 +1054,7 @@ tuple_name(int type)
}
static void
-print_tuple(u_int8_t *tuple, int len, void *data __unused)
+print_tuple(u_int8_t *tuple, int len, void *data)
{
int i;
diff --git a/sys/dev/cardbus/cardbus_map.c b/sys/dev/cardbus/cardbus_map.c
index ca91e003882..6ac2cf1d388 100644
--- a/sys/dev/cardbus/cardbus_map.c
+++ b/sys/dev/cardbus/cardbus_map.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cardbus_map.c,v 1.23 2006/10/12 01:30:55 christos Exp $ */
+/* $NetBSD: cardbus_map.c,v 1.24 2006/11/16 01:32:48 christos Exp $ */
/*
* Copyright (c) 1999 and 2000
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cardbus_map.c,v 1.23 2006/10/12 01:30:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cardbus_map.c,v 1.24 2006/11/16 01:32:48 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -78,7 +78,7 @@ cardbus_io_find(
cardbus_function_tag_t cf,
cardbustag_t tag,
int reg,
- cardbusreg_t type __unused,
+ cardbusreg_t type,
bus_addr_t *basep,
bus_size_t *sizep,
int *flagsp)
diff --git a/sys/dev/cardbus/cardslot.c b/sys/dev/cardbus/cardslot.c
index 33a009f2caa..a9581a40447 100644
--- a/sys/dev/cardbus/cardslot.c
+++ b/sys/dev/cardbus/cardslot.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cardslot.c,v 1.32 2006/10/12 01:30:55 christos Exp $ */
+/* $NetBSD: cardslot.c,v 1.33 2006/11/16 01:32:48 christos Exp $ */
/*
* Copyright (c) 1999 and 2000
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cardslot.c,v 1.32 2006/10/12 01:30:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cardslot.c,v 1.33 2006/11/16 01:32:48 christos Exp $");
#include "opt_cardslot.h"
@@ -80,7 +80,7 @@ CFATTACH_DECL(cardslot, sizeof(struct cardslot_softc),
cardslotmatch, cardslotattach, NULL, NULL);
STATIC int
-cardslotmatch(struct device *parent __unused, struct cfdata *cf __unused,
+cardslotmatch(struct device *parent, struct cfdata *cf,
void *aux)
{
struct cardslot_attach_args *caa = aux;
@@ -96,7 +96,7 @@ cardslotmatch(struct device *parent __unused, struct cfdata *cf __unused,
STATIC void
-cardslotattach(struct device *parent __unused, struct device *self,
+cardslotattach(struct device *parent, struct device *self,
void *aux)
{
struct cardslot_softc *sc = device_private(self);
@@ -182,7 +182,7 @@ cardslot_cb_print(aux, pnp)
static int
cardslot_16_submatch(struct device *parent, struct cfdata *cf,
- const int *ldesc __unused, void *aux)
+ const int *ldesc, void *aux)
{
if (cf->cf_loc[PCMCIABUSCF_CONTROLLER] != PCMCIABUSCF_CONTROLLER_DEFAULT
@@ -200,7 +200,7 @@ cardslot_16_submatch(struct device *parent, struct cfdata *cf,
static int
-cardslot_16_print(void *arg __unused, const char *pnp)
+cardslot_16_print(void *arg, const char *pnp)
{
if (pnp) {
diff --git a/sys/dev/cardbus/com_cardbus.c b/sys/dev/cardbus/com_cardbus.c
index bd2d36d3d0f..ee3775cc866 100644
--- a/sys/dev/cardbus/com_cardbus.c
+++ b/sys/dev/cardbus/com_cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com_cardbus.c,v 1.19 2006/10/12 01:30:55 christos Exp $ */
+/* $NetBSD: com_cardbus.c,v 1.20 2006/11/16 01:32:48 christos Exp $ */
/*
* Copyright (c) 2000 Johan Danielsson
@@ -40,7 +40,7 @@
updated below. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_cardbus.c,v 1.19 2006/10/12 01:30:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_cardbus.c,v 1.20 2006/11/16 01:32:48 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -115,7 +115,7 @@ find_csdev(struct cardbus_attach_args *ca)
}
static int
-com_cardbus_match(struct device *parent __unused, struct cfdata *match __unused,
+com_cardbus_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct cardbus_attach_args *ca = aux;
@@ -204,7 +204,7 @@ gofigure(struct cardbus_attach_args *ca, struct com_cardbus_softc *csc)
}
static void
-com_cardbus_attach (struct device *parent __unused, struct device *self,
+com_cardbus_attach (struct device *parent, struct device *self,
void *aux)
{
struct com_softc *sc = device_private(self);
diff --git a/sys/dev/cardbus/ehci_cardbus.c b/sys/dev/cardbus/ehci_cardbus.c
index 14e42b03721..5b68cd00979 100644
--- a/sys/dev/cardbus/ehci_cardbus.c
+++ b/sys/dev/cardbus/ehci_cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci_cardbus.c,v 1.15 2006/10/12 01:30:55 christos Exp $ */
+/* $NetBSD: ehci_cardbus.c,v 1.16 2006/11/16 01:32:48 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci_cardbus.c,v 1.15 2006/10/12 01:30:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci_cardbus.c,v 1.16 2006/11/16 01:32:48 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -96,8 +96,8 @@ static TAILQ_HEAD(, usb_cardbus) ehci_cardbus_alldevs =
TAILQ_HEAD_INITIALIZER(ehci_cardbus_alldevs);
int
-ehci_cardbus_match(struct device *parent __unused,
- struct cfdata *match __unused, void *aux)
+ehci_cardbus_match(struct device *parent,
+ struct cfdata *match, void *aux)
{
struct cardbus_attach_args *ca = (struct cardbus_attach_args *)aux;
@@ -110,7 +110,7 @@ ehci_cardbus_match(struct device *parent __unused,
}
void
-ehci_cardbus_attach(struct device *parent __unused, struct device *self,
+ehci_cardbus_attach(struct device *parent, struct device *self,
void *aux)
{
struct ehci_cardbus_softc *sc = device_private(self);
diff --git a/sys/dev/cardbus/fwohci_cardbus.c b/sys/dev/cardbus/fwohci_cardbus.c
index a709e34568d..895032f0838 100644
--- a/sys/dev/cardbus/fwohci_cardbus.c
+++ b/sys/dev/cardbus/fwohci_cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fwohci_cardbus.c,v 1.17 2006/10/12 01:30:55 christos Exp $ */
+/* $NetBSD: fwohci_cardbus.c,v 1.18 2006/11/16 01:32:48 christos Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fwohci_cardbus.c,v 1.17 2006/10/12 01:30:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fwohci_cardbus.c,v 1.18 2006/11/16 01:32:48 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -82,8 +82,8 @@ CFATTACH_DECL(fwohci_cardbus, sizeof(struct fwohci_cardbus_softc),
#define cardbus_devinfo pci_devinfo
static int
-fwohci_cardbus_match(struct device *parent __unused,
- struct cfdata *match __unused, void *aux)
+fwohci_cardbus_match(struct device *parent,
+ struct cfdata *match, void *aux)
{
struct cardbus_attach_args *ca = (struct cardbus_attach_args *)aux;
@@ -97,7 +97,7 @@ fwohci_cardbus_match(struct device *parent __unused,
}
static void
-fwohci_cardbus_attach(struct device *parent __unused, struct device *self,
+fwohci_cardbus_attach(struct device *parent, struct device *self,
void *aux)
{
struct cardbus_attach_args *ca = aux;
diff --git a/sys/dev/cardbus/if_ath_cardbus.c b/sys/dev/cardbus/if_ath_cardbus.c
index 1f56eecc109..a0b2b6c8544 100644
--- a/sys/dev/cardbus/if_ath_cardbus.c
+++ b/sys/dev/cardbus/if_ath_cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ath_cardbus.c,v 1.17 2006/10/12 01:30:55 christos Exp $ */
+/* $NetBSD: if_ath_cardbus.c,v 1.18 2006/11/16 01:32:48 christos Exp $ */
/*
* Copyright (c) 2003
* Ichiro FUKUHARA <ichiro@ichiro.org>.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ath_cardbus.c,v 1.17 2006/10/12 01:30:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ath_cardbus.c,v 1.18 2006/11/16 01:32:48 christos Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -125,7 +125,7 @@ void ath_cardbus_disable(struct ath_softc *);
void ath_cardbus_power(struct ath_softc *, int);
int
-ath_cardbus_match(struct device *parent __unused, struct cfdata *match __unused,
+ath_cardbus_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct cardbus_attach_args *ca = aux;
@@ -141,7 +141,7 @@ ath_cardbus_match(struct device *parent __unused, struct cfdata *match __unused,
}
void
-ath_cardbus_attach(struct device *parent __unused, struct device *self,
+ath_cardbus_attach(struct device *parent, struct device *self,
void *aux)
{
struct ath_cardbus_softc *csc = device_private(self);
@@ -213,7 +213,7 @@ ath_cardbus_attach(struct device *parent __unused, struct device *self,
}
int
-ath_cardbus_detach(struct device *self, int flags __unused)
+ath_cardbus_detach(struct device *self, int flags)
{
struct ath_cardbus_softc *csc = device_private(self);
struct ath_softc *sc = &csc->sc_ath;
diff --git a/sys/dev/cardbus/if_atw_cardbus.c b/sys/dev/cardbus/if_atw_cardbus.c
index fca3032478e..3be1bd1856c 100644
--- a/sys/dev/cardbus/if_atw_cardbus.c
+++ b/sys/dev/cardbus/if_atw_cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_atw_cardbus.c,v 1.16 2006/10/12 01:30:55 christos Exp $ */
+/* $NetBSD: if_atw_cardbus.c,v 1.17 2006/11/16 01:32:48 christos Exp $ */
/*-
* Copyright (c) 1999, 2000, 2003 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_atw_cardbus.c,v 1.16 2006/10/12 01:30:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_atw_cardbus.c,v 1.17 2006/11/16 01:32:48 christos Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -163,7 +163,7 @@ atw_cardbus_lookup(const struct cardbus_attach_args *ca)
}
int
-atw_cardbus_match(struct device *parent __unused, struct cfdata *match __unused,
+atw_cardbus_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct cardbus_attach_args *ca = aux;
@@ -175,7 +175,7 @@ atw_cardbus_match(struct device *parent __unused, struct cfdata *match __unused,
}
void
-atw_cardbus_attach(struct device *parent __unused, struct device *self,
+atw_cardbus_attach(struct device *parent, struct device *self,
void *aux)
{
struct atw_cardbus_softc *csc = device_private(self);
@@ -296,7 +296,7 @@ atw_cardbus_intr_ack(struct atw_softc *sc)
}
int
-atw_cardbus_detach(struct device *self, int flags __unused)
+atw_cardbus_detach(struct device *self, int flags)
{
struct atw_cardbus_softc *csc = device_private(self);
struct atw_softc *sc = &csc->sc_atw;
diff --git a/sys/dev/cardbus/if_ex_cardbus.c b/sys/dev/cardbus/if_ex_cardbus.c
index 6fffae5aefe..5e59c22389a 100644
--- a/sys/dev/cardbus/if_ex_cardbus.c
+++ b/sys/dev/cardbus/if_ex_cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ex_cardbus.c,v 1.38 2006/10/12 01:30:55 christos Exp $ */
+/* $NetBSD: if_ex_cardbus.c,v 1.39 2006/11/16 01:32:48 christos Exp $ */
/*
* CardBus specific routines for 3Com 3C575-family CardBus ethernet adapter
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ex_cardbus.c,v 1.38 2006/10/12 01:30:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ex_cardbus.c,v 1.39 2006/11/16 01:32:48 christos Exp $");
/* #define EX_DEBUG 4 */ /* define to report information for debugging */
@@ -206,7 +206,7 @@ ex_cardbus_lookup(ca)
}
int
-ex_cardbus_match(struct device *parent __unused, struct cfdata *cf __unused,
+ex_cardbus_match(struct device *parent, struct cfdata *cf,
void *aux)
{
struct cardbus_attach_args *ca = aux;
@@ -218,7 +218,7 @@ ex_cardbus_match(struct device *parent __unused, struct cfdata *cf __unused,
}
void
-ex_cardbus_attach(struct device *parent __unused, struct device *self,
+ex_cardbus_attach(struct device *parent, struct device *self,
void *aux)
{
struct ex_cardbus_softc *csc = device_private(self);
@@ -318,7 +318,7 @@ ex_cardbus_intr_ack(sc)
}
int
-ex_cardbus_detach(struct device *self, int arg __unused)
+ex_cardbus_detach(struct device *self, int arg)
{
struct ex_cardbus_softc *csc = device_private(self);
struct ex_softc *sc = &csc->sc_softc;
diff --git a/sys/dev/cardbus/if_fxp_cardbus.c b/sys/dev/cardbus/if_fxp_cardbus.c
index 42df95c3195..24a741dc497 100644
--- a/sys/dev/cardbus/if_fxp_cardbus.c
+++ b/sys/dev/cardbus/if_fxp_cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fxp_cardbus.c,v 1.25 2006/10/12 01:30:55 christos Exp $ */
+/* $NetBSD: if_fxp_cardbus.c,v 1.26 2006/11/16 01:32:48 christos Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fxp_cardbus.c,v 1.25 2006/10/12 01:30:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fxp_cardbus.c,v 1.26 2006/11/16 01:32:48 christos Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -118,7 +118,7 @@ CFATTACH_DECL(fxp_cardbus, sizeof(struct fxp_cardbus_softc),
#endif
static int
-fxp_cardbus_match(struct device *parent __unused, struct cfdata *match __unused,
+fxp_cardbus_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct cardbus_attach_args *ca = aux;
@@ -131,7 +131,7 @@ fxp_cardbus_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-fxp_cardbus_attach(struct device *parent __unused, struct device *self,
+fxp_cardbus_attach(struct device *parent, struct device *self,
void *aux)
{
static const char thisfunc[] = "fxp_cardbus_attach";
@@ -261,7 +261,7 @@ fxp_cardbus_disable(struct fxp_softc * sc)
}
static int
-fxp_cardbus_detach(struct device *self, int flags __unused)
+fxp_cardbus_detach(struct device *self, int flags)
{
struct fxp_softc *sc = device_private(self);
struct fxp_cardbus_softc *csc = device_private(self);
diff --git a/sys/dev/cardbus/if_ral_cardbus.c b/sys/dev/cardbus/if_ral_cardbus.c
index 75f5b60858f..b47807daae9 100644
--- a/sys/dev/cardbus/if_ral_cardbus.c
+++ b/sys/dev/cardbus/if_ral_cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ral_cardbus.c,v 1.7 2006/10/12 01:30:55 christos Exp $ */
+/* $NetBSD: if_ral_cardbus.c,v 1.8 2006/11/16 01:32:48 christos Exp $ */
/* $OpenBSD: if_ral_cardbus.c,v 1.6 2006/01/09 20:03:31 damien Exp $ */
/*-
@@ -22,7 +22,7 @@
* CardBus front-end for the Ralink RT2560/RT2561/RT2561S/RT2661 driver.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ral_cardbus.c,v 1.7 2006/10/12 01:30:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ral_cardbus.c,v 1.8 2006/11/16 01:32:48 christos Exp $");
#include "bpfilter.h"
@@ -105,8 +105,8 @@ void ral_cardbus_power(struct rt2560_softc *, int);
void ral_cardbus_setup(struct ral_cardbus_softc *);
int
-ral_cardbus_match(struct device *parent __unused,
- struct cfdata *cfdata __unused, void *aux)
+ral_cardbus_match(struct device *parent,
+ struct cfdata *cfdata, void *aux)
{
struct cardbus_attach_args *ca = aux;
@@ -126,7 +126,7 @@ ral_cardbus_match(struct device *parent __unused,
}
void
-ral_cardbus_attach(struct device *parent __unused, struct device *self,
+ral_cardbus_attach(struct device *parent, struct device *self,
void *aux)
{
struct ral_cardbus_softc *csc = (struct ral_cardbus_softc *)self;
@@ -177,7 +177,7 @@ ral_cardbus_attach(struct device *parent __unused, struct device *self,
}
int
-ral_cardbus_detach(struct device *self, int flags __unused)
+ral_cardbus_detach(struct device *self, int flags)
{
struct ral_cardbus_softc *csc = (struct ral_cardbus_softc *)self;
struct rt2560_softc *sc = &csc->sc_sc;
diff --git a/sys/dev/cardbus/if_re_cardbus.c b/sys/dev/cardbus/if_re_cardbus.c
index b5daf64e8af..eb3e7972fd5 100644
--- a/sys/dev/cardbus/if_re_cardbus.c
+++ b/sys/dev/cardbus/if_re_cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_re_cardbus.c,v 1.10 2006/10/27 18:47:07 dogcow Exp $ */
+/* $NetBSD: if_re_cardbus.c,v 1.11 2006/11/16 01:32:48 christos Exp $ */
/*
* Copyright (c) 2004 Jonathan Stone
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_re_cardbus.c,v 1.10 2006/10/27 18:47:07 dogcow Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_re_cardbus.c,v 1.11 2006/11/16 01:32:48 christos Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -150,8 +150,8 @@ re_cardbus_lookup(const struct cardbus_attach_args *ca)
}
int
-re_cardbus_match(struct device *parent __unused,
- struct cfdata *match __unused, void *aux)
+re_cardbus_match(struct device *parent,
+ struct cfdata *match, void *aux)
{
struct cardbus_attach_args *ca = aux;
@@ -163,7 +163,7 @@ re_cardbus_match(struct device *parent __unused,
void
-re_cardbus_attach(struct device *parent __unused, struct device *self,
+re_cardbus_attach(struct device *parent, struct device *self,
void *aux)
{
struct re_cardbus_softc *csc = device_private(self);
@@ -243,7 +243,7 @@ re_cardbus_attach(struct device *parent __unused, struct device *self,
}
int
-re_cardbus_detach(struct device *self, int flags __unused)
+re_cardbus_detach(struct device *self, int flags)
{
struct re_cardbus_softc *csc = device_private(self);
struct rtk_softc *sc = &csc->sc_rtk;
diff --git a/sys/dev/cardbus/if_rtk_cardbus.c b/sys/dev/cardbus/if_rtk_cardbus.c
index 4fe068b66f2..e25488264c7 100644
--- a/sys/dev/cardbus/if_rtk_cardbus.c
+++ b/sys/dev/cardbus/if_rtk_cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_rtk_cardbus.c,v 1.30 2006/10/27 18:47:07 dogcow Exp $ */
+/* $NetBSD: if_rtk_cardbus.c,v 1.31 2006/11/16 01:32:48 christos Exp $ */
/*
* Copyright (c) 2000 Masanori Kanaoka
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rtk_cardbus.c,v 1.30 2006/10/27 18:47:07 dogcow Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rtk_cardbus.c,v 1.31 2006/11/16 01:32:48 christos Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -166,7 +166,7 @@ rtk_cardbus_lookup(ca)
}
int
-rtk_cardbus_match(struct device *parent __unused, struct cfdata *match __unused,
+rtk_cardbus_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct cardbus_attach_args *ca = aux;
@@ -179,7 +179,7 @@ rtk_cardbus_match(struct device *parent __unused, struct cfdata *match __unused,
void
-rtk_cardbus_attach(struct device *parent __unused, struct device *self,
+rtk_cardbus_attach(struct device *parent, struct device *self,
void *aux)
{
struct rtk_cardbus_softc *csc = device_private(self);
@@ -258,7 +258,7 @@ rtk_cardbus_attach(struct device *parent __unused, struct device *self,
}
int
-rtk_cardbus_detach(struct device *self, int flags __unused)
+rtk_cardbus_detach(struct device *self, int flags)
{
struct rtk_cardbus_softc *csc = device_private(self);
struct rtk_softc *sc = &csc->sc_rtk;
diff --git a/sys/dev/cardbus/if_rtw_cardbus.c b/sys/dev/cardbus/if_rtw_cardbus.c
index 160ee5c106c..291c28eeaab 100644
--- a/sys/dev/cardbus/if_rtw_cardbus.c
+++ b/sys/dev/cardbus/if_rtw_cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_rtw_cardbus.c,v 1.14 2006/10/12 01:30:55 christos Exp $ */
+/* $NetBSD: if_rtw_cardbus.c,v 1.15 2006/11/16 01:32:48 christos Exp $ */
/*-
* Copyright (c) 2004, 2005 David Young. All rights reserved.
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rtw_cardbus.c,v 1.14 2006/10/12 01:30:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rtw_cardbus.c,v 1.15 2006/11/16 01:32:48 christos Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -199,7 +199,7 @@ rtw_cardbus_lookup(const struct cardbus_attach_args *ca)
}
int
-rtw_cardbus_match(struct device *parent __unused, struct cfdata *match __unused,
+rtw_cardbus_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct cardbus_attach_args *ca = aux;
@@ -231,7 +231,7 @@ rtw_cardbus_funcregen(struct rtw_regs *regs, int enable)
}
void
-rtw_cardbus_attach(struct device *parent __unused, struct device *self,
+rtw_cardbus_attach(struct device *parent, struct device *self,
void *aux)
{
struct rtw_cardbus_softc *csc = device_private(self);
@@ -338,7 +338,7 @@ rtw_cardbus_attach(struct device *parent __unused, struct device *self,
}
int
-rtw_cardbus_detach(struct device *self, int flags __unused)
+rtw_cardbus_detach(struct device *self, int flags)
{
struct rtw_cardbus_softc *csc = device_private(self);
struct rtw_softc *sc = &csc->sc_rtw;
diff --git a/sys/dev/cardbus/if_tlp_cardbus.c b/sys/dev/cardbus/if_tlp_cardbus.c
index 9fa6df48418..c14c5030a38 100644
--- a/sys/dev/cardbus/if_tlp_cardbus.c
+++ b/sys/dev/cardbus/if_tlp_cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tlp_cardbus.c,v 1.52 2006/10/12 01:30:57 christos Exp $ */
+/* $NetBSD: if_tlp_cardbus.c,v 1.53 2006/11/16 01:32:48 christos Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tlp_cardbus.c,v 1.52 2006/10/12 01:30:57 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tlp_cardbus.c,v 1.53 2006/11/16 01:32:48 christos Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -229,7 +229,7 @@ tlp_cardbus_get_quirks(csc, enaddr, tpq)
}
int
-tlp_cardbus_match(struct device *parent __unused, struct cfdata *match __unused,
+tlp_cardbus_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct cardbus_attach_args *ca = aux;
@@ -241,7 +241,7 @@ tlp_cardbus_match(struct device *parent __unused, struct cfdata *match __unused,
}
void
-tlp_cardbus_attach(struct device *parent __unused, struct device *self,
+tlp_cardbus_attach(struct device *parent, struct device *self,
void *aux)
{
struct tulip_cardbus_softc *csc = device_private(self);
@@ -479,7 +479,7 @@ tlp_cardbus_attach(struct device *parent __unused, struct device *self,
}
int
-tlp_cardbus_detach(struct device *self, int flags __unused)
+tlp_cardbus_detach(struct device *self, int flags)
{
struct tulip_cardbus_softc *csc = device_private(self);
struct tulip_softc *sc = &csc->sc_tulip;
@@ -657,7 +657,7 @@ tlp_cardbus_x3201_reset(sc)
void
tlp_cardbus_lxt_quirks(struct tulip_cardbus_softc *csc,
- const u_int8_t *enaddr __unused)
+ const u_int8_t *enaddr)
{
struct tulip_softc *sc = &csc->sc_tulip;
diff --git a/sys/dev/cardbus/njata_cardbus.c b/sys/dev/cardbus/njata_cardbus.c
index 826b3043aef..64cf7fc86eb 100644
--- a/sys/dev/cardbus/njata_cardbus.c
+++ b/sys/dev/cardbus/njata_cardbus.c
@@ -1,4 +1,4 @@
-/* $Id: njata_cardbus.c,v 1.2 2006/10/12 01:30:57 christos Exp $ */
+/* $Id: njata_cardbus.c,v 1.3 2006/11/16 01:32:48 christos Exp $ */
/*
* Copyright (c) 2006 ITOH Yasufumi <itohy@NetBSD.org>.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: njata_cardbus.c,v 1.2 2006/10/12 01:30:57 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: njata_cardbus.c,v 1.3 2006/11/16 01:32:48 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -111,8 +111,8 @@ njata_cardbus_lookup(ca)
}
static int
-njata_cardbus_match(struct device *parent __unused,
- struct cfdata *match __unused, void *aux)
+njata_cardbus_match(struct device *parent,
+ struct cfdata *match, void *aux)
{
struct cardbus_attach_args *ca = aux;
@@ -123,7 +123,7 @@ njata_cardbus_match(struct device *parent __unused,
}
static void
-njata_cardbus_attach(struct device *parent __unused, struct device *self,
+njata_cardbus_attach(struct device *parent, struct device *self,
void *aux)
{
struct cardbus_attach_args *ca = aux;
diff --git a/sys/dev/cardbus/njs_cardbus.c b/sys/dev/cardbus/njs_cardbus.c
index 0bf004ff0c4..7039d7bad0e 100644
--- a/sys/dev/cardbus/njs_cardbus.c
+++ b/sys/dev/cardbus/njs_cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: njs_cardbus.c,v 1.4 2006/10/12 01:30:57 christos Exp $ */
+/* $NetBSD: njs_cardbus.c,v 1.5 2006/11/16 01:32:48 christos Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: njs_cardbus.c,v 1.4 2006/10/12 01:30:57 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: njs_cardbus.c,v 1.5 2006/11/16 01:32:48 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -114,7 +114,7 @@ njs_cardbus_lookup(const struct cardbus_attach_args *ca)
}
static int
-njs_cardbus_match(struct device *parent __unused, struct cfdata *match __unused,
+njs_cardbus_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct cardbus_attach_args *ca = aux;
@@ -126,7 +126,7 @@ njs_cardbus_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-njs_cardbus_attach(struct device *parent __unused, struct device *self,
+njs_cardbus_attach(struct device *parent, struct device *self,
void *aux)
{
struct cardbus_attach_args *ca = aux;
diff --git a/sys/dev/cardbus/ohci_cardbus.c b/sys/dev/cardbus/ohci_cardbus.c
index 6e9db1c2b30..035818a0561 100644
--- a/sys/dev/cardbus/ohci_cardbus.c
+++ b/sys/dev/cardbus/ohci_cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci_cardbus.c,v 1.22 2006/10/12 01:30:57 christos Exp $ */
+/* $NetBSD: ohci_cardbus.c,v 1.23 2006/11/16 01:32:48 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci_cardbus.c,v 1.22 2006/10/12 01:30:57 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci_cardbus.c,v 1.23 2006/11/16 01:32:48 christos Exp $");
#include "ehci_cardbus.h"
@@ -98,8 +98,8 @@ CFATTACH_DECL(ohci_cardbus, sizeof(struct ohci_cardbus_softc),
#define cardbus_devinfo pci_devinfo
int
-ohci_cardbus_match(struct device *parent __unused,
- struct cfdata *match __unused, void *aux)
+ohci_cardbus_match(struct device *parent,
+ struct cfdata *match, void *aux)
{
struct cardbus_attach_args *ca = (struct cardbus_attach_args *)aux;
@@ -112,7 +112,7 @@ ohci_cardbus_match(struct device *parent __unused,
}
void
-ohci_cardbus_attach(struct device *parent __unused, struct device *self,
+ohci_cardbus_attach(struct device *parent, struct device *self,
void *aux)
{
struct ohci_cardbus_softc *sc = (struct ohci_cardbus_softc *)self;
diff --git a/sys/dev/cardbus/uhci_cardbus.c b/sys/dev/cardbus/uhci_cardbus.c
index a0417ff4ba4..3c87faceee1 100644
--- a/sys/dev/cardbus/uhci_cardbus.c
+++ b/sys/dev/cardbus/uhci_cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uhci_cardbus.c,v 1.4 2006/10/12 01:30:57 christos Exp $ */
+/* $NetBSD: uhci_cardbus.c,v 1.5 2006/11/16 01:32:48 christos Exp $ */
/*
* Copyright (c) 1998-2005 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhci_cardbus.c,v 1.4 2006/10/12 01:30:57 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci_cardbus.c,v 1.5 2006/11/16 01:32:48 christos Exp $");
#include "ehci_cardbus.h"
@@ -87,8 +87,8 @@ CFATTACH_DECL(uhci_cardbus, sizeof(struct uhci_cardbus_softc),
#define cardbus_devinfo pci_devinfo
static int
-uhci_cardbus_match(struct device *parent __unused,
- struct cfdata *match __unused, void *aux)
+uhci_cardbus_match(struct device *parent,
+ struct cfdata *match, void *aux)
{
struct cardbus_attach_args *ca = (struct cardbus_attach_args *)aux;
@@ -101,7 +101,7 @@ uhci_cardbus_match(struct device *parent __unused,
}
static void
-uhci_cardbus_attach(struct device *parent __unused, struct device *self,
+uhci_cardbus_attach(struct device *parent, struct device *self,
void *aux)
{
struct uhci_cardbus_softc *sc = device_private(self);
diff --git a/sys/dev/ccd.c b/sys/dev/ccd.c
index 590b8818ffa..ffad394e8ae 100644
--- a/sys/dev/ccd.c
+++ b/sys/dev/ccd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ccd.c,v 1.115 2006/10/12 01:30:50 christos Exp $ */
+/* $NetBSD: ccd.c,v 1.116 2006/11/16 01:32:44 christos Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999 The NetBSD Foundation, Inc.
@@ -125,7 +125,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.115 2006/10/12 01:30:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.116 2006/11/16 01:32:44 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -548,7 +548,7 @@ ccdinterleave(struct ccd_softc *cs)
/* ARGSUSED */
static int
-ccdopen(dev_t dev, int flags __unused, int fmt, struct lwp *l __unused)
+ccdopen(dev_t dev, int flags, int fmt, struct lwp *l)
{
int unit = ccdunit(dev);
struct ccd_softc *cs;
@@ -611,7 +611,7 @@ ccdopen(dev_t dev, int flags __unused, int fmt, struct lwp *l __unused)
/* ARGSUSED */
static int
-ccdclose(dev_t dev, int flags __unused, int fmt, struct lwp *l __unused)
+ccdclose(dev_t dev, int flags, int fmt, struct lwp *l)
{
int unit = ccdunit(dev);
struct ccd_softc *cs;
@@ -946,7 +946,7 @@ ccdiodone(struct buf *vbp)
/* ARGSUSED */
static int
-ccdread(dev_t dev, struct uio *uio, int flags __unused)
+ccdread(dev_t dev, struct uio *uio, int flags)
{
int unit = ccdunit(dev);
struct ccd_softc *cs;
@@ -967,7 +967,7 @@ ccdread(dev_t dev, struct uio *uio, int flags __unused)
/* ARGSUSED */
static int
-ccdwrite(dev_t dev, struct uio *uio, int flags __unused)
+ccdwrite(dev_t dev, struct uio *uio, int flags)
{
int unit = ccdunit(dev);
struct ccd_softc *cs;
@@ -1348,8 +1348,8 @@ ccdsize(dev_t dev)
}
static int
-ccddump(dev_t dev __unused, daddr_t blkno __unused, caddr_t va __unused,
- size_t size __unused)
+ccddump(dev_t dev, daddr_t blkno, caddr_t va,
+ size_t size)
{
/* Not implemented. */
diff --git a/sys/dev/cgd.c b/sys/dev/cgd.c
index 95d24c74b11..b5b9527639f 100644
--- a/sys/dev/cgd.c
+++ b/sys/dev/cgd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cgd.c,v 1.39 2006/10/12 06:57:27 xtraeme Exp $ */
+/* $NetBSD: cgd.c,v 1.40 2006/11/16 01:32:44 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.39 2006/10/12 06:57:27 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.40 2006/11/16 01:32:44 christos Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -399,7 +399,7 @@ cgdiodone(struct buf *nbp)
/* XXX: we should probably put these into dksubr.c, mostly */
static int
-cgdread(dev_t dev, struct uio *uio, int flags __unused)
+cgdread(dev_t dev, struct uio *uio, int flags)
{
struct cgd_softc *cs;
struct dk_softc *dksc;
@@ -414,7 +414,7 @@ cgdread(dev_t dev, struct uio *uio, int flags __unused)
/* XXX: we should probably put these into dksubr.c, mostly */
static int
-cgdwrite(dev_t dev, struct uio *uio, int flags __unused)
+cgdwrite(dev_t dev, struct uio *uio, int flags)
{
struct cgd_softc *cs;
struct dk_softc *dksc;
@@ -580,7 +580,7 @@ bail:
/* ARGSUSED */
static int
-cgd_ioctl_clr(struct cgd_softc *cs, void *data __unused, struct lwp *l)
+cgd_ioctl_clr(struct cgd_softc *cs, void *data, struct lwp *l)
{
int s;
diff --git a/sys/dev/clockctl.c b/sys/dev/clockctl.c
index 6c20162851e..3f220c944a6 100644
--- a/sys/dev/clockctl.c
+++ b/sys/dev/clockctl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: clockctl.c,v 1.19 2006/10/12 01:30:50 christos Exp $ */
+/* $NetBSD: clockctl.c,v 1.20 2006/11/16 01:32:44 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clockctl.c,v 1.19 2006/10/12 01:30:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clockctl.c,v 1.20 2006/11/16 01:32:44 christos Exp $");
#include "opt_ntp.h"
@@ -62,7 +62,7 @@ const struct cdevsw clockctl_cdevsw = {
/*ARGSUSED*/
void
-clockctlattach(int num __unused)
+clockctlattach(int num)
{
/* Nothing to set up before open is called */
return;
@@ -70,10 +70,10 @@ clockctlattach(int num __unused)
int
clockctlioctl(
- dev_t dev __unused,
+ dev_t dev,
u_long cmd,
caddr_t data,
- int flags __unused,
+ int flags,
struct lwp *l)
{
int error = 0;
diff --git a/sys/dev/cons.c b/sys/dev/cons.c
index 381189f8f42..1e440494f51 100644
--- a/sys/dev/cons.c
+++ b/sys/dev/cons.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cons.c,v 1.60 2006/10/12 01:30:50 christos Exp $ */
+/* $NetBSD: cons.c,v 1.61 2006/11/16 01:32:45 christos Exp $ */
/*
* Copyright (c) 1990, 1993
@@ -78,7 +78,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cons.c,v 1.60 2006/10/12 01:30:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cons.c,v 1.61 2006/11/16 01:32:45 christos Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -377,7 +377,7 @@ cnpollc(int on)
}
void
-nullcnpollc(dev_t dev __unused, int on __unused)
+nullcnpollc(dev_t dev, int on)
{
}
diff --git a/sys/dev/dksubr.c b/sys/dev/dksubr.c
index fc9e949d4e9..dc2e8d4a778 100644
--- a/sys/dev/dksubr.c
+++ b/sys/dev/dksubr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dksubr.c,v 1.26 2006/10/12 01:30:50 christos Exp $ */
+/* $NetBSD: dksubr.c,v 1.27 2006/11/16 01:32:45 christos Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999, 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.26 2006/10/12 01:30:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.27 2006/11/16 01:32:45 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -89,7 +89,7 @@ dk_sc_init(struct dk_softc *dksc, void *osc, char *xname)
/* ARGSUSED */
int
dk_open(struct dk_intf *di, struct dk_softc *dksc, dev_t dev,
- int flags __unused, int fmt, struct lwp *l __unused)
+ int flags, int fmt, struct lwp *l)
{
struct disklabel *lp = dksc->sc_dkdev.dk_label;
int part = DISKPART(dev);
@@ -155,8 +155,8 @@ done:
/* ARGSUSED */
int
-dk_close(struct dk_intf *di __unused, struct dk_softc *dksc, dev_t dev,
- int flags __unused, int fmt, struct lwp *l __unused)
+dk_close(struct dk_intf *di, struct dk_softc *dksc, dev_t dev,
+ int flags, int fmt, struct lwp *l)
{
int part = DISKPART(dev);
int pmask = 1 << part;
@@ -515,8 +515,8 @@ static volatile int dk_dumping = 0;
/* ARGSUSED */
int
-dk_dump(struct dk_intf *di __unused, struct dk_softc *dksc, dev_t dev __unused,
- daddr_t blkno __unused, caddr_t va __unused, size_t size __unused)
+dk_dump(struct dk_intf *di, struct dk_softc *dksc, dev_t dev,
+ daddr_t blkno, caddr_t va, size_t size)
{
/*
@@ -613,7 +613,7 @@ dk_getdisklabel(struct dk_intf *di, struct dk_softc *dksc, dev_t dev)
/* ARGSUSED */
static void
-dk_makedisklabel(struct dk_intf *di __unused, struct dk_softc *dksc)
+dk_makedisklabel(struct dk_intf *di, struct dk_softc *dksc)
{
struct disklabel *lp = dksc->sc_dkdev.dk_label;
diff --git a/sys/dev/dkwedge/dk.c b/sys/dev/dkwedge/dk.c
index ac8bce7f0fc..45de0201cd7 100644
--- a/sys/dev/dkwedge/dk.c
+++ b/sys/dev/dkwedge/dk.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dk.c,v 1.19 2006/10/12 01:30:57 christos Exp $ */
+/* $NetBSD: dk.c,v 1.20 2006/11/16 01:32:50 christos Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.19 2006/10/12 01:30:57 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.20 2006/11/16 01:32:50 christos Exp $");
#include "opt_dkwedge.h"
@@ -135,8 +135,8 @@ static struct lock dkwedge_discovery_methods_lock =
* Autoconfiguration match function for pseudo-device glue.
*/
static int
-dkwedge_match(struct device *parent __unused, struct cfdata *match __unused,
- void *aux __unused)
+dkwedge_match(struct device *parent, struct cfdata *match,
+ void *aux)
{
/* Pseudo-device; always present. */
@@ -149,8 +149,8 @@ dkwedge_match(struct device *parent __unused, struct cfdata *match __unused,
* Autoconfiguration attach function for pseudo-device glue.
*/
static void
-dkwedge_attach(struct device *parent __unused, struct device *self __unused,
- void *aux __unused)
+dkwedge_attach(struct device *parent, struct device *self,
+ void *aux)
{
/* Nothing to do. */
@@ -162,7 +162,7 @@ dkwedge_attach(struct device *parent __unused, struct device *self __unused,
* Autoconfiguration detach function for pseudo-device glue.
*/
static int
-dkwedge_detach(struct device *self __unused, int flags __unused)
+dkwedge_detach(struct device *self, int flags)
{
/* Always succeeds. */
@@ -839,7 +839,7 @@ dkwedge_discover(struct disk *pdk)
* partition discovery.
*/
int
-dkwedge_read(struct disk *pdk __unused, struct vnode *vp, daddr_t blkno,
+dkwedge_read(struct disk *pdk, struct vnode *vp, daddr_t blkno,
void *tbuf, size_t len)
{
struct buf b;
@@ -882,7 +882,7 @@ dkwedge_lookup(dev_t dev)
* Open a wedge.
*/
static int
-dkopen(dev_t dev, int flags __unused, int fmt, struct lwp *l __unused)
+dkopen(dev_t dev, int flags, int fmt, struct lwp *l)
{
struct dkwedge_softc *sc = dkwedge_lookup(dev);
struct vnode *vp;
@@ -943,7 +943,7 @@ dkopen(dev_t dev, int flags __unused, int fmt, struct lwp *l __unused)
* Close a wedge.
*/
static int
-dkclose(dev_t dev, int flags __unused, int fmt, struct lwp *l)
+dkclose(dev_t dev, int flags, int fmt, struct lwp *l)
{
struct dkwedge_softc *sc = dkwedge_lookup(dev);
int error = 0;
@@ -1133,7 +1133,7 @@ dkrestart(void *v)
* Read from a wedge.
*/
static int
-dkread(dev_t dev, struct uio *uio, int flags __unused)
+dkread(dev_t dev, struct uio *uio, int flags)
{
struct dkwedge_softc *sc = dkwedge_lookup(dev);
@@ -1150,7 +1150,7 @@ dkread(dev_t dev, struct uio *uio, int flags __unused)
* Write to a wedge.
*/
static int
-dkwrite(dev_t dev, struct uio *uio, int flags __unused)
+dkwrite(dev_t dev, struct uio *uio, int flags)
{
struct dkwedge_softc *sc = dkwedge_lookup(dev);
@@ -1253,8 +1253,8 @@ dksize(dev_t dev)
* Perform a crash dump to a wedge.
*/
static int
-dkdump(dev_t dev __unused, daddr_t blkno __unused, caddr_t va __unused,
- size_t size __unused)
+dkdump(dev_t dev, daddr_t blkno, caddr_t va,
+ size_t size)
{
/* XXX */
diff --git a/sys/dev/dkwedge/dkwedge_bsdlabel.c b/sys/dev/dkwedge/dkwedge_bsdlabel.c
index 31887dcda7a..c05e9a8040f 100644
--- a/sys/dev/dkwedge/dkwedge_bsdlabel.c
+++ b/sys/dev/dkwedge/dkwedge_bsdlabel.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dkwedge_bsdlabel.c,v 1.8 2006/10/12 01:30:57 christos Exp $ */
+/* $NetBSD: dkwedge_bsdlabel.c,v 1.9 2006/11/16 01:32:50 christos Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -86,7 +86,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dkwedge_bsdlabel.c,v 1.8 2006/10/12 01:30:57 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dkwedge_bsdlabel.c,v 1.9 2006/11/16 01:32:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -418,7 +418,7 @@ scan_mbr(mbr_args_t *a, int (*actn)(mbr_args_t *, struct mbr_partition *,
}
static int
-look_netbsd_part(mbr_args_t *a, struct mbr_partition *dp, int slot __unused,
+look_netbsd_part(mbr_args_t *a, struct mbr_partition *dp, int slot,
u_int ext_base)
{
int ptn_base = ext_base + le32toh(dp->mbrp_start);
diff --git a/sys/dev/eisa/ahb.c b/sys/dev/eisa/ahb.c
index 5d267c3af9a..56138a97722 100644
--- a/sys/dev/eisa/ahb.c
+++ b/sys/dev/eisa/ahb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ahb.c,v 1.46 2006/10/12 01:30:57 christos Exp $ */
+/* $NetBSD: ahb.c,v 1.47 2006/11/16 01:32:50 christos Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahb.c,v 1.46 2006/10/12 01:30:57 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahb.c,v 1.47 2006/11/16 01:32:50 christos Exp $");
#include "opt_ddb.h"
@@ -158,7 +158,7 @@ CFATTACH_DECL(ahb, sizeof(struct ahb_softc),
* the actual probe routine to check it out.
*/
static int
-ahbmatch(struct device *parent __unused, struct cfdata *match __unused,
+ahbmatch(struct device *parent, struct cfdata *match,
void *aux)
{
struct eisa_attach_args *ea = aux;
@@ -189,7 +189,7 @@ ahbmatch(struct device *parent __unused, struct cfdata *match __unused,
* Attach all the sub-devices we can find
*/
static void
-ahbattach(struct device *parent __unused, struct device *self, void *aux)
+ahbattach(struct device *parent, struct device *self, void *aux)
{
struct eisa_attach_args *ea = aux;
struct ahb_softc *sc = device_private(self);
@@ -421,7 +421,7 @@ ahbintr(void *arg)
}
static inline void
-ahb_reset_ecb(struct ahb_softc *sc __unused, struct ahb_ecb *ecb)
+ahb_reset_ecb(struct ahb_softc *sc, struct ahb_ecb *ecb)
{
ecb->flags = 0;
diff --git a/sys/dev/eisa/ahc_eisa.c b/sys/dev/eisa/ahc_eisa.c
index 0c0dbad8a10..ba4e0f35272 100644
--- a/sys/dev/eisa/ahc_eisa.c
+++ b/sys/dev/eisa/ahc_eisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ahc_eisa.c,v 1.32 2006/10/12 01:30:57 christos Exp $ */
+/* $NetBSD: ahc_eisa.c,v 1.33 2006/11/16 01:32:50 christos Exp $ */
/*
* Product specific probe and attach routines for:
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahc_eisa.c,v 1.32 2006/10/12 01:30:57 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahc_eisa.c,v 1.33 2006/11/16 01:32:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -69,7 +69,7 @@ CFATTACH_DECL(ahc_eisa, sizeof(struct ahc_softc),
* the actual probe routine to check it out.
*/
static int
-ahc_eisa_match(struct device *parent __unused, struct cfdata *match __unused,
+ahc_eisa_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct eisa_attach_args *ea = aux;
@@ -94,7 +94,7 @@ ahc_eisa_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-ahc_eisa_attach(struct device *parent __unused, struct device *self, void *aux)
+ahc_eisa_attach(struct device *parent, struct device *self, void *aux)
{
struct ahc_softc *ahc = device_private(self);
struct eisa_attach_args *ea = aux;
diff --git a/sys/dev/eisa/bha_eisa.c b/sys/dev/eisa/bha_eisa.c
index 7a66cc29272..bfbafe5364d 100644
--- a/sys/dev/eisa/bha_eisa.c
+++ b/sys/dev/eisa/bha_eisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bha_eisa.c,v 1.27 2006/10/12 01:30:57 christos Exp $ */
+/* $NetBSD: bha_eisa.c,v 1.28 2006/11/16 01:32:50 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bha_eisa.c,v 1.27 2006/10/12 01:30:57 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bha_eisa.c,v 1.28 2006/11/16 01:32:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -106,7 +106,7 @@ bha_eisa_address(bus_space_tag_t iot, bus_space_handle_t ioh, int *portp)
* the actual probe routine to check it out.
*/
static int
-bha_eisa_match(struct device *parent __unused, struct cfdata *match __unused,
+bha_eisa_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct eisa_attach_args *ea = aux;
@@ -143,7 +143,7 @@ bha_eisa_match(struct device *parent __unused, struct cfdata *match __unused,
* Attach all the sub-devices we can find
*/
static void
-bha_eisa_attach(struct device *parent __unused, struct device *self, void *aux)
+bha_eisa_attach(struct device *parent, struct device *self, void *aux)
{
struct eisa_attach_args *ea = aux;
struct bha_softc *sc = device_private(self);
diff --git a/sys/dev/eisa/cac_eisa.c b/sys/dev/eisa/cac_eisa.c
index 3d10369863f..d9b3966cb0b 100644
--- a/sys/dev/eisa/cac_eisa.c
+++ b/sys/dev/eisa/cac_eisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cac_eisa.c,v 1.14 2006/10/12 01:30:57 christos Exp $ */
+/* $NetBSD: cac_eisa.c,v 1.15 2006/11/16 01:32:50 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cac_eisa.c,v 1.14 2006/10/12 01:30:57 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cac_eisa.c,v 1.15 2006/11/16 01:32:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -120,7 +120,7 @@ static struct cac_eisa_type {
};
static int
-cac_eisa_match(struct device *parent __unused, struct cfdata *match __unused,
+cac_eisa_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct eisa_attach_args *ea;
@@ -136,7 +136,7 @@ cac_eisa_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-cac_eisa_attach(struct device *parent __unused, struct device *self, void *aux)
+cac_eisa_attach(struct device *parent, struct device *self, void *aux)
{
struct eisa_attach_args *ea;
bus_space_handle_t ioh;
diff --git a/sys/dev/eisa/dpt_eisa.c b/sys/dev/eisa/dpt_eisa.c
index 3e1f9fe4f67..6172d99f5de 100644
--- a/sys/dev/eisa/dpt_eisa.c
+++ b/sys/dev/eisa/dpt_eisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dpt_eisa.c,v 1.15 2006/10/12 01:30:57 christos Exp $ */
+/* $NetBSD: dpt_eisa.c,v 1.16 2006/11/16 01:32:50 christos Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Andrew Doran <ad@NetBSD.org>
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dpt_eisa.c,v 1.15 2006/10/12 01:30:57 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dpt_eisa.c,v 1.16 2006/11/16 01:32:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -103,7 +103,7 @@ dpt_eisa_irq(bus_space_tag_t iot, bus_space_handle_t ioh, int *irq)
}
static int
-dpt_eisa_match(struct device *parent __unused, struct cfdata *match __unused,
+dpt_eisa_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct eisa_attach_args *ea;
@@ -119,7 +119,7 @@ dpt_eisa_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-dpt_eisa_attach(struct device *parent __unused, struct device *self, void *aux)
+dpt_eisa_attach(struct device *parent, struct device *self, void *aux)
{
struct eisa_attach_args *ea;
bus_space_handle_t ioh;
diff --git a/sys/dev/eisa/eisa.c b/sys/dev/eisa/eisa.c
index 06eda0a66d3..ee90d4288fe 100644
--- a/sys/dev/eisa/eisa.c
+++ b/sys/dev/eisa/eisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: eisa.c,v 1.40 2006/10/12 01:30:57 christos Exp $ */
+/* $NetBSD: eisa.c,v 1.41 2006/11/16 01:32:50 christos Exp $ */
/*
* Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: eisa.c,v 1.40 2006/10/12 01:30:57 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eisa.c,v 1.41 2006/11/16 01:32:50 christos Exp $");
#include "opt_eisaverbose.h"
@@ -65,8 +65,8 @@ static int eisaprint(void *, const char *);
static void eisa_devinfo(const char *, char *, size_t);
static int
-eisamatch(struct device *parent __unused, struct cfdata *cf __unused,
- void *aux __unused)
+eisamatch(struct device *parent, struct cfdata *cf,
+ void *aux)
{
/* XXX check other indicators */
diff --git a/sys/dev/eisa/eisabusprint.c b/sys/dev/eisa/eisabusprint.c
index 9cf08d3a147..b8ca5d0a1ae 100644
--- a/sys/dev/eisa/eisabusprint.c
+++ b/sys/dev/eisa/eisabusprint.c
@@ -1,6 +1,6 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: eisabusprint.c,v 1.4 2006/10/12 01:30:57 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eisabusprint.c,v 1.5 2006/11/16 01:32:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -8,7 +8,7 @@ __KERNEL_RCSID(0, "$NetBSD: eisabusprint.c,v 1.4 2006/10/12 01:30:57 christos Ex
#include <dev/eisa/eisavar.h>
int
-eisabusprint(void *vea __unused, const char *pnp)
+eisabusprint(void *vea, const char *pnp)
{
if (pnp)
aprint_normal("eisa at %s", pnp);
diff --git a/sys/dev/eisa/if_ep_eisa.c b/sys/dev/eisa/if_ep_eisa.c
index 83ca4120535..7592fc00a38 100644
--- a/sys/dev/eisa/if_ep_eisa.c
+++ b/sys/dev/eisa/if_ep_eisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ep_eisa.c,v 1.34 2006/10/12 01:30:57 christos Exp $ */
+/* $NetBSD: if_ep_eisa.c,v 1.35 2006/11/16 01:32:50 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ep_eisa.c,v 1.34 2006/10/12 01:30:57 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ep_eisa.c,v 1.35 2006/11/16 01:32:50 christos Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -193,7 +193,7 @@ ep_eisa_lookup(const struct eisa_attach_args *ea)
}
static int
-ep_eisa_match(struct device *parent __unused, struct cfdata *match __unused,
+ep_eisa_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct eisa_attach_args *ea = aux;
@@ -206,7 +206,7 @@ ep_eisa_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-ep_eisa_attach(struct device *parent __unused, struct device *self, void *aux)
+ep_eisa_attach(struct device *parent, struct device *self, void *aux)
{
struct ep_softc *sc = device_private(self);
struct eisa_attach_args *ea = aux;
diff --git a/sys/dev/eisa/if_fea.c b/sys/dev/eisa/if_fea.c
index 5a4ee2dff86..9139c11f587 100644
--- a/sys/dev/eisa/if_fea.c
+++ b/sys/dev/eisa/if_fea.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fea.c,v 1.32 2006/10/12 01:30:57 christos Exp $ */
+/* $NetBSD: if_fea.c,v 1.33 2006/11/16 01:32:50 christos Exp $ */
/*-
* Copyright (c) 1995, 1996 Matt Thomas <matt@3am-software.com>
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fea.c,v 1.32 2006/10/12 01:30:57 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fea.c,v 1.33 2006/11/16 01:32:50 christos Exp $");
#include "opt_inet.h"
@@ -444,8 +444,8 @@ struct cfdriver feacd = {
#if defined(__NetBSD__)
static int
pdq_eisa_match(
- struct device *parent __unused,
- struct cfdata *match __unused,
+ struct device *parent,
+ struct cfdata *match,
void *aux)
{
const struct eisa_attach_args * const ea = (struct eisa_attach_args *) aux;
@@ -458,7 +458,7 @@ pdq_eisa_match(
static void
pdq_eisa_attach(
- struct device *parent __unused,
+ struct device *parent,
struct device *self,
void *aux)
{
diff --git a/sys/dev/eisa/if_tlp_eisa.c b/sys/dev/eisa/if_tlp_eisa.c
index 4107324a677..e42166fca7f 100644
--- a/sys/dev/eisa/if_tlp_eisa.c
+++ b/sys/dev/eisa/if_tlp_eisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tlp_eisa.c,v 1.17 2006/10/12 01:30:57 christos Exp $ */
+/* $NetBSD: if_tlp_eisa.c,v 1.18 2006/11/16 01:32:50 christos Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tlp_eisa.c,v 1.17 2006/10/12 01:30:57 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tlp_eisa.c,v 1.18 2006/11/16 01:32:50 christos Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -146,7 +146,7 @@ tlp_eisa_lookup(const struct eisa_attach_args *ea)
}
static int
-tlp_eisa_match(struct device *parent __unused, struct cfdata *match __unused,
+tlp_eisa_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct eisa_attach_args *ea = aux;
@@ -158,7 +158,7 @@ tlp_eisa_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-tlp_eisa_attach(struct device *parent __unused, struct device *self, void *aux)
+tlp_eisa_attach(struct device *parent, struct device *self, void *aux)
{
static const u_int8_t testpat[] =
{ 0xff, 0, 0x55, 0xaa, 0xff, 0, 0x55, 0xaa };
diff --git a/sys/dev/eisa/mlx_eisa.c b/sys/dev/eisa/mlx_eisa.c
index 11c577b0926..6e84f6db345 100644
--- a/sys/dev/eisa/mlx_eisa.c
+++ b/sys/dev/eisa/mlx_eisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mlx_eisa.c,v 1.17 2006/10/12 01:30:57 christos Exp $ */
+/* $NetBSD: mlx_eisa.c,v 1.18 2006/11/16 01:32:50 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mlx_eisa.c,v 1.17 2006/10/12 01:30:57 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mlx_eisa.c,v 1.18 2006/11/16 01:32:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -99,7 +99,7 @@ static struct mlx_eisa_prod {
};
static int
-mlx_eisa_match(struct device *parent __unused, struct cfdata *match __unused,
+mlx_eisa_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct eisa_attach_args *ea;
@@ -115,7 +115,7 @@ mlx_eisa_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-mlx_eisa_attach(struct device *parent __unused, struct device *self, void *aux)
+mlx_eisa_attach(struct device *parent, struct device *self, void *aux)
{
struct eisa_attach_args *ea;
bus_space_handle_t ioh;
diff --git a/sys/dev/eisa/uha_eisa.c b/sys/dev/eisa/uha_eisa.c
index a5bc52d1573..3f21d8029f6 100644
--- a/sys/dev/eisa/uha_eisa.c
+++ b/sys/dev/eisa/uha_eisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uha_eisa.c,v 1.25 2006/10/12 01:30:57 christos Exp $ */
+/* $NetBSD: uha_eisa.c,v 1.26 2006/11/16 01:32:50 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uha_eisa.c,v 1.25 2006/10/12 01:30:57 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uha_eisa.c,v 1.26 2006/11/16 01:32:50 christos Exp $");
#include "opt_ddb.h"
@@ -87,7 +87,7 @@ static void u24_init(struct uha_softc *);
* the actual probe routine to check it out.
*/
static int
-uha_eisa_match(struct device *parent __unused, struct cfdata *match __unused,
+uha_eisa_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct eisa_attach_args *ea = aux;
@@ -114,7 +114,7 @@ uha_eisa_match(struct device *parent __unused, struct cfdata *match __unused,
* Attach all the sub-devices we can find
*/
static void
-uha_eisa_attach(struct device *parent __unused, struct device *self, void *aux)
+uha_eisa_attach(struct device *parent, struct device *self, void *aux)
{
struct eisa_attach_args *ea = aux;
struct uha_softc *sc = device_private(self);
diff --git a/sys/dev/firmload.c b/sys/dev/firmload.c
index 4508a06a8f6..6507075b17c 100644
--- a/sys/dev/firmload.c
+++ b/sys/dev/firmload.c
@@ -1,4 +1,4 @@
-/* $NetBSD: firmload.c,v 1.5 2006/10/12 01:30:50 christos Exp $ */
+/* $NetBSD: firmload.c,v 1.6 2006/11/16 01:32:45 christos Exp $ */
/*-
* Copyright (c) 2005, 2006 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: firmload.c,v 1.5 2006/10/12 01:30:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: firmload.c,v 1.6 2006/11/16 01:32:45 christos Exp $");
/*
* The firmload API provides an interface for device drivers to access
@@ -346,7 +346,7 @@ firmware_malloc(size_t size)
*/
/*ARGSUSED*/
void
-firmware_free(void *v, size_t size __unused)
+firmware_free(void *v, size_t size)
{
free(v, M_DEVFIRM);
diff --git a/sys/dev/fss.c b/sys/dev/fss.c
index b2073aff4ad..f0289c45a52 100644
--- a/sys/dev/fss.c
+++ b/sys/dev/fss.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fss.c,v 1.28 2006/10/12 01:30:51 christos Exp $ */
+/* $NetBSD: fss.c,v 1.29 2006/11/16 01:32:45 christos Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.28 2006/10/12 01:30:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.29 2006/11/16 01:32:45 christos Exp $");
#include "fss.h"
@@ -152,7 +152,7 @@ const struct cdevsw fss_cdevsw = {
};
void
-fssattach(int num __unused)
+fssattach(int num)
{
int i;
struct fss_softc *sc;
@@ -168,7 +168,7 @@ fssattach(int num __unused)
}
int
-fss_open(dev_t dev, int flags __unused, int mode, struct lwp *l __unused)
+fss_open(dev_t dev, int flags, int mode, struct lwp *l)
{
int s, mflag;
struct fss_softc *sc;
@@ -188,7 +188,7 @@ fss_open(dev_t dev, int flags __unused, int mode, struct lwp *l __unused)
}
int
-fss_close(dev_t dev, int flags __unused, int mode, struct lwp *l)
+fss_close(dev_t dev, int flags, int mode, struct lwp *l)
{
int s, mflag, error;
struct fss_softc *sc;
@@ -249,13 +249,13 @@ fss_strategy(struct buf *bp)
}
int
-fss_read(dev_t dev, struct uio *uio, int flags __unused)
+fss_read(dev_t dev, struct uio *uio, int flags)
{
return physio(fss_strategy, NULL, dev, B_READ, minphys, uio);
}
int
-fss_write(dev_t dev, struct uio *uio, int flags __unused)
+fss_write(dev_t dev, struct uio *uio, int flags)
{
return physio(fss_strategy, NULL, dev, B_WRITE, minphys, uio);
}
@@ -339,14 +339,14 @@ fss_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
}
int
-fss_size(dev_t dev __unused)
+fss_size(dev_t dev)
{
return -1;
}
int
-fss_dump(dev_t dev __unused, daddr_t blkno __unused, caddr_t va __unused,
- size_t size __unused)
+fss_dump(dev_t dev, daddr_t blkno, caddr_t va,
+ size_t size)
{
return EROFS;
}
diff --git a/sys/dev/gpio/gpio.c b/sys/dev/gpio/gpio.c
index 2e6c6a35c6f..be04e4788b0 100644
--- a/sys/dev/gpio/gpio.c
+++ b/sys/dev/gpio/gpio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: gpio.c,v 1.10 2006/10/12 01:30:57 christos Exp $ */
+/* $NetBSD: gpio.c,v 1.11 2006/11/16 01:32:50 christos Exp $ */
/* $OpenBSD: gpio.c,v 1.6 2006/01/14 12:33:49 grange Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gpio.c,v 1.10 2006/10/12 01:30:57 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gpio.c,v 1.11 2006/11/16 01:32:50 christos Exp $");
/*
* General Purpose Input/Output framework.
@@ -69,15 +69,15 @@ const struct cdevsw gpio_cdevsw = {
extern struct cfdriver gpio_cd;
int
-gpio_match(struct device *parent __unused, struct cfdata *cf __unused,
- void *aux __unused)
+gpio_match(struct device *parent, struct cfdata *cf,
+ void *aux)
{
return (1);
}
void
-gpio_attach(struct device *parent __unused, struct device *self, void *aux)
+gpio_attach(struct device *parent, struct device *self, void *aux)
{
struct gpio_softc *sc = device_private(self);
struct gpiobus_attach_args *gba = aux;
@@ -96,7 +96,7 @@ gpio_attach(struct device *parent __unused, struct device *self, void *aux)
}
int
-gpio_detach(struct device *self __unused, int flags __unused)
+gpio_detach(struct device *self, int flags)
{
#if 0
int maj, mn;
@@ -132,7 +132,7 @@ gpio_activate(struct device *self, enum devact act)
int
gpio_search(struct device *parent, struct cfdata *cf,
- const int *ldesc __unused, void *aux)
+ const int *ldesc, void *aux)
{
struct gpio_attach_args ga;
@@ -147,7 +147,7 @@ gpio_search(struct device *parent, struct cfdata *cf,
}
int
-gpio_print(void *aux, const char *pnp __unused)
+gpio_print(void *aux, const char *pnp)
{
struct gpio_attach_args *ga = aux;
int i;
@@ -161,7 +161,7 @@ gpio_print(void *aux, const char *pnp __unused)
}
int
-gpiobus_print(void *aux __unused, const char *pnp)
+gpiobus_print(void *aux, const char *pnp)
{
#if 0
struct gpiobus_attach_args *gba = aux;
@@ -254,8 +254,8 @@ gpio_npins(u_int32_t mask)
}
int
-gpioopen(dev_t dev, int flag __unused, int mode __unused,
- struct lwp *l __unused)
+gpioopen(dev_t dev, int flag, int mode,
+ struct lwp *l)
{
struct gpio_softc *sc;
@@ -271,8 +271,8 @@ gpioopen(dev_t dev, int flag __unused, int mode __unused,
}
int
-gpioclose(dev_t dev, int flag __unused, int mode __unused,
- struct lwp *l __unused)
+gpioclose(dev_t dev, int flag, int mode,
+ struct lwp *l)
{
struct gpio_softc *sc;
@@ -283,8 +283,8 @@ gpioclose(dev_t dev, int flag __unused, int mode __unused,
}
int
-gpioioctl(dev_t dev, u_long cmd, caddr_t data, int flag __unused,
- struct lwp *l __unused)
+gpioioctl(dev_t dev, u_long cmd, caddr_t data, int flag,
+ struct lwp *l)
{
struct gpio_softc *sc;
gpio_chipset_tag_t gc;
diff --git a/sys/dev/gpio/gpioow.c b/sys/dev/gpio/gpioow.c
index f10b7565296..5aac969e780 100644
--- a/sys/dev/gpio/gpioow.c
+++ b/sys/dev/gpio/gpioow.c
@@ -1,4 +1,4 @@
-/* $NetBSD: gpioow.c,v 1.2 2006/10/12 01:30:57 christos Exp $ */
+/* $NetBSD: gpioow.c,v 1.3 2006/11/16 01:32:50 christos Exp $ */
/* $OpenBSD: gpioow.c,v 1.1 2006/03/04 16:27:03 grange Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gpioow.c,v 1.2 2006/10/12 01:30:57 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gpioow.c,v 1.3 2006/11/16 01:32:50 christos Exp $");
/*
* 1-Wire bus bit-banging through GPIO pin.
@@ -76,14 +76,14 @@ static const struct onewire_bbops gpioow_bbops = {
};
int
-gpioow_match(struct device *parent __unused, struct cfdata *cf __unused,
- void *aux __unused)
+gpioow_match(struct device *parent, struct cfdata *cf,
+ void *aux)
{
return 1;
}
void
-gpioow_attach(struct device *parent __unused, struct device *self, void *aux)
+gpioow_attach(struct device *parent, struct device *self, void *aux)
{
struct gpioow_softc *sc = device_private(self);
struct gpio_attach_args *ga = aux;
diff --git a/sys/dev/hpc/apm/apmdev.c b/sys/dev/hpc/apm/apmdev.c
index 85915a183cd..dea3f214a2b 100644
--- a/sys/dev/hpc/apm/apmdev.c
+++ b/sys/dev/hpc/apm/apmdev.c
@@ -1,4 +1,4 @@
-/* $NetBSD: apmdev.c,v 1.8 2006/10/12 21:19:13 uwe Exp $ */
+/* $NetBSD: apmdev.c,v 1.9 2006/11/16 01:32:50 christos Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: apmdev.c,v 1.8 2006/10/12 21:19:13 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: apmdev.c,v 1.9 2006/11/16 01:32:50 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_apmdev.h"
@@ -367,7 +367,7 @@ apm_standby(struct apm_softc *sc)
}
static void
-apm_resume(struct apm_softc *sc, u_int event_type, u_int event_info __unused)
+apm_resume(struct apm_softc *sc, u_int event_type, u_int event_info)
{
if (sc->sc_power_state == PWR_RESUME) {
@@ -604,7 +604,7 @@ apm_periodic_check(struct apm_softc *sc)
}
static void
-apm_set_ver(struct apm_softc *self __unused, u_long detail)
+apm_set_ver(struct apm_softc *self, u_long detail)
{
if (apm_v12_enabled &&
@@ -644,8 +644,8 @@ ok:
}
static int
-apmmatch(struct device *parent __unused,
- struct cfdata *match __unused, void *aux __unused)
+apmmatch(struct device *parent,
+ struct cfdata *match, void *aux)
{
/* There can be only one! */
@@ -656,7 +656,7 @@ apmmatch(struct device *parent __unused,
}
static void
-apmattach(struct device *parent __unused, struct device *self, void *aux)
+apmattach(struct device *parent, struct device *self, void *aux)
{
struct apm_softc *sc = (void *)self;
struct apmdev_attach_args *aaa = aux;
@@ -723,7 +723,7 @@ apmattach(struct device *parent __unused, struct device *self, void *aux)
* Print function (for parent devices).
*/
int
-apmprint(void *aux __unused, const char *pnp)
+apmprint(void *aux, const char *pnp)
{
if (pnp)
aprint_normal("apm at %s", pnp);
@@ -765,7 +765,7 @@ apm_thread(void *arg)
}
int
-apmdevopen(dev_t dev, int flag, int mode __unused, struct lwp *l __unused)
+apmdevopen(dev_t dev, int flag, int mode, struct lwp *l)
{
int unit = APMUNIT(dev);
int ctl = APMDEV(dev);
@@ -814,8 +814,8 @@ apmdevopen(dev_t dev, int flag, int mode __unused, struct lwp *l __unused)
}
int
-apmdevclose(dev_t dev, int flag __unused, int mode __unused,
- struct lwp *l __unused)
+apmdevclose(dev_t dev, int flag, int mode,
+ struct lwp *l)
{
struct apm_softc *sc = apmdev_cd.cd_devs[APMUNIT(dev)];
int ctl = APMDEV(dev);
@@ -842,7 +842,7 @@ apmdevclose(dev_t dev, int flag __unused, int mode __unused,
int
apmdevioctl(dev_t dev, u_long cmd, caddr_t data, int flag,
- struct lwp *l __unused)
+ struct lwp *l)
{
struct apm_softc *sc = apmdev_cd.cd_devs[APMUNIT(dev)];
struct apm_power_info *powerp;
@@ -954,7 +954,7 @@ filt_apmrdetach(struct knote *kn)
}
static int
-filt_apmread(struct knote *kn, long hint __unused)
+filt_apmread(struct knote *kn, long hint)
{
struct apm_softc *sc = kn->kn_hook;
diff --git a/sys/dev/hpc/btnmgr.c b/sys/dev/hpc/btnmgr.c
index 2f75c33b9d1..31cc8083563 100644
--- a/sys/dev/hpc/btnmgr.c
+++ b/sys/dev/hpc/btnmgr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: btnmgr.c,v 1.19 2006/10/12 21:19:13 uwe Exp $ */
+/* $NetBSD: btnmgr.c,v 1.20 2006/11/16 01:32:50 christos Exp $ */
/*-
* Copyright (c) 1999
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btnmgr.c,v 1.19 2006/10/12 21:19:13 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btnmgr.c,v 1.20 2006/11/16 01:32:50 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_btnmgr.h"
@@ -173,7 +173,7 @@ struct wskbd_mapdata btnmgr_keymapdata = {
* function bodies
*/
int
-btnmgrmatch(struct device *parent __unused, struct cfdata *match, void *aux)
+btnmgrmatch(struct device *parent, struct cfdata *match, void *aux)
{
struct mainbus_attach_args *ma = aux;
@@ -184,8 +184,8 @@ btnmgrmatch(struct device *parent __unused, struct cfdata *match, void *aux)
}
void
-btnmgrattach(struct device *parent __unused,
- struct device *self, void *aux __unused)
+btnmgrattach(struct device *parent,
+ struct device *self, void *aux)
{
int id;
struct btnmgr_softc *sc = device_private(self);
@@ -214,7 +214,7 @@ btnmgrattach(struct device *parent __unused,
}
static int
-btnmgr_hook(void *ctx, int type __unused, long id, void *msg)
+btnmgr_hook(void *ctx, int type, long id, void *msg)
{
struct btnmgr_softc *sc = ctx;
@@ -271,7 +271,7 @@ btnmgr_wskbd_enable(void *scx, int on)
}
void
-btnmgr_wskbd_set_leds(void *scx __unused, int leds __unused)
+btnmgr_wskbd_set_leds(void *scx, int leds)
{
/*
* We have nothing to do.
@@ -279,8 +279,8 @@ btnmgr_wskbd_set_leds(void *scx __unused, int leds __unused)
}
int
-btnmgr_wskbd_ioctl(void *scx, u_long cmd, caddr_t data, int flag __unused,
- struct lwp *l __unused)
+btnmgr_wskbd_ioctl(void *scx, u_long cmd, caddr_t data, int flag,
+ struct lwp *l)
{
#ifdef WSDISPLAY_COMPAT_RAWKBD
struct btnmgr_softc *sc = scx;
diff --git a/sys/dev/hpc/hpcapm.c b/sys/dev/hpc/hpcapm.c
index 144f90bc46b..221dc9712b1 100644
--- a/sys/dev/hpc/hpcapm.c
+++ b/sys/dev/hpc/hpcapm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hpcapm.c,v 1.11 2006/10/12 21:19:13 uwe Exp $ */
+/* $NetBSD: hpcapm.c,v 1.12 2006/11/16 01:32:50 christos Exp $ */
/*
* Copyright (c) 2000 Takemura Shin
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpcapm.c,v 1.11 2006/10/12 21:19:13 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpcapm.c,v 1.12 2006/11/16 01:32:50 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_hpcapm.h"
@@ -105,16 +105,16 @@ struct apm_accessops hpcapm_accessops = {
extern struct cfdriver hpcapm_cd;
static int
-hpcapm_match(struct device *parent __unused,
- struct cfdata *cf __unused, void *aux __unused)
+hpcapm_match(struct device *parent,
+ struct cfdata *cf, void *aux)
{
return 1;
}
static void
-hpcapm_attach(struct device *parent __unused,
- struct device *self, void *aux __unused)
+hpcapm_attach(struct device *parent,
+ struct device *self, void *aux)
{
struct apmhpc_softc *sc;
struct apmdev_attach_args aaa;
@@ -299,7 +299,7 @@ hpcapm_disconnect(void *scx)
}
static void
-hpcapm_enable(void *scx, int onoff __unused)
+hpcapm_enable(void *scx, int onoff)
{
struct apmhpc_softc *sc;
diff --git a/sys/dev/hpc/hpcfb.c b/sys/dev/hpc/hpcfb.c
index 98886e2eba8..c2cdb9f42c7 100644
--- a/sys/dev/hpc/hpcfb.c
+++ b/sys/dev/hpc/hpcfb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hpcfb.c,v 1.39 2006/10/12 21:19:13 uwe Exp $ */
+/* $NetBSD: hpcfb.c,v 1.40 2006/11/16 01:32:50 christos Exp $ */
/*-
* Copyright (c) 1999
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpcfb.c,v 1.39 2006/10/12 21:19:13 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpcfb.c,v 1.40 2006/11/16 01:32:50 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_hpcfb.h"
@@ -283,14 +283,14 @@ struct hpcfb_tvrow hpcfb_console_tvram[HPCFB_MAX_ROW];
*/
int
-hpcfbmatch(struct device *parent __unused,
- struct cfdata *match __unused, void *aux __unused)
+hpcfbmatch(struct device *parent,
+ struct cfdata *match, void *aux)
{
return (1);
}
void
-hpcfbattach(struct device *parent __unused,
+hpcfbattach(struct device *parent,
struct device *self, void *aux)
{
struct hpcfb_softc *sc = device_private(self);
@@ -382,7 +382,7 @@ hpcfb_thread(void *arg)
/* Print function (for parent devices). */
int
-hpcfbprint(void *aux __unused, const char *pnp)
+hpcfbprint(void *aux, const char *pnp)
{
if (pnp)
aprint_normal("hpcfb at %s", pnp);
@@ -554,7 +554,7 @@ hpcfb_cmap_reorder(struct hpcfb_fbconf *fbconf, struct hpcfb_devconfig *dc)
}
int
-hpcfb_ioctl(void *v, void *vs __unused, u_long cmd, caddr_t data, int flag,
+hpcfb_ioctl(void *v, void *vs, u_long cmd, caddr_t data, int flag,
struct lwp *l)
{
struct hpcfb_softc *sc = v;
@@ -629,7 +629,7 @@ hpcfb_ioctl(void *v, void *vs __unused, u_long cmd, caddr_t data, int flag,
}
paddr_t
-hpcfb_mmap(void *v, void *vs __unused, off_t offset, int prot)
+hpcfb_mmap(void *v, void *vs, off_t offset, int prot)
{
struct hpcfb_softc *sc = v;
@@ -706,7 +706,7 @@ hpcfb_refresh_screen(struct hpcfb_softc *sc)
}
static int
-hpcfb_alloc_screen(void *v, const struct wsscreen_descr *type __unused,
+hpcfb_alloc_screen(void *v, const struct wsscreen_descr *type,
void **cookiep, int *curxp, int *curyp, long *attrp)
{
struct hpcfb_softc *sc = v;
@@ -767,7 +767,7 @@ hpcfb_alloc_screen(void *v, const struct wsscreen_descr *type __unused,
}
static void
-hpcfb_free_screen(void *v __unused, void *cookie)
+hpcfb_free_screen(void *v, void *cookie)
{
struct hpcfb_devconfig *dc = cookie;
@@ -782,7 +782,7 @@ hpcfb_free_screen(void *v __unused, void *cookie)
}
static int
-hpcfb_show_screen(void *v, void *cookie, int waitok __unused,
+hpcfb_show_screen(void *v, void *cookie, int waitok,
void (*cb)(void *, int, int), void *cbarg)
{
struct hpcfb_softc *sc = v;
@@ -1126,7 +1126,7 @@ hpcfb_copycols(void *cookie, int row, int srccol, int dstcol, int ncols)
*/
void
hpcfb_tv_erasecols(struct hpcfb_devconfig *dc,
- int row, int startcol, int ncols, long attr __unused)
+ int row, int startcol, int ncols, long attr)
{
struct hpcfb_tvrow *vscn = dc->dc_tvram;
@@ -1449,7 +1449,7 @@ hpcfb_copyrows(void *cookie, int src, int dst, int num)
*/
void
hpcfb_tv_eraserows(struct hpcfb_devconfig *dc,
- int row, int nrow, long attr __unused)
+ int row, int nrow, long attr)
{
struct hpcfb_tvrow *vscn = dc->dc_tvram;
int cols;
diff --git a/sys/dev/hpc/hpckbd.c b/sys/dev/hpc/hpckbd.c
index 16d3c97a49c..06bf2757a38 100644
--- a/sys/dev/hpc/hpckbd.c
+++ b/sys/dev/hpc/hpckbd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hpckbd.c,v 1.19 2006/10/12 21:19:13 uwe Exp $ */
+/* $NetBSD: hpckbd.c,v 1.20 2006/11/16 01:32:50 christos Exp $ */
/*-
* Copyright (c) 1999-2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpckbd.c,v 1.19 2006/10/12 21:19:13 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpckbd.c,v 1.20 2006/11/16 01:32:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -147,14 +147,14 @@ struct wskbd_mapdata hpckbd_keymapdata = {
};
int
-hpckbd_match(struct device *parent __unused,
- struct cfdata *cf __unused, void *aux __unused)
+hpckbd_match(struct device *parent,
+ struct cfdata *cf, void *aux)
{
return (1);
}
void
-hpckbd_attach(struct device *parent __unused, struct device *self, void *aux)
+hpckbd_attach(struct device *parent, struct device *self, void *aux)
{
struct hpckbd_attach_args *haa = aux;
struct hpckbd_softc *sc = device_private(self);
@@ -193,7 +193,7 @@ hpckbd_attach(struct device *parent __unused, struct device *self, void *aux)
}
int
-hpckbd_print(void *aux __unused, const char *pnp)
+hpckbd_print(void *aux, const char *pnp)
{
return (pnp ? QUIET : UNCONF);
}
@@ -264,7 +264,7 @@ hpckbd_getevent(struct hpckbd_core* hc, u_int *type, int *data)
}
void
-hpckbd_keymap_setup(struct hpckbd_core *hc __unused,
+hpckbd_keymap_setup(struct hpckbd_core *hc,
const keysym_t *map, int mapsize)
{
int i;
@@ -328,7 +328,7 @@ hpckbd_keymap_lookup(struct hpckbd_core *hc)
}
void
-__hpckbd_input_hook(void *arg __unused)
+__hpckbd_input_hook(void *arg)
{
#if 0
struct hpckbd_core *hc = arg;
@@ -462,14 +462,14 @@ hpckbd_enable(void *arg, int on)
}
void
-hpckbd_set_leds(void *arg __unused, int leds __unused)
+hpckbd_set_leds(void *arg, int leds)
{
/* Can you find any LED which tells you about keyboard? */
}
int
-hpckbd_ioctl(void *arg, u_long cmd, caddr_t data, int flag __unused,
- struct lwp *l __unused)
+hpckbd_ioctl(void *arg, u_long cmd, caddr_t data, int flag,
+ struct lwp *l)
{
#ifdef WSDISPLAY_COMPAT_RAWKBD
struct hpckbd_core *hc = arg;
diff --git a/sys/dev/hpc/hpf1275a_tty.c b/sys/dev/hpc/hpf1275a_tty.c
index 0e6f2dae698..c4db8077732 100644
--- a/sys/dev/hpc/hpf1275a_tty.c
+++ b/sys/dev/hpc/hpf1275a_tty.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hpf1275a_tty.c,v 1.18 2006/10/27 00:08:32 uwe Exp $ */
+/* $NetBSD: hpf1275a_tty.c,v 1.19 2006/11/16 01:32:50 christos Exp $ */
/*
* Copyright (c) 2004 Valeriy E. Ushakov
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpf1275a_tty.c,v 1.18 2006/10/27 00:08:32 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpf1275a_tty.c,v 1.19 2006/11/16 01:32:50 christos Exp $");
#include "opt_wsdisplay_compat.h"
@@ -217,7 +217,7 @@ static const uint8_t hpf1275a_to_xtscan[128] = {
* Pseudo-device initialization routine called from main().
*/
void
-hpf1275aattach(int n __unused)
+hpf1275aattach(int n)
{
int error;
@@ -244,8 +244,8 @@ hpf1275aattach(int n __unused)
* XXX: unused: config_attach_pseudo(9) does not call ca_match.
*/
static int
-hpf1275a_match(struct device *self __unused,
- struct cfdata *cfdata __unused, void *arg __unused)
+hpf1275a_match(struct device *self,
+ struct cfdata *cfdata, void *arg)
{
/* pseudo-device; always present */
@@ -258,8 +258,8 @@ hpf1275a_match(struct device *self __unused,
* open the line discipline.
*/
static void
-hpf1275a_attach(struct device *parent __unused,
- struct device *self, void *aux __unused)
+hpf1275a_attach(struct device *parent,
+ struct device *self, void *aux)
{
struct hpf1275a_softc *sc = device_private(self);
struct wskbddev_attach_args wska;
@@ -281,7 +281,7 @@ hpf1275a_attach(struct device *parent __unused,
* Autoconf detach routine. Called when we close the line discipline.
*/
static int
-hpf1275a_detach(struct device *self, int flags __unused)
+hpf1275a_detach(struct device *self, int flags)
{
struct hpf1275a_softc *sc = device_private(self);
int error;
@@ -299,7 +299,7 @@ hpf1275a_detach(struct device *self, int flags __unused)
* Line discipline open routine.
*/
static int
-hpf1275a_open(dev_t dev __unused, struct tty *tp)
+hpf1275a_open(dev_t dev, struct tty *tp)
{
static struct cfdata hpf1275a_cfdata = {
.cf_name = "hpf1275a",
@@ -340,7 +340,7 @@ hpf1275a_open(dev_t dev __unused, struct tty *tp)
* Line discipline close routine.
*/
static int
-hpf1275a_close(struct tty *tp, int flag __unused)
+hpf1275a_close(struct tty *tp, int flag)
{
struct hpf1275a_softc *sc = tp->t_sc;
int s;
@@ -418,7 +418,7 @@ hpf1275a_wskbd_enable(void *self, int on)
/* ARGSUSED */
static void
-hpf1275a_wskbd_set_leds(void *self __unused, int leds __unused)
+hpf1275a_wskbd_set_leds(void *self, int leds)
{
/* this keyboard has no leds; nothing to do */
@@ -427,8 +427,8 @@ hpf1275a_wskbd_set_leds(void *self __unused, int leds __unused)
static int
-hpf1275a_wskbd_ioctl(void *self, u_long cmd, caddr_t data, int flag __unused,
- struct lwp *l __unused)
+hpf1275a_wskbd_ioctl(void *self, u_long cmd, caddr_t data, int flag,
+ struct lwp *l)
{
#ifdef WSDISPLAY_COMPAT_RAWKBD
struct hpf1275a_softc *sc = self;
diff --git a/sys/dev/hpc/video_subr.c b/sys/dev/hpc/video_subr.c
index fa5913011f4..c6b1e8983f4 100644
--- a/sys/dev/hpc/video_subr.c
+++ b/sys/dev/hpc/video_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: video_subr.c,v 1.9 2006/10/12 21:19:13 uwe Exp $ */
+/* $NetBSD: video_subr.c,v 1.10 2006/11/16 01:32:50 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: video_subr.c,v 1.9 2006/10/12 21:19:13 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: video_subr.c,v 1.10 2006/11/16 01:32:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -244,16 +244,16 @@ video_calibration_pattern(struct video_chip *vc)
}
static void
-linebpp_unimpl(struct video_chip *vc __unused,
- int x0 __unused, int y0 __unused,
- int x1 __unused, int y1 __unused)
+linebpp_unimpl(struct video_chip *vc,
+ int x0, int y0,
+ int x1, int y1)
{
return;
}
static void
-dotbpp_unimpl(struct video_chip *vc __unused, int x __unused, int y __unused)
+dotbpp_unimpl(struct video_chip *vc, int x, int y)
{
return;
diff --git a/sys/dev/i2c/adt7463.c b/sys/dev/i2c/adt7463.c
index d9f6e9a1322..812e7aa38fa 100644
--- a/sys/dev/i2c/adt7463.c
+++ b/sys/dev/i2c/adt7463.c
@@ -1,4 +1,4 @@
-/* $NetBSD: adt7463.c,v 1.5 2006/10/12 01:30:57 christos Exp $ */
+/* $NetBSD: adt7463.c,v 1.6 2006/11/16 01:32:50 christos Exp $ */
/*
* Copyright (c) 2005 Anil Gopinath (anil_public@yahoo.com)
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adt7463.c,v 1.5 2006/10/12 01:30:57 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adt7463.c,v 1.6 2006/11/16 01:32:50 christos Exp $");
/* Fan speed control added by Hanns Hartman */
#include <sys/param.h>
@@ -71,7 +71,7 @@ CFATTACH_DECL(adt7463c, sizeof(struct adt7463c_softc),
adt7463c_match, adt7463c_attach, NULL, NULL);
static int
-adt7463c_match(struct device *parent __unused, struct cfdata *cf __unused,
+adt7463c_match(struct device *parent, struct cfdata *cf,
void *aux)
{
struct i2c_attach_args *ia = aux;
@@ -86,7 +86,7 @@ adt7463c_match(struct device *parent __unused, struct cfdata *cf __unused,
}
static void
-adt7463c_attach(struct device *parent __unused, struct device *self, void *aux)
+adt7463c_attach(struct device *parent, struct device *self, void *aux)
{
struct adt7463c_softc *sc = device_private(self);
struct i2c_attach_args *ia = aux;
@@ -186,7 +186,7 @@ adt7463c_verify(struct adt7463c_softc *sc)
}
static void
-adt7463c_setup_volt(struct adt7463c_softc *sc, int start, int tot __unused)
+adt7463c_setup_volt(struct adt7463c_softc *sc, int start, int tot)
{
sc->sc_sensor[start+0].units = sc->sc_info[start+0].units = ENVSYS_SVOLTS_DC;
snprintf(sc->sc_info[start+0].desc, sizeof(sc->sc_info[start+0].desc), "2.5V");
@@ -207,7 +207,7 @@ adt7463c_setup_volt(struct adt7463c_softc *sc, int start, int tot __unused)
static void
-adt7463c_setup_temp(struct adt7463c_softc *sc, int start, int tot __unused)
+adt7463c_setup_temp(struct adt7463c_softc *sc, int start, int tot)
{
sc->sc_sensor[start+0].units = sc->sc_info[start+0].units = ENVSYS_STEMP;
snprintf(sc->sc_info[start + 0].desc,
@@ -224,7 +224,7 @@ adt7463c_setup_temp(struct adt7463c_softc *sc, int start, int tot __unused)
}
static void
-adt7463c_setup_fan(struct adt7463c_softc *sc, int start, int tot __unused)
+adt7463c_setup_fan(struct adt7463c_softc *sc, int start, int tot)
{
sc->sc_sensor[start + 0].units = ENVSYS_SFANRPM;
sc->sc_info[start + 0].units = ENVSYS_SFANRPM;
diff --git a/sys/dev/i2c/i2c.c b/sys/dev/i2c/i2c.c
index a414f2bf85b..576f4727dcf 100644
--- a/sys/dev/i2c/i2c.c
+++ b/sys/dev/i2c/i2c.c
@@ -1,4 +1,4 @@
-/* $NetBSD: i2c.c,v 1.9 2006/10/12 01:30:58 christos Exp $ */
+/* $NetBSD: i2c.c,v 1.10 2006/11/16 01:32:50 christos Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -52,7 +52,7 @@ struct iic_softc {
};
int
-iicbus_print(void *aux __unused, const char *pnp)
+iicbus_print(void *aux, const char *pnp)
{
if (pnp != NULL)
@@ -62,7 +62,7 @@ iicbus_print(void *aux __unused, const char *pnp)
}
static int
-iic_print(void *aux, const char *pnp __unused)
+iic_print(void *aux, const char *pnp)
{
struct i2c_attach_args *ia = aux;
@@ -74,7 +74,7 @@ iic_print(void *aux, const char *pnp __unused)
static int
iic_search(struct device *parent, struct cfdata *cf,
- const int *ldesc __unused, void *aux __unused)
+ const int *ldesc, void *aux)
{
struct iic_softc *sc = (void *) parent;
struct i2c_attach_args ia;
@@ -91,15 +91,15 @@ iic_search(struct device *parent, struct cfdata *cf,
}
static int
-iic_match(struct device *parent __unused, struct cfdata *cf __unused,
- void *aux __unused)
+iic_match(struct device *parent, struct cfdata *cf,
+ void *aux)
{
return (1);
}
static void
-iic_attach(struct device *parent __unused, struct device *self, void *aux)
+iic_attach(struct device *parent, struct device *self, void *aux)
{
struct iic_softc *sc = device_private(self);
struct i2cbus_attach_args *iba = aux;
diff --git a/sys/dev/i2c/i2c_bitbang.c b/sys/dev/i2c/i2c_bitbang.c
index 7ef06bafa6b..2f12f3b5f90 100644
--- a/sys/dev/i2c/i2c_bitbang.c
+++ b/sys/dev/i2c/i2c_bitbang.c
@@ -1,4 +1,4 @@
-/* $NetBSD: i2c_bitbang.c,v 1.5 2006/10/12 01:30:58 christos Exp $ */
+/* $NetBSD: i2c_bitbang.c,v 1.6 2006/11/16 01:32:50 christos Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -55,7 +55,7 @@
/*ARGSUSED*/
int
-i2c_bitbang_send_start(void *v, int flags __unused, i2c_bitbang_ops_t ops)
+i2c_bitbang_send_start(void *v, int flags, i2c_bitbang_ops_t ops)
{
DIR(OUTPUT);
@@ -72,7 +72,7 @@ i2c_bitbang_send_start(void *v, int flags __unused, i2c_bitbang_ops_t ops)
/*ARGSUSED*/
int
-i2c_bitbang_send_stop(void *v, int flags __unused, i2c_bitbang_ops_t ops)
+i2c_bitbang_send_stop(void *v, int flags, i2c_bitbang_ops_t ops)
{
DIR(OUTPUT);
diff --git a/sys/dev/i2o/dpti.c b/sys/dev/i2o/dpti.c
index 6e7078ddef0..1b8befdd7f7 100644
--- a/sys/dev/i2o/dpti.c
+++ b/sys/dev/i2o/dpti.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dpti.c,v 1.29 2006/11/08 00:17:09 elad Exp $ */
+/* $NetBSD: dpti.c,v 1.30 2006/11/16 01:32:50 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dpti.c,v 1.29 2006/11/08 00:17:09 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dpti.c,v 1.30 2006/11/16 01:32:50 christos Exp $");
#include "opt_i2o.h"
@@ -157,7 +157,7 @@ CFATTACH_DECL(dpti, sizeof(struct dpti_softc),
dpti_match, dpti_attach, NULL, NULL);
int
-dpti_match(struct device *parent, struct cfdata *match __unused, void *aux)
+dpti_match(struct device *parent, struct cfdata *match, void *aux)
{
struct iop_attach_args *ia;
struct iop_softc *iop;
@@ -175,7 +175,7 @@ dpti_match(struct device *parent, struct cfdata *match __unused, void *aux)
}
void
-dpti_attach(struct device *parent, struct device *self, void *aux __unused)
+dpti_attach(struct device *parent, struct device *self, void *aux)
{
struct iop_softc *iop;
struct dpti_softc *sc;
@@ -207,8 +207,8 @@ dpti_attach(struct device *parent, struct device *self, void *aux __unused)
}
int
-dptiopen(dev_t dev, int flag __unused, int mode __unused,
- struct lwp *l __unused)
+dptiopen(dev_t dev, int flag, int mode,
+ struct lwp *l)
{
if (device_lookup(&dpti_cd, minor(dev)) == NULL)
@@ -218,7 +218,7 @@ dptiopen(dev_t dev, int flag __unused, int mode __unused,
}
int
-dptiioctl(dev_t dev, u_long cmd, caddr_t data, int flag __unused, struct lwp *l)
+dptiioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct iop_softc *iop;
struct dpti_softc *sc;
@@ -364,7 +364,7 @@ dpti_ctlrinfo(struct dpti_softc *sc, int size, caddr_t data)
}
int
-dpti_sysinfo(struct dpti_softc *sc __unused, int size, caddr_t data)
+dpti_sysinfo(struct dpti_softc *sc, int size, caddr_t data)
{
struct dpt_sysinfo info;
int rv;
diff --git a/sys/dev/i2o/iop.c b/sys/dev/i2o/iop.c
index f4a2f332cb3..740e5fff2d8 100644
--- a/sys/dev/i2o/iop.c
+++ b/sys/dev/i2o/iop.c
@@ -1,4 +1,4 @@
-/* $NetBSD: iop.c,v 1.60 2006/11/08 00:17:09 elad Exp $ */
+/* $NetBSD: iop.c,v 1.61 2006/11/16 01:32:50 christos Exp $ */
/*-
* Copyright (c) 2000, 2001, 2002 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iop.c,v 1.60 2006/11/08 00:17:09 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iop.c,v 1.61 2006/11/16 01:32:50 christos Exp $");
#include "opt_i2o.h"
#include "iop.h"
@@ -905,7 +905,7 @@ iop_print(void *aux, const char *pnp)
* Shut down all configured IOPs.
*/
static void
-iop_shutdown(void *junk __unused)
+iop_shutdown(void *junk)
{
struct iop_softc *sc;
int i;
@@ -1823,7 +1823,7 @@ iop_intr(void *arg)
* Handle an event signalled by the executive.
*/
static void
-iop_intr_event(struct device *dv, struct iop_msg *im __unused, void *reply)
+iop_intr_event(struct device *dv, struct iop_msg *im, void *reply)
{
struct i2o_util_event_register_reply *rb;
u_int event;
@@ -2257,7 +2257,7 @@ iop_msg_poll(struct iop_softc *sc, struct iop_msg *im, int timo)
* Sleep until the specified message is replied to.
*/
static void
-iop_msg_wait(struct iop_softc *sc __unused, struct iop_msg *im, int timo)
+iop_msg_wait(struct iop_softc *sc, struct iop_msg *im, int timo)
{
int s, rv;
@@ -2488,7 +2488,7 @@ int iop_util_eventreg(struct iop_softc *sc, struct iop_initiator *ii, int mask)
}
int
-iopopen(dev_t dev, int flag __unused, int mode __unused, struct lwp *l __unused)
+iopopen(dev_t dev, int flag, int mode, struct lwp *l)
{
struct iop_softc *sc;
@@ -2504,8 +2504,8 @@ iopopen(dev_t dev, int flag __unused, int mode __unused, struct lwp *l __unused)
}
int
-iopclose(dev_t dev, int flag __unused, int mode __unused,
- struct lwp *l __unused)
+iopclose(dev_t dev, int flag, int mode,
+ struct lwp *l)
{
struct iop_softc *sc;
@@ -2516,7 +2516,7 @@ iopclose(dev_t dev, int flag __unused, int mode __unused,
}
int
-iopioctl(dev_t dev, u_long cmd, caddr_t data, int flag __unused, struct lwp *l)
+iopioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct iop_softc *sc;
struct iovec *iov;
diff --git a/sys/dev/i2o/iopsp.c b/sys/dev/i2o/iopsp.c
index 4106a6f3b3b..d20f9abe18d 100644
--- a/sys/dev/i2o/iopsp.c
+++ b/sys/dev/i2o/iopsp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: iopsp.c,v 1.24 2006/10/12 01:30:58 christos Exp $ */
+/* $NetBSD: iopsp.c,v 1.25 2006/11/16 01:32:50 christos Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iopsp.c,v 1.24 2006/10/12 01:30:58 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iopsp.c,v 1.25 2006/11/16 01:32:50 christos Exp $");
#include "opt_i2o.h"
@@ -90,7 +90,7 @@ CFATTACH_DECL(iopsp, sizeof(struct iopsp_softc),
* Match a supported device.
*/
static int
-iopsp_match(struct device *parent, struct cfdata *match __unused, void *aux)
+iopsp_match(struct device *parent, struct cfdata *match, void *aux)
{
struct iop_attach_args *ia;
struct {
@@ -633,8 +633,8 @@ iopsp_intr(struct device *dv, struct iop_msg *im, void *reply)
* ioctl hook; used here only to initiate low-level rescans.
*/
static int
-iopsp_ioctl(struct scsipi_channel *chan, u_long cmd, caddr_t data __unused,
- int flag __unused, struct proc *p)
+iopsp_ioctl(struct scsipi_channel *chan, u_long cmd, caddr_t data,
+ int flag, struct proc *p)
{
int rv;
diff --git a/sys/dev/i2o/ld_iop.c b/sys/dev/i2o/ld_iop.c
index 597915bcdab..483a9a9c44a 100644
--- a/sys/dev/i2o/ld_iop.c
+++ b/sys/dev/i2o/ld_iop.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_iop.c,v 1.22 2006/10/12 01:30:58 christos Exp $ */
+/* $NetBSD: ld_iop.c,v 1.23 2006/11/16 01:32:50 christos Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_iop.c,v 1.22 2006/10/12 01:30:58 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_iop.c,v 1.23 2006/11/16 01:32:50 christos Exp $");
#include "opt_i2o.h"
#include "rnd.h"
@@ -117,7 +117,7 @@ static const char * const ld_iop_errors[] = {
#endif
static int
-ld_iop_match(struct device *parent __unused, struct cfdata *match __unused,
+ld_iop_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct iop_attach_args *ia;
@@ -527,7 +527,7 @@ ld_iop_intr(struct device *dv, struct iop_msg *im, void *reply)
}
static void
-ld_iop_intr_event(struct device *dv, struct iop_msg *im __unused, void *reply)
+ld_iop_intr_event(struct device *dv, struct iop_msg *im, void *reply)
{
struct i2o_util_event_register_reply *rb;
struct ld_iop_softc *sc;
diff --git a/sys/dev/ic/aac.c b/sys/dev/ic/aac.c
index 06875473ab1..eaaf0f502ec 100644
--- a/sys/dev/ic/aac.c
+++ b/sys/dev/ic/aac.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aac.c,v 1.28 2006/10/12 01:30:58 christos Exp $ */
+/* $NetBSD: aac.c,v 1.29 2006/11/16 01:32:50 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aac.c,v 1.28 2006/10/12 01:30:58 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aac.c,v 1.29 2006/11/16 01:32:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -693,7 +693,7 @@ aac_startup(struct aac_softc *sc)
}
static void
-aac_shutdown(void *cookie __unused)
+aac_shutdown(void *cookie)
{
struct aac_softc *sc;
struct aac_close_command cc;
@@ -1292,7 +1292,7 @@ aac_dequeue_fib(struct aac_softc *sc, int queue, u_int32_t *fib_size,
* Print a FIB
*/
static void
-aac_print_fib(struct aac_softc *sc __unused, struct aac_fib *fib,
+aac_print_fib(struct aac_softc *sc, struct aac_fib *fib,
const char *caller)
{
struct aac_blockread *br;
diff --git a/sys/dev/ic/ad1848.c b/sys/dev/ic/ad1848.c
index 90f5ca4983c..5cfb27782b1 100644
--- a/sys/dev/ic/ad1848.c
+++ b/sys/dev/ic/ad1848.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ad1848.c,v 1.24 2006/10/12 01:30:58 christos Exp $ */
+/* $NetBSD: ad1848.c,v 1.25 2006/11/16 01:32:50 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -102,7 +102,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ad1848.c,v 1.24 2006/10/12 01:30:58 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ad1848.c,v 1.25 2006/11/16 01:32:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -861,7 +861,7 @@ ad1848_query_encoding(void *addr, struct audio_encoding *fp)
}
int
-ad1848_set_params(void *addr, int setmode __unused, int usemode __unused,
+ad1848_set_params(void *addr, int setmode, int usemode,
audio_params_t *p, audio_params_t *r, stream_filter_list_t *pfil,
stream_filter_list_t *rfil)
{
@@ -1021,8 +1021,8 @@ ad1848_get_rec_port(struct ad1848_softc *sc)
}
int
-ad1848_round_blocksize(void *addr __unused, int blk,
- int mode __unused, const audio_params_t *param __unused)
+ad1848_round_blocksize(void *addr, int blk,
+ int mode, const audio_params_t *param)
{
/* Round to a multiple of the biggest sample size. */
diff --git a/sys/dev/ic/advlib.c b/sys/dev/ic/advlib.c
index 454a65bec3f..8313f5a9c0c 100644
--- a/sys/dev/ic/advlib.c
+++ b/sys/dev/ic/advlib.c
@@ -1,4 +1,4 @@
-/* $NetBSD: advlib.c,v 1.24 2006/10/12 01:30:58 christos Exp $ */
+/* $NetBSD: advlib.c,v 1.25 2006/11/16 01:32:50 christos Exp $ */
/*
* Low level routines for the Advanced Systems Inc. SCSI controllers chips
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: advlib.c,v 1.24 2006/10/12 01:30:58 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: advlib.c,v 1.25 2006/11/16 01:32:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -2624,7 +2624,7 @@ AscSgListToQueue(int sg_list)
static u_int
-AscGetNumOfFreeQueue(ASC_SOFTC *sc, u_int8_t target_ix __unused, u_int8_t n_qs)
+AscGetNumOfFreeQueue(ASC_SOFTC *sc, u_int8_t target_ix, u_int8_t n_qs)
{
u_int cur_used_qs;
u_int cur_free_qs;
diff --git a/sys/dev/ic/aha.c b/sys/dev/ic/aha.c
index 711363b25c5..fe07e93be33 100644
--- a/sys/dev/ic/aha.c
+++ b/sys/dev/ic/aha.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aha.c,v 1.51 2006/10/12 01:30:58 christos Exp $ */
+/* $NetBSD: aha.c,v 1.52 2006/11/16 01:32:50 christos Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aha.c,v 1.51 2006/10/12 01:30:58 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aha.c,v 1.52 2006/11/16 01:32:50 christos Exp $");
#include "opt_ddb.h"
@@ -442,7 +442,7 @@ aha_intr(arg)
}
static inline void
-aha_reset_ccb(struct aha_softc *sc __unused, struct aha_ccb *ccb)
+aha_reset_ccb(struct aha_softc *sc, struct aha_ccb *ccb)
{
ccb->flags = 0;
diff --git a/sys/dev/ic/aic6360.c b/sys/dev/ic/aic6360.c
index 322d6040d63..00feb364deb 100644
--- a/sys/dev/ic/aic6360.c
+++ b/sys/dev/ic/aic6360.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aic6360.c,v 1.91 2006/10/12 01:30:58 christos Exp $ */
+/* $NetBSD: aic6360.c,v 1.92 2006/11/16 01:32:50 christos Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Charles M. Hannum. All rights reserved.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic6360.c,v 1.91 2006/10/12 01:30:58 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic6360.c,v 1.92 2006/11/16 01:32:50 christos Exp $");
#include "opt_ddb.h"
@@ -702,7 +702,7 @@ aic_sched_msgout(struct aic_softc *sc, u_char m)
/* ARGSUSED */
#endif
static inline void
-aic_setsync(struct aic_softc *sc __unused, struct aic_tinfo *ti __unused)
+aic_setsync(struct aic_softc *sc, struct aic_tinfo *ti)
{
#if AIC_USE_SYNCHRONOUS
bus_space_tag_t iot = sc->sc_iot;
diff --git a/sys/dev/ic/aic79xx.c b/sys/dev/ic/aic79xx.c
index c23cfa3317b..e8b46277b38 100644
--- a/sys/dev/ic/aic79xx.c
+++ b/sys/dev/ic/aic79xx.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aic79xx.c,v 1.35 2006/10/12 01:30:58 christos Exp $ */
+/* $NetBSD: aic79xx.c,v 1.36 2006/11/16 01:32:50 christos Exp $ */
/*
* Core routines and tables shareable across OS platforms.
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic79xx.c,v 1.35 2006/10/12 01:30:58 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic79xx.c,v 1.36 2006/11/16 01:32:50 christos Exp $");
#include <dev/ic/aic79xx_osm.h>
#include <dev/ic/aic79xx_inline.h>
@@ -871,7 +871,7 @@ ahd_handle_hwerrint(struct ahd_softc *ahd)
}
void
-ahd_handle_seqint(struct ahd_softc *ahd, u_int intstat __unused)
+ahd_handle_seqint(struct ahd_softc *ahd, u_int intstat)
{
u_int seqintcode;
@@ -1494,7 +1494,7 @@ ahd_handle_seqint(struct ahd_softc *ahd, u_int intstat __unused)
}
void
-ahd_handle_scsiint(struct ahd_softc *ahd, u_int intstat __unused)
+ahd_handle_scsiint(struct ahd_softc *ahd, u_int intstat)
{
struct scb *scb;
u_int status0;
@@ -2693,7 +2693,7 @@ ahd_dump_sglist(struct scb *scb)
* transfer negotiation data structures.
*/
static struct ahd_tmode_tstate *
-ahd_alloc_tstate(struct ahd_softc *ahd, u_int scsi_id, char channel __unused)
+ahd_alloc_tstate(struct ahd_softc *ahd, u_int scsi_id, char channel)
{
struct ahd_tmode_tstate *master_tstate;
struct ahd_tmode_tstate *tstate;
@@ -2810,7 +2810,7 @@ ahd_devlimited_syncrate(struct ahd_softc *ahd,
* if this was the beginning of an SDTR.
*/
void
-ahd_find_syncrate(struct ahd_softc *ahd __unused, u_int *period,
+ahd_find_syncrate(struct ahd_softc *ahd, u_int *period,
u_int *ppr_options, u_int maxsync)
{
if (*period < maxsync)
@@ -2851,7 +2851,7 @@ ahd_find_syncrate(struct ahd_softc *ahd __unused, u_int *period,
void
ahd_validate_offset(struct ahd_softc *ahd,
struct ahd_initiator_tinfo *tinfo,
- u_int period, u_int *offset, int wide __unused,
+ u_int period, u_int *offset, int wide,
role_t role)
{
u_int maxoffset;
@@ -3424,7 +3424,7 @@ ahd_compile_devinfo(struct ahd_devinfo *devinfo, u_int our_id, u_int target,
}
static void
-ahd_scb_devinfo(struct ahd_softc *ahd __unused, struct ahd_devinfo *devinfo,
+ahd_scb_devinfo(struct ahd_softc *ahd, struct ahd_devinfo *devinfo,
struct scb *scb)
{
role_t role;
@@ -4748,7 +4748,7 @@ ahd_handle_msg_reject(struct ahd_softc *ahd, struct ahd_devinfo *devinfo)
*/
static void
ahd_handle_ign_wide_residue(struct ahd_softc *ahd,
- struct ahd_devinfo *devinfo __unused)
+ struct ahd_devinfo *devinfo)
{
u_int scb_index;
struct scb *scb;
@@ -6951,8 +6951,8 @@ ahd_busy_tcl(struct ahd_softc *ahd, u_int tcl, u_int scbid)
/************************** SCB and SCB queue management **********************/
int
-ahd_match_scb(struct ahd_softc *ahd __unused, struct scb *scb, int target,
- char channel, int lun, u_int tag, role_t role __unused)
+ahd_match_scb(struct ahd_softc *ahd, struct scb *scb, int target,
+ char channel, int lun, u_int tag, role_t role)
{
int targ = SCB_GET_TARGET(ahd, scb);
char chan = SCB_GET_CHANNEL(ahd, scb);
@@ -7278,7 +7278,7 @@ ahd_search_qinfifo(struct ahd_softc *ahd, int target, char channel,
static int
ahd_search_scb_list(struct ahd_softc *ahd, int target, char channel,
- int lun, u_int tag __unused, role_t role, uint32_t status,
+ int lun, u_int tag, role_t role, uint32_t status,
ahd_search_action action, u_int *list_head, u_int tid)
{
struct scb *scb;
@@ -7419,7 +7419,7 @@ ahd_rem_wscb(struct ahd_softc *ahd, u_int scbid,
* performing SCB paging.
*/
static void
-ahd_add_scb_to_free_list(struct ahd_softc *ahd __unused, u_int scbid __unused)
+ahd_add_scb_to_free_list(struct ahd_softc *ahd, u_int scbid)
{
#ifdef notdef
/* XXX Need some other mechanism to designate "free". */
@@ -8575,7 +8575,7 @@ ahd_dump_all_cards_state(void)
int
ahd_print_register(ahd_reg_parse_entry_t *table, u_int num_entries,
- const char *name, u_int address __unused, u_int value,
+ const char *name, u_int address, u_int value,
u_int *cur_column, u_int wrap_point)
{
int printed;
@@ -9064,7 +9064,7 @@ ahd_verify_cksum(struct seeprom_config *sc)
}
int
-ahd_acquire_seeprom(struct ahd_softc *ahd __unused)
+ahd_acquire_seeprom(struct ahd_softc *ahd)
{
/*
* We should be able to determine the SEEPROM type
@@ -9088,7 +9088,7 @@ ahd_acquire_seeprom(struct ahd_softc *ahd __unused)
}
void
-ahd_release_seeprom(struct ahd_softc *ahd __unused)
+ahd_release_seeprom(struct ahd_softc *ahd)
{
/* Currently a no-op */
}
diff --git a/sys/dev/ic/aic79xx_inline.h b/sys/dev/ic/aic79xx_inline.h
index d6588ea3261..dbbf7fef891 100644
--- a/sys/dev/ic/aic79xx_inline.h
+++ b/sys/dev/ic/aic79xx_inline.h
@@ -1,4 +1,4 @@
-/* $NetBSD: aic79xx_inline.h,v 1.14 2006/10/12 01:30:58 christos Exp $ */
+/* $NetBSD: aic79xx_inline.h,v 1.15 2006/11/16 01:32:50 christos Exp $ */
/*
* Inline routines shareable across OS platforms.
@@ -85,13 +85,13 @@ ahd_known_modes(struct ahd_softc *ahd, ahd_mode src, ahd_mode dst)
}
static __inline ahd_mode_state
-ahd_build_mode_state(struct ahd_softc *ahd __unused, ahd_mode src, ahd_mode dst)
+ahd_build_mode_state(struct ahd_softc *ahd, ahd_mode src, ahd_mode dst)
{
return ((src << SRC_MODE_SHIFT) | (dst << DST_MODE_SHIFT));
}
static __inline void
-ahd_extract_mode_state(struct ahd_softc *ahd __unused, ahd_mode_state state,
+ahd_extract_mode_state(struct ahd_softc *ahd, ahd_mode_state state,
ahd_mode *src, ahd_mode *dst)
{
*src = (state & SRC_MODE) >> SRC_MODE_SHIFT;
@@ -133,8 +133,8 @@ ahd_update_modes(struct ahd_softc *ahd)
}
static __inline void
-ahd_assert_modes(struct ahd_softc *ahd __unused, ahd_mode srcmode __unused,
- ahd_mode dstmode __unused, const char *file __unused, int line __unused)
+ahd_assert_modes(struct ahd_softc *ahd, ahd_mode srcmode,
+ ahd_mode dstmode, const char *file, int line)
{
#ifdef AHD_DEBUG
if ((srcmode & AHD_MK_MSK(ahd->src_mode)) == 0
@@ -260,7 +260,7 @@ ahd_sg_setup(struct ahd_softc *ahd, struct scb *scb,
}
static __inline void
-ahd_setup_scb_common(struct ahd_softc *ahd __unused, struct scb *scb)
+ahd_setup_scb_common(struct ahd_softc *ahd, struct scb *scb)
{
/* XXX Handle target mode SCBs. */
scb->crc_retry_count = 0;
@@ -318,7 +318,7 @@ ahd_setup_data_scb(struct ahd_softc *ahd, struct scb *scb)
}
static __inline void
-ahd_setup_noxfer_scb(struct ahd_softc *ahd __unused, struct scb *scb)
+ahd_setup_noxfer_scb(struct ahd_softc *ahd, struct scb *scb)
{
scb->hscb->sgptr = ahd_htole32(SG_LIST_NULL);
scb->hscb->dataptr = 0;
@@ -803,13 +803,13 @@ ahd_queue_scb(struct ahd_softc *ahd, struct scb *scb)
}
static __inline uint8_t *
-ahd_get_sense_buf(struct ahd_softc *ahd __unused, struct scb *scb)
+ahd_get_sense_buf(struct ahd_softc *ahd, struct scb *scb)
{
return (scb->sense_data);
}
static __inline uint32_t
-ahd_get_sense_bufaddr(struct ahd_softc *ahd __unused, struct scb *scb)
+ahd_get_sense_bufaddr(struct ahd_softc *ahd, struct scb *scb)
{
return (scb->sense_busaddr);
}
@@ -829,7 +829,7 @@ ahd_sync_qoutfifo(struct ahd_softc *ahd, int op)
}
static __inline void
-ahd_sync_tqinfifo(struct ahd_softc *ahd __unused, int op __unused)
+ahd_sync_tqinfifo(struct ahd_softc *ahd, int op)
{
#ifdef AHD_TARGET_MODE
if ((ahd->flags & AHD_TARGETROLE) != 0) {
diff --git a/sys/dev/ic/aic79xx_osm.c b/sys/dev/ic/aic79xx_osm.c
index ec0e6087908..1d06c9f9326 100644
--- a/sys/dev/ic/aic79xx_osm.c
+++ b/sys/dev/ic/aic79xx_osm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aic79xx_osm.c,v 1.16 2006/10/12 01:30:58 christos Exp $ */
+/* $NetBSD: aic79xx_osm.c,v 1.17 2006/11/16 01:32:50 christos Exp $ */
/*
* Bus independent NetBSD shim for the aic7xxx based adaptec SCSI controllers
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic79xx_osm.c,v 1.16 2006/10/12 01:30:58 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic79xx_osm.c,v 1.17 2006/11/16 01:32:50 christos Exp $");
#include <dev/ic/aic79xx_osm.h>
#include <dev/ic/aic7xxx_cam.h>
@@ -111,7 +111,7 @@ ahd_attach(struct ahd_softc *ahd)
static int
ahd_ioctl(struct scsipi_channel *channel, u_long cmd,
- caddr_t addr __unused, int flag __unused, struct proc *p __unused)
+ caddr_t addr, int flag, struct proc *p)
{
struct ahd_softc *ahd = (void *)channel->chan_adapter->adapt_dev;
int s, ret = ENOTTY;
@@ -732,7 +732,7 @@ ahd_timeout(void *arg)
}
int
-ahd_platform_alloc(struct ahd_softc *ahd, void *platform_arg __unused)
+ahd_platform_alloc(struct ahd_softc *ahd, void *platform_arg)
{
ahd->platform_data = malloc(sizeof(struct ahd_platform_data), M_DEVBUF,
M_NOWAIT /*| M_ZERO*/);
@@ -751,7 +751,7 @@ ahd_platform_free(struct ahd_softc *ahd)
}
int
-ahd_softc_comp(struct ahd_softc *lahd __unused, struct ahd_softc *rahd __unused)
+ahd_softc_comp(struct ahd_softc *lahd, struct ahd_softc *rahd)
{
/* We don't sort softcs under NetBSD so report equal always */
return (0);
@@ -791,7 +791,7 @@ ahd_platform_set_tags(struct ahd_softc *ahd,
void
ahd_send_async(struct ahd_softc *ahc, char channel, u_int target, u_int lun,
- ac_code code, void *opt_arg __unused)
+ ac_code code, void *opt_arg)
{
struct ahd_tmode_tstate *tstate;
struct ahd_initiator_tinfo *tinfo;
diff --git a/sys/dev/ic/aic79xx_osm.h b/sys/dev/ic/aic79xx_osm.h
index e9a7a525bda..7a89725d510 100644
--- a/sys/dev/ic/aic79xx_osm.h
+++ b/sys/dev/ic/aic79xx_osm.h
@@ -1,4 +1,4 @@
-/* $NetBSD: aic79xx_osm.h,v 1.11 2006/10/12 01:30:58 christos Exp $ */
+/* $NetBSD: aic79xx_osm.h,v 1.12 2006/11/16 01:32:50 christos Exp $ */
/*
* NetBSD platform specific driver option settings, data structures,
@@ -32,9 +32,9 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $NetBSD: aic79xx_osm.h,v 1.11 2006/10/12 01:30:58 christos Exp $
+ * $NetBSD: aic79xx_osm.h,v 1.12 2006/11/16 01:32:50 christos Exp $
*
- * //depot/aic7xxx/freebsd/dev/aic7xxx/aic79xx_osm.h#19 $$NetBSD: aic79xx_osm.h,v 1.11 2006/10/12 01:30:58 christos Exp $
+ * //depot/aic7xxx/freebsd/dev/aic7xxx/aic79xx_osm.h#19 $$NetBSD: aic79xx_osm.h,v 1.12 2006/11/16 01:32:50 christos Exp $
*
* $FreeBSD: src/sys/dev/aic7xxx/aic79xx_osm.h,v 1.9 2003/05/26 21:43:29 gibbs Exp $
*/
@@ -260,35 +260,35 @@ static __inline void ahd_list_lock(unsigned long *);
static __inline void ahd_list_unlock(unsigned long *);
static __inline void
-ahd_lockinit(struct ahd_softc *ahd __unused)
+ahd_lockinit(struct ahd_softc *ahd)
{
}
static __inline void
-ahd_lock(struct ahd_softc *ahd __unused, int *flags)
+ahd_lock(struct ahd_softc *ahd, int *flags)
{
*flags = splbio();
}
static __inline void
-ahd_unlock(struct ahd_softc *ahd __unused, int *flags)
+ahd_unlock(struct ahd_softc *ahd, int *flags)
{
splx(*flags);
}
/* Lock held during command completion to the upper layer */
static __inline void
-ahd_done_lockinit(struct ahd_softc *ahd __unused)
+ahd_done_lockinit(struct ahd_softc *ahd)
{
}
static __inline void
-ahd_done_lock(struct ahd_softc *ahd __unused, unsigned long *flags __unused)
+ahd_done_lock(struct ahd_softc *ahd, unsigned long *flags)
{
}
static __inline void
-ahd_done_unlock(struct ahd_softc *ahd __unused, unsigned long *flags __unused)
+ahd_done_unlock(struct ahd_softc *ahd, unsigned long *flags)
{
}
@@ -299,12 +299,12 @@ ahd_list_lockinit(void)
}
static __inline void
-ahd_list_lock(unsigned long *flags __unused)
+ahd_list_lock(unsigned long *flags)
{
}
static __inline void
-ahd_list_unlock(unsigned long *flags __unused)
+ahd_list_unlock(unsigned long *flags)
{
}
/****************************** OS Primitives *********************************/
@@ -362,7 +362,7 @@ uint32_t ahd_get_scsi_status(struct scb *scb)
}
static __inline
-void ahd_set_transaction_tag(struct scb *scb, int enabled __unused, u_int type)
+void ahd_set_transaction_tag(struct scb *scb, int enabled, u_int type)
{
scb->xs->xs_tag_type = type;
}
@@ -387,7 +387,7 @@ void ahd_set_residual(struct scb *scb, u_long resid)
static __inline
-void ahd_set_sense_residual(struct scb *scb __unused, u_long resid __unused)
+void ahd_set_sense_residual(struct scb *scb, u_long resid)
{
//scb->xs->sense.scsi_sense.extra_len = resid; /* ??? */
}
@@ -406,19 +406,19 @@ int ahd_perform_autosense(struct scb *scb)
}
static __inline uint32_t
-ahd_get_sense_bufsize(struct ahd_softc *ahd __unused, struct scb *scb __unused)
+ahd_get_sense_bufsize(struct ahd_softc *ahd, struct scb *scb)
{
return (sizeof(struct scsi_sense_data));
}
static __inline void
-ahd_freeze_simq(struct ahd_softc *ahd __unused)
+ahd_freeze_simq(struct ahd_softc *ahd)
{
/* do nothing for now */
}
static __inline void
-ahd_release_simq(struct ahd_softc *ahd __unused)
+ahd_release_simq(struct ahd_softc *ahd)
{
/* do nothing for now */
}
@@ -435,22 +435,22 @@ ahd_freeze_scb(struct scb *scb)
}
static __inline void
-ahd_platform_freeze_devq(struct ahd_softc *ahd __unused, struct scb *scb __unused)
+ahd_platform_freeze_devq(struct ahd_softc *ahd, struct scb *scb)
{
/* Nothing to do here for NetBSD */
}
static __inline int
-ahd_platform_abort_scbs(struct ahd_softc *ahd __unused, int target __unused,
- char channel __unused, int lun __unused, u_int tag __unused,
- role_t role __unused, uint32_t status __unused)
+ahd_platform_abort_scbs(struct ahd_softc *ahd, int target,
+ char channel, int lun, u_int tag,
+ role_t role, uint32_t status)
{
/* Nothing to do here for NetBSD */
return (0);
}
static __inline void
-ahd_platform_scb_free(struct ahd_softc *ahd __unused, struct scb *scb __unused)
+ahd_platform_scb_free(struct ahd_softc *ahd, struct scb *scb)
{
#ifdef __FreeBSD__
/* What do we do to generically handle driver resource shortages??? */
@@ -526,13 +526,13 @@ int aic7770_map_int(struct ahd_softc *, int);
static __inline void ahd_print_path(struct ahd_softc *, struct scb *);
static __inline void ahd_platform_dump_card_state(struct ahd_softc *);
static __inline void
-ahd_print_path(struct ahd_softc *ahd, struct scb *scb __unused)
+ahd_print_path(struct ahd_softc *ahd, struct scb *scb)
{
printf("%s:", ahd->sc_dev.dv_xname);
}
static __inline void
-ahd_platform_dump_card_state(struct ahd_softc *ahd __unused)
+ahd_platform_dump_card_state(struct ahd_softc *ahd)
{
/* Nothing to do here for NetBSD */
}
@@ -556,7 +556,7 @@ int ahd_detach(struct device *, int);
void ahd_platform_intr(void *);
static __inline void ahd_platform_flushwork(struct ahd_softc *);
static __inline void
-ahd_platform_flushwork(struct ahd_softc *ahd __unused)
+ahd_platform_flushwork(struct ahd_softc *ahd)
{
/* Nothing to do here for NetBSD */
}
diff --git a/sys/dev/ic/aic7xxx.c b/sys/dev/ic/aic7xxx.c
index fa8973d5a81..03afc732327 100644
--- a/sys/dev/ic/aic7xxx.c
+++ b/sys/dev/ic/aic7xxx.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aic7xxx.c,v 1.122 2006/10/12 01:30:58 christos Exp $ */
+/* $NetBSD: aic7xxx.c,v 1.123 2006/11/16 01:32:50 christos Exp $ */
/*
* Core routines and tables shareable across OS platforms.
@@ -39,7 +39,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGES.
*
- * $Id: aic7xxx.c,v 1.122 2006/10/12 01:30:58 christos Exp $
+ * $Id: aic7xxx.c,v 1.123 2006/11/16 01:32:50 christos Exp $
*
* //depot/aic7xxx/aic7xxx/aic7xxx.c#112 $
*
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic7xxx.c,v 1.122 2006/10/12 01:30:58 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic7xxx.c,v 1.123 2006/11/16 01:32:50 christos Exp $");
#include <dev/ic/aic7xxx_osm.h>
#include <dev/ic/aic7xxx_inline.h>
@@ -963,7 +963,7 @@ unpause:
}
void
-ahc_handle_scsiint(struct ahc_softc *ahc, u_int intstat __unused)
+ahc_handle_scsiint(struct ahc_softc *ahc, u_int intstat)
{
u_int scb_index;
u_int status0;
@@ -1889,7 +1889,7 @@ ahc_update_neg_request(struct ahc_softc *ahc, struct ahc_devinfo *devinfo,
void
ahc_set_syncrate(struct ahc_softc *ahc, struct ahc_devinfo *devinfo,
struct ahc_syncrate *syncrate, u_int period,
- u_int offset, u_int ppr_options, u_int type, int paused __unused)
+ u_int offset, u_int ppr_options, u_int type, int paused)
{
struct ahc_initiator_tinfo *tinfo;
struct ahc_tmode_tstate *tstate;
@@ -2015,7 +2015,7 @@ ahc_set_syncrate(struct ahc_softc *ahc, struct ahc_devinfo *devinfo,
*/
void
ahc_set_width(struct ahc_softc *ahc, struct ahc_devinfo *devinfo,
- u_int width, u_int type, int paused __unused)
+ u_int width, u_int type, int paused)
{
struct ahc_initiator_tinfo *tinfo;
struct ahc_tmode_tstate *tstate;
@@ -3558,7 +3558,7 @@ ahc_handle_msg_reject(struct ahc_softc *ahc, struct ahc_devinfo *devinfo)
*/
static void
ahc_handle_ign_wide_residue(struct ahc_softc *ahc,
- struct ahc_devinfo *devinfo __unused)
+ struct ahc_devinfo *devinfo)
{
u_int scb_index;
struct scb *scb;
@@ -5182,7 +5182,7 @@ ahc_busy_tcl(struct ahc_softc *ahc, u_int tcl, u_int scbid)
/************************** SCB and SCB queue management **********************/
int
ahc_match_scb(struct ahc_softc *ahc, struct scb *scb, int target,
- char channel, int lun, u_int tag __unused, role_t role __unused)
+ char channel, int lun, u_int tag, role_t role)
{
int targ = SCB_GET_TARGET(ahc, scb);
char chan = SCB_GET_CHANNEL(ahc, scb);
@@ -5499,7 +5499,7 @@ ahc_search_qinfifo(struct ahc_softc *ahc, int target, char channel,
int
ahc_search_untagged_queues(struct ahc_softc *ahc,
- struct scsipi_xfer *xs __unused, int target, char channel, int lun,
+ struct scsipi_xfer *xs, int target, char channel, int lun,
uint32_t status, ahc_search_action action)
{
struct scb *scb;
@@ -6077,7 +6077,7 @@ ahc_reset_channel(struct ahc_softc *ahc, char channel, int initiate_reset)
* Calculate the residual for a just completed SCB.
*/
void
-ahc_calc_residual(struct ahc_softc *ahc __unused, struct scb *scb)
+ahc_calc_residual(struct ahc_softc *ahc, struct scb *scb)
{
struct hardware_scb *hscb;
struct status_pkt *spkt;
@@ -6537,7 +6537,7 @@ ahc_download_instr(struct ahc_softc *ahc, u_int instrptr, uint8_t *dconsts)
int
ahc_print_register(ahc_reg_parse_entry_t *table, u_int num_entries,
- const char *name, u_int address __unused, u_int value,
+ const char *name, u_int address, u_int value,
u_int *cur_column, u_int wrap_point)
{
int printed;
diff --git a/sys/dev/ic/aic7xxx_inline.h b/sys/dev/ic/aic7xxx_inline.h
index 7af5cfc3622..04c4a1636a9 100644
--- a/sys/dev/ic/aic7xxx_inline.h
+++ b/sys/dev/ic/aic7xxx_inline.h
@@ -1,4 +1,4 @@
-/* $NetBSD: aic7xxx_inline.h,v 1.11 2006/10/12 01:30:59 christos Exp $ */
+/* $NetBSD: aic7xxx_inline.h,v 1.12 2006/11/16 01:32:51 christos Exp $ */
/*
* Inline routines shareable across OS platforms.
@@ -287,7 +287,7 @@ ahc_update_residual(struct ahc_softc *ahc, struct scb *scb)
* for the specified our_id/remote_id pair.
*/
static __inline struct ahc_initiator_tinfo *
-ahc_fetch_transinfo(struct ahc_softc *ahc, char channel __unused, u_int our_id,
+ahc_fetch_transinfo(struct ahc_softc *ahc, char channel, u_int our_id,
u_int remote_id, struct ahc_tmode_tstate **tstate)
{
/*
@@ -530,7 +530,7 @@ ahc_sync_qoutfifo(struct ahc_softc *ahc, int op)
}
static __inline void
-ahc_sync_tqinfifo(struct ahc_softc *ahc __unused, int op __unused)
+ahc_sync_tqinfifo(struct ahc_softc *ahc, int op)
{
#ifdef AHC_TARGET_MODE
if ((ahc->flags & AHC_TARGETROLE) != 0) {
diff --git a/sys/dev/ic/aic7xxx_osm.c b/sys/dev/ic/aic7xxx_osm.c
index 9931e10f4ac..7c219f9565c 100644
--- a/sys/dev/ic/aic7xxx_osm.c
+++ b/sys/dev/ic/aic7xxx_osm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aic7xxx_osm.c,v 1.23 2006/10/12 01:30:59 christos Exp $ */
+/* $NetBSD: aic7xxx_osm.c,v 1.24 2006/11/16 01:32:51 christos Exp $ */
/*
* Bus independent FreeBSD shim for the aic7xxx based adaptec SCSI controllers
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic7xxx_osm.c,v 1.23 2006/10/12 01:30:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic7xxx_osm.c,v 1.24 2006/11/16 01:32:51 christos Exp $");
#include <dev/ic/aic7xxx_osm.h>
#include <dev/ic/aic7xxx_inline.h>
@@ -243,8 +243,8 @@ ahc_done(struct ahc_softc *ahc, struct scb *scb)
}
static int
-ahc_ioctl(struct scsipi_channel *channel, u_long cmd, caddr_t addr __unused,
- int flag __unused, struct proc *p __unused)
+ahc_ioctl(struct scsipi_channel *channel, u_long cmd, caddr_t addr,
+ int flag, struct proc *p)
{
struct ahc_softc *ahc = (void *)channel->chan_adapter->adapt_dev;
int s, ret = ENOTTY;
@@ -1010,7 +1010,7 @@ ahc_platform_set_tags(struct ahc_softc *ahc,
}
int
-ahc_platform_alloc(struct ahc_softc *ahc, void *platform_arg __unused)
+ahc_platform_alloc(struct ahc_softc *ahc, void *platform_arg)
{
if (sizeof(struct ahc_platform_data) == 0)
return 0;
@@ -1030,7 +1030,7 @@ ahc_platform_free(struct ahc_softc *ahc)
}
int
-ahc_softc_comp(struct ahc_softc *lahc __unused, struct ahc_softc *rahc __unused)
+ahc_softc_comp(struct ahc_softc *lahc, struct ahc_softc *rahc)
{
return (0);
}
@@ -1058,7 +1058,7 @@ ahc_detach(struct device *self, int flags)
void
ahc_send_async(struct ahc_softc *ahc, char channel, u_int target, u_int lun,
- ac_code code, void *opt_arg __unused)
+ ac_code code, void *opt_arg)
{
struct ahc_tmode_tstate *tstate;
struct ahc_initiator_tinfo *tinfo;
diff --git a/sys/dev/ic/aic7xxx_osm.h b/sys/dev/ic/aic7xxx_osm.h
index e13e2249067..39ce1f0cbfa 100644
--- a/sys/dev/ic/aic7xxx_osm.h
+++ b/sys/dev/ic/aic7xxx_osm.h
@@ -1,4 +1,4 @@
-/* $NetBSD: aic7xxx_osm.h,v 1.16 2006/10/12 01:30:59 christos Exp $ */
+/* $NetBSD: aic7xxx_osm.h,v 1.17 2006/11/16 01:32:51 christos Exp $ */
/*
* NetBSD platform specific driver option settings, data structures,
@@ -263,35 +263,35 @@ static __inline void ahc_list_lock(unsigned long *);
static __inline void ahc_list_unlock(unsigned long *);
static __inline void
-ahc_lockinit(struct ahc_softc *ahc __unused)
+ahc_lockinit(struct ahc_softc *ahc)
{
}
static __inline void
-ahc_lock(struct ahc_softc *ahc __unused, unsigned long *flags)
+ahc_lock(struct ahc_softc *ahc, unsigned long *flags)
{
*flags = splbio();
}
static __inline void
-ahc_unlock(struct ahc_softc *ahc __unused, unsigned long *flags)
+ahc_unlock(struct ahc_softc *ahc, unsigned long *flags)
{
splx(*flags);
}
/* Lock held during command completion to the upper layer */
static __inline void
-ahc_done_lockinit(struct ahc_softc *ahc __unused)
+ahc_done_lockinit(struct ahc_softc *ahc)
{
}
static __inline void
-ahc_done_lock(struct ahc_softc *ahc __unused, unsigned long *flags __unused)
+ahc_done_lock(struct ahc_softc *ahc, unsigned long *flags)
{
}
static __inline void
-ahc_done_unlock(struct ahc_softc *ahc __unused, unsigned long *flags __unused)
+ahc_done_unlock(struct ahc_softc *ahc, unsigned long *flags)
{
}
@@ -302,12 +302,12 @@ ahc_list_lockinit()
}
static __inline void
-ahc_list_lock(unsigned long *flags __unused)
+ahc_list_lock(unsigned long *flags)
{
}
static __inline void
-ahc_list_unlock(unsigned long *flags __unused)
+ahc_list_unlock(unsigned long *flags)
{
}
/****************************** OS Primitives *********************************/
@@ -357,7 +357,7 @@ uint32_t ahc_get_scsi_status(struct scb *scb)
}
static __inline
-void ahc_set_transaction_tag(struct scb *scb, int enabled __unused, u_int type)
+void ahc_set_transaction_tag(struct scb *scb, int enabled, u_int type)
{
scb->xs->xs_tag_type = type;
}
@@ -381,7 +381,7 @@ void ahc_set_residual(struct scb *scb, u_long resid)
}
static __inline
-void ahc_set_sense_residual(struct scb *scb __unused, u_long resid __unused)
+void ahc_set_sense_residual(struct scb *scb, u_long resid)
{
#ifdef notdef
scb->io_ctx->csio.sense_resid = resid;
@@ -401,7 +401,7 @@ int ahc_perform_autosense(struct scb *scb)
}
static __inline uint32_t
-ahc_get_sense_bufsize(struct ahc_softc *ahc __unused, struct scb *scb __unused)
+ahc_get_sense_bufsize(struct ahc_softc *ahc, struct scb *scb)
{
return (sizeof(struct scsi_sense_data));
}
@@ -418,20 +418,20 @@ ahc_freeze_scb(struct scb *scb)
}
static __inline void
-ahc_platform_freeze_devq(struct ahc_softc *ahc __unused, struct scb *scb __unused)
+ahc_platform_freeze_devq(struct ahc_softc *ahc, struct scb *scb)
{
}
static __inline int
-ahc_platform_abort_scbs(struct ahc_softc *ahc __unused, int target __unused,
- char channel __unused, int lun __unused, u_int tag __unused,
- role_t role __unused, uint32_t status __unused)
+ahc_platform_abort_scbs(struct ahc_softc *ahc, int target,
+ char channel, int lun, u_int tag,
+ role_t role, uint32_t status)
{
return (0);
}
static __inline void
-ahc_platform_scb_free(struct ahc_softc *ahc __unused, struct scb *scb __unused)
+ahc_platform_scb_free(struct ahc_softc *ahc, struct scb *scb)
{
#ifdef __FreeBSD__
/* What do we do to generically handle driver resource shortages??? */
@@ -506,13 +506,13 @@ static __inline void ahc_print_path(struct ahc_softc *, struct scb *);
static __inline void ahc_platform_dump_card_state(struct ahc_softc *);
static __inline void
-ahc_print_path(struct ahc_softc *ahc, struct scb *scb __unused)
+ahc_print_path(struct ahc_softc *ahc, struct scb *scb)
{
printf("%s:", ahc->sc_dev.dv_xname);
}
static __inline void
-ahc_platform_dump_card_state(struct ahc_softc *ahc __unused)
+ahc_platform_dump_card_state(struct ahc_softc *ahc)
{
}
/**************************** Transfer Settings *******************************/
@@ -532,7 +532,7 @@ int ahc_detach(struct device *, int);
void ahc_platform_intr(void *);
static __inline void ahc_platform_flushwork(struct ahc_softc *);
static __inline void
-ahc_platform_flushwork(struct ahc_softc *ahc __unused)
+ahc_platform_flushwork(struct ahc_softc *ahc)
{
}
diff --git a/sys/dev/ic/ath.c b/sys/dev/ic/ath.c
index 35e4088cbdd..aa736042da0 100644
--- a/sys/dev/ic/ath.c
+++ b/sys/dev/ic/ath.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ath.c,v 1.78 2006/10/12 01:30:59 christos Exp $ */
+/* $NetBSD: ath.c,v 1.79 2006/11/16 01:32:51 christos Exp $ */
/*-
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -41,7 +41,7 @@
__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.104 2005/09/16 10:09:23 ru Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ath.c,v 1.78 2006/10/12 01:30:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ath.c,v 1.79 2006/11/16 01:32:51 christos Exp $");
#endif
/*
@@ -892,7 +892,7 @@ ath_intr(void *arg)
* function.
*/
static inline void
-ath_desc_swap(struct ath_desc *ds __unused)
+ath_desc_swap(struct ath_desc *ds)
{
#ifdef AH_NEED_DESC_SWAP
ds->ds_link = htole32(ds->ds_link);
@@ -905,7 +905,7 @@ ath_desc_swap(struct ath_desc *ds __unused)
}
static void
-ath_fatal_proc(void *arg, int pending __unused)
+ath_fatal_proc(void *arg, int pending)
{
struct ath_softc *sc = arg;
struct ifnet *ifp = &sc->sc_if;
@@ -915,7 +915,7 @@ ath_fatal_proc(void *arg, int pending __unused)
}
static void
-ath_rxorn_proc(void *arg, int pending __unused)
+ath_rxorn_proc(void *arg, int pending)
{
struct ath_softc *sc = arg;
struct ifnet *ifp = &sc->sc_if;
@@ -959,7 +959,7 @@ ath_bmiss_proc(void *arg, int pending)
}
static void
-ath_radar_proc(void *arg, int pending __unused)
+ath_radar_proc(void *arg, int pending)
{
struct ath_softc *sc = arg;
struct ifnet *ifp = &sc->sc_if;
@@ -2270,7 +2270,7 @@ ath_beacon_proc(void *arg, int pending)
* Reset the hardware after detecting beacons have stopped.
*/
static void
-ath_bstuck_proc(void *arg, int pending __unused)
+ath_bstuck_proc(void *arg, int pending)
{
struct ath_softc *sc = arg;
struct ifnet *ifp = &sc->sc_if;
@@ -4000,7 +4000,7 @@ txqactive(struct ath_hal *ah, int qnum)
* for a single hardware transmit queue (e.g. 5210 and 5211).
*/
static void
-ath_tx_proc_q0(void *arg, int npending __unused)
+ath_tx_proc_q0(void *arg, int npending)
{
struct ath_softc *sc = arg;
struct ifnet *ifp = &sc->sc_if;
@@ -4023,7 +4023,7 @@ ath_tx_proc_q0(void *arg, int npending __unused)
* for four hardware queues, 0-3 (e.g. 5212 w/ WME support).
*/
static void
-ath_tx_proc_q0123(void *arg, int npending __unused)
+ath_tx_proc_q0123(void *arg, int npending)
{
struct ath_softc *sc = arg;
struct ifnet *ifp = &sc->sc_if;
@@ -4060,7 +4060,7 @@ ath_tx_proc_q0123(void *arg, int npending __unused)
* Deferred processing of transmit interrupt.
*/
static void
-ath_tx_proc(void *arg, int npending __unused)
+ath_tx_proc(void *arg, int npending)
{
struct ath_softc *sc = arg;
struct ifnet *ifp = &sc->sc_if;
diff --git a/sys/dev/ic/athrate-sample.c b/sys/dev/ic/athrate-sample.c
index 62c92e27ec1..9d26bcb3980 100644
--- a/sys/dev/ic/athrate-sample.c
+++ b/sys/dev/ic/athrate-sample.c
@@ -1,4 +1,4 @@
-/* $NetBSD: athrate-sample.c,v 1.11 2006/10/12 01:30:59 christos Exp $ */
+/* $NetBSD: athrate-sample.c,v 1.12 2006/11/16 01:32:51 christos Exp $ */
/*-
* Copyright (c) 2005 John Bicket
@@ -41,7 +41,7 @@
__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/sample/sample.c,v 1.9 2005/07/22 16:50:17 sam Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: athrate-sample.c,v 1.11 2006/10/12 01:30:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: athrate-sample.c,v 1.12 2006/11/16 01:32:51 christos Exp $");
#endif
@@ -148,14 +148,14 @@ rate_to_ndx(struct sample_node *sn, int rate) {
}
void
-ath_rate_node_init(struct ath_softc *sc, struct ath_node *an __unused)
+ath_rate_node_init(struct ath_softc *sc, struct ath_node *an)
{
DPRINTF(sc, "%s:\n", __func__);
/* NB: assumed to be zero'd by caller */
}
void
-ath_rate_node_cleanup(struct ath_softc *sc, struct ath_node *an __unused)
+ath_rate_node_cleanup(struct ath_softc *sc, struct ath_node *an)
{
DPRINTF(sc, "%s:\n", __func__);
}
@@ -363,7 +363,7 @@ ath_rate_findrate(struct ath_softc *sc, struct ath_node *an,
void
ath_rate_setupxtxdesc(struct ath_softc *sc, struct ath_node *an,
- struct ath_desc *ds, int shortPreamble, u_int8_t rix __unused)
+ struct ath_desc *ds, int shortPreamble, u_int8_t rix)
{
struct sample_node *sn = ATH_NODE_SAMPLE(an);
int rateCode = -1;
diff --git a/sys/dev/ic/atw.c b/sys/dev/ic/atw.c
index 5e749d7a835..0f18bde9fa8 100644
--- a/sys/dev/ic/atw.c
+++ b/sys/dev/ic/atw.c
@@ -1,4 +1,4 @@
-/* $NetBSD: atw.c,v 1.123 2006/11/13 03:35:59 dyoung Exp $ */
+/* $NetBSD: atw.c,v 1.124 2006/11/16 01:32:51 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2002, 2003, 2004 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atw.c,v 1.123 2006/11/13 03:35:59 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atw.c,v 1.124 2006/11/16 01:32:51 christos Exp $");
#include "bpfilter.h"
@@ -2167,7 +2167,7 @@ atw_key_delete(struct ieee80211com *ic, const struct ieee80211_key *k)
static int
atw_key_set(struct ieee80211com *ic, const struct ieee80211_key *k,
- const u_int8_t mac[IEEE80211_ADDR_LEN] __unused)
+ const u_int8_t mac[IEEE80211_ADDR_LEN])
{
struct atw_softc *sc = ic->ic_ifp->if_softc;
@@ -2182,7 +2182,7 @@ atw_key_set(struct ieee80211com *ic, const struct ieee80211_key *k,
}
static void
-atw_key_update_begin(struct ieee80211com *ic __unused)
+atw_key_update_begin(struct ieee80211com *ic)
{
#ifdef ATW_DEBUG
struct ifnet *ifp = ic->ic_ifp;
diff --git a/sys/dev/ic/ax88190.c b/sys/dev/ic/ax88190.c
index 05080756afa..2bb02963272 100644
--- a/sys/dev/ic/ax88190.c
+++ b/sys/dev/ic/ax88190.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ax88190.c,v 1.6 2006/10/12 01:31:00 christos Exp $ */
+/* $NetBSD: ax88190.c,v 1.7 2006/11/16 01:32:51 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ax88190.c,v 1.6 2006/10/12 01:31:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ax88190.c,v 1.7 2006/11/16 01:32:51 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -186,7 +186,7 @@ ax88190_mii_writereg(self, phy, reg, val)
}
static void
-ax88190_mii_statchg(struct device *self __unused)
+ax88190_mii_statchg(struct device *self)
{
/* XXX */
diff --git a/sys/dev/ic/cac.c b/sys/dev/ic/cac.c
index 0825b7af48f..147d9bf53df 100644
--- a/sys/dev/ic/cac.c
+++ b/sys/dev/ic/cac.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cac.c,v 1.35 2006/10/12 01:31:00 christos Exp $ */
+/* $NetBSD: cac.c,v 1.36 2006/11/16 01:32:51 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cac.c,v 1.35 2006/10/12 01:31:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cac.c,v 1.36 2006/11/16 01:32:51 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -200,7 +200,7 @@ cac_init(struct cac_softc *sc, const char *intrstr, int startfw)
* Shut down all `cac' controllers.
*/
static void
-cac_shutdown(void *cookie __unused)
+cac_shutdown(void *cookie)
{
extern struct cfdriver cac_cd;
struct cac_softc *sc;
diff --git a/sys/dev/ic/ciss.c b/sys/dev/ic/ciss.c
index ab11b139221..b3e6f919f83 100644
--- a/sys/dev/ic/ciss.c
+++ b/sys/dev/ic/ciss.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ciss.c,v 1.5 2006/10/12 01:31:00 christos Exp $ */
+/* $NetBSD: ciss.c,v 1.6 2006/11/16 01:32:51 christos Exp $ */
/* $OpenBSD: ciss.c,v 1.14 2006/03/13 16:02:23 mickey Exp $ */
/*
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ciss.c,v 1.5 2006/10/12 01:31:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ciss.c,v 1.6 2006/11/16 01:32:51 christos Exp $");
/* #define CISS_DEBUG */
@@ -995,8 +995,8 @@ ciss_kthread(void *v)
#endif
static int
-ciss_scsi_ioctl(struct scsipi_channel *chan __unused, u_long cmd __unused,
- caddr_t addr __unused, int flag __unused, struct proc *p __unused)
+ciss_scsi_ioctl(struct scsipi_channel *chan, u_long cmd,
+ caddr_t addr, int flag, struct proc *p)
{
#if NBIO > 0
return ciss_ioctl(chan->chan_adapter->adapt_dev, cmd, addr);
diff --git a/sys/dev/ic/com.c b/sys/dev/ic/com.c
index c0741166c18..814a5be0430 100644
--- a/sys/dev/ic/com.c
+++ b/sys/dev/ic/com.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com.c,v 1.255 2006/10/12 01:31:00 christos Exp $ */
+/* $NetBSD: com.c,v 1.256 2006/11/16 01:32:51 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2004 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.255 2006/10/12 01:31:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.256 2006/11/16 01:32:51 christos Exp $");
#include "opt_com.h"
#include "opt_ddb.h"
@@ -290,7 +290,7 @@ const bus_size_t com_std_map[16] = COM_REG_16550;
/*ARGSUSED*/
int
-comspeed(long speed, long frequency, int type __unused)
+comspeed(long speed, long frequency, int type)
{
#define divrnd(n, q) (((n)*2/(q)+1)/2) /* divide and round off */
@@ -628,7 +628,7 @@ com_config(struct com_softc *sc)
}
int
-com_detach(struct device *self, int flags __unused)
+com_detach(struct device *self, int flags)
{
struct com_softc *sc = (struct com_softc *)self;
int maj, mn;
@@ -770,7 +770,7 @@ com_shutdown(struct com_softc *sc)
}
int
-comopen(dev_t dev, int flag, int mode __unused, struct lwp *l)
+comopen(dev_t dev, int flag, int mode, struct lwp *l)
{
struct com_softc *sc;
struct tty *tp;
@@ -926,7 +926,7 @@ bad:
}
int
-comclose(dev_t dev, int flag, int mode __unused, struct lwp *l __unused)
+comclose(dev_t dev, int flag, int mode, struct lwp *l)
{
struct com_softc *sc = device_lookup(&com_cd, COMUNIT(dev));
struct tty *tp = sc->sc_tty;
@@ -1770,7 +1770,7 @@ out:
* Stop output on a line.
*/
void
-comstop(struct tty *tp, int flag __unused)
+comstop(struct tty *tp, int flag)
{
struct com_softc *sc = device_lookup(&com_cd, COMUNIT(tp->t_dev));
int s;
@@ -2485,7 +2485,7 @@ comcnputc(dev_t dev, int c)
}
void
-comcnpollc(dev_t dev __unused, int on __unused)
+comcnpollc(dev_t dev, int on)
{
}
@@ -2543,7 +2543,7 @@ com_kgdb_attach(bus_space_tag_t iot, bus_addr_t iobase, int rate,
/* ARGSUSED */
int
-com_kgdb_getc(void *arg __unused)
+com_kgdb_getc(void *arg)
{
return (com_common_getc(NODEV, &comkgdbregs));
@@ -2551,7 +2551,7 @@ com_kgdb_getc(void *arg __unused)
/* ARGSUSED */
void
-com_kgdb_putc(void *arg __unused, int c)
+com_kgdb_putc(void *arg, int c)
{
com_common_putc(NODEV, &comkgdbregs, c);
diff --git a/sys/dev/ic/cy.c b/sys/dev/ic/cy.c
index a78d203dbde..5d9412dda38 100644
--- a/sys/dev/ic/cy.c
+++ b/sys/dev/ic/cy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cy.c,v 1.47 2006/10/12 01:31:00 christos Exp $ */
+/* $NetBSD: cy.c,v 1.48 2006/11/16 01:32:51 christos Exp $ */
/*
* cy.c
@@ -16,7 +16,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cy.c,v 1.47 2006/10/12 01:31:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cy.c,v 1.48 2006/11/16 01:32:51 christos Exp $");
#include <sys/param.h>
#include <sys/ioctl.h>
@@ -265,7 +265,7 @@ cy_getport(dev_t dev)
* open routine. returns zero if successful, else error code
*/
int
-cyopen(dev_t dev, int flag, int mode __unused, struct lwp *l)
+cyopen(dev_t dev, int flag, int mode, struct lwp *l)
{
struct cy_softc *sc;
struct cy_port *cy;
@@ -395,7 +395,7 @@ cyopen(dev_t dev, int flag, int mode __unused, struct lwp *l)
* close routine. returns zero if successful, else error code
*/
int
-cyclose(dev_t dev, int flag, int mode __unused, struct lwp *l __unused)
+cyclose(dev_t dev, int flag, int mode, struct lwp *l)
{
struct cy_softc *sc;
struct cy_port *cy;
@@ -612,7 +612,7 @@ out:
* stop output
*/
void
-cystop(struct tty *tp, int flag __unused)
+cystop(struct tty *tp, int flag)
{
struct cy_port *cy;
int s;
@@ -876,7 +876,7 @@ cy_modem_control(struct cy_softc *sc, struct cy_port *cy, int bits, int howto)
* This routine is common for multiple cards
*/
void
-cy_poll(void *arg __unused)
+cy_poll(void *arg)
{
int card, port;
struct cy_softc *sc;
diff --git a/sys/dev/ic/depca.c b/sys/dev/ic/depca.c
index b95a004a5de..76b06230dfe 100644
--- a/sys/dev/ic/depca.c
+++ b/sys/dev/ic/depca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: depca.c,v 1.13 2006/10/12 01:31:00 christos Exp $ */
+/* $NetBSD: depca.c,v 1.14 2006/11/16 01:32:51 christos Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: depca.c,v 1.13 2006/10/12 01:31:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: depca.c,v 1.14 2006/11/16 01:32:51 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -235,7 +235,7 @@ found:
}
int
-le_depca_match(struct device *parent __unused, struct cfdata *match, void *aux)
+le_depca_match(struct device *parent, struct cfdata *match, void *aux)
{
struct depca_attach_args *da = aux;
@@ -243,7 +243,7 @@ le_depca_match(struct device *parent __unused, struct cfdata *match, void *aux)
}
void
-le_depca_attach(struct device *parent, struct device *self, void *aux __unused)
+le_depca_attach(struct device *parent, struct device *self, void *aux)
{
struct depca_softc *dsc = (void *) parent;
struct le_depca_softc *lesc = (void *) self;
diff --git a/sys/dev/ic/dp8390.c b/sys/dev/ic/dp8390.c
index 72c87c8c853..41e0284bf0c 100644
--- a/sys/dev/ic/dp8390.c
+++ b/sys/dev/ic/dp8390.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dp8390.c,v 1.60 2006/10/12 01:31:00 christos Exp $ */
+/* $NetBSD: dp8390.c,v 1.61 2006/11/16 01:32:51 christos Exp $ */
/*
* Device driver for National Semiconductor DS8390/WD83C690 based ethernet
@@ -14,7 +14,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dp8390.c,v 1.60 2006/10/12 01:31:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dp8390.c,v 1.61 2006/11/16 01:32:51 christos Exp $");
#include "opt_ipkdb.h"
#include "opt_inet.h"
@@ -1302,7 +1302,7 @@ dp8390_activate(self, act)
}
int
-dp8390_detach(struct dp8390_softc *sc, int flags __unused)
+dp8390_detach(struct dp8390_softc *sc, int flags)
{
struct ifnet *ifp = &sc->sc_ec.ec_if;
diff --git a/sys/dev/ic/dpt.c b/sys/dev/ic/dpt.c
index 69a5b100576..073f78c6ad2 100644
--- a/sys/dev/ic/dpt.c
+++ b/sys/dev/ic/dpt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dpt.c,v 1.53 2006/11/08 00:17:09 elad Exp $ */
+/* $NetBSD: dpt.c,v 1.54 2006/11/16 01:32:51 christos Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dpt.c,v 1.53 2006/11/08 00:17:09 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dpt.c,v 1.54 2006/11/16 01:32:51 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -614,7 +614,7 @@ dpt_readcfg(struct dpt_softc *sc)
* we tell root that it's safe to power off).
*/
static void
-dpt_shutdown(void *cookie __unused)
+dpt_shutdown(void *cookie)
{
extern struct cfdriver dpt_cd;
struct dpt_softc *sc;
@@ -1115,7 +1115,7 @@ dpt_hba_inquire(struct dpt_softc *sc, struct eata_inquiry_data **ei)
}
int
-dptopen(dev_t dev, int flag __unused, int mode __unused, struct lwp *l __unused)
+dptopen(dev_t dev, int flag, int mode, struct lwp *l)
{
if (device_lookup(&dpt_cd, minor(dev)) == NULL)
@@ -1125,7 +1125,7 @@ dptopen(dev_t dev, int flag __unused, int mode __unused, struct lwp *l __unused)
}
int
-dptioctl(dev_t dev, u_long cmd, caddr_t data, int flag __unused, struct lwp *l)
+dptioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct dpt_softc *sc;
int rv;
diff --git a/sys/dev/ic/elink3.c b/sys/dev/ic/elink3.c
index f0fa12ade51..71a278ef468 100644
--- a/sys/dev/ic/elink3.c
+++ b/sys/dev/ic/elink3.c
@@ -1,4 +1,4 @@
-/* $NetBSD: elink3.c,v 1.119 2006/10/12 01:31:00 christos Exp $ */
+/* $NetBSD: elink3.c,v 1.120 2006/11/16 01:32:51 christos Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: elink3.c,v 1.119 2006/10/12 01:31:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: elink3.c,v 1.120 2006/11/16 01:32:51 christos Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -2081,7 +2081,7 @@ ep_activate(self, act)
* Detach a elink3 interface.
*/
int
-ep_detach(struct device *self, int flags __unused)
+ep_detach(struct device *self, int flags)
{
struct ep_softc *sc = (struct ep_softc *)self;
struct ifnet *ifp = &sc->sc_ethercom.ec_if;
diff --git a/sys/dev/ic/hd64570.c b/sys/dev/ic/hd64570.c
index 268168fc7d4..b6d90f23af2 100644
--- a/sys/dev/ic/hd64570.c
+++ b/sys/dev/ic/hd64570.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hd64570.c,v 1.33 2006/10/12 01:31:00 christos Exp $ */
+/* $NetBSD: hd64570.c,v 1.34 2006/11/16 01:32:51 christos Exp $ */
/*
* Copyright (c) 1999 Christian E. Hopps
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hd64570.c,v 1.33 2006/10/12 01:31:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hd64570.c,v 1.34 2006/11/16 01:32:51 christos Exp $");
#include "bpfilter.h"
#include "opt_inet.h"
@@ -801,7 +801,7 @@ sca_output(
struct ifnet *ifp,
struct mbuf *m,
struct sockaddr *dst,
- struct rtentry *rt0 __unused)
+ struct rtentry *rt0)
{
#ifdef ISO
struct hdlc_llc_header *llc;
@@ -1194,7 +1194,7 @@ X
}
static void
-sca_watchdog(struct ifnet *ifp __unused)
+sca_watchdog(struct ifnet *ifp)
{
}
@@ -1400,7 +1400,7 @@ sca_dmac_intr(sca_port_t *scp, u_int8_t isr)
}
static int
-sca_msci_intr(sca_port_t *scp, u_int8_t isr __unused)
+sca_msci_intr(sca_port_t *scp, u_int8_t isr)
{
u_int8_t st1, trc0;
diff --git a/sys/dev/ic/i82365.c b/sys/dev/ic/i82365.c
index 91aca32f29e..424d6ca99af 100644
--- a/sys/dev/ic/i82365.c
+++ b/sys/dev/ic/i82365.c
@@ -1,4 +1,4 @@
-/* $NetBSD: i82365.c,v 1.96 2006/10/12 01:31:00 christos Exp $ */
+/* $NetBSD: i82365.c,v 1.97 2006/11/16 01:32:51 christos Exp $ */
/*
* Copyright (c) 2004 Charles M. Hannum. All rights reserved.
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i82365.c,v 1.96 2006/10/12 01:31:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i82365.c,v 1.97 2006/11/16 01:32:51 christos Exp $");
#define PCICDEBUG
@@ -1129,7 +1129,7 @@ pcic_chip_io_alloc(pch, start, size, align, pcihp)
}
void
-pcic_chip_io_free(pcmcia_chipset_handle_t pch __unused,
+pcic_chip_io_free(pcmcia_chipset_handle_t pch,
struct pcmcia_io_handle *pcihp)
{
bus_space_tag_t iot = pcihp->iot;
diff --git a/sys/dev/ic/i82557.c b/sys/dev/ic/i82557.c
index c192f4b78e7..0848962c506 100644
--- a/sys/dev/ic/i82557.c
+++ b/sys/dev/ic/i82557.c
@@ -1,4 +1,4 @@
-/* $NetBSD: i82557.c,v 1.99 2006/10/12 01:31:00 christos Exp $ */
+/* $NetBSD: i82557.c,v 1.100 2006/11/16 01:32:51 christos Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999, 2001, 2002 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i82557.c,v 1.99 2006/10/12 01:31:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i82557.c,v 1.100 2006/11/16 01:32:51 christos Exp $");
#include "bpfilter.h"
#include "rnd.h"
@@ -2003,7 +2003,7 @@ fxp_mii_mediastatus(struct ifnet *ifp, struct ifmediareq *ifmr)
}
int
-fxp_80c24_mediachange(struct ifnet *ifp __unused)
+fxp_80c24_mediachange(struct ifnet *ifp)
{
/* Nothing to do here. */
@@ -2089,7 +2089,7 @@ fxp_mdi_read(struct device *self, int phy, int reg)
}
void
-fxp_statchg(struct device *self __unused)
+fxp_statchg(struct device *self)
{
/* Nothing to do. */
diff --git a/sys/dev/ic/i82586.c b/sys/dev/ic/i82586.c
index 242bddbb965..aad4755de7a 100644
--- a/sys/dev/ic/i82586.c
+++ b/sys/dev/ic/i82586.c
@@ -1,4 +1,4 @@
-/* $NetBSD: i82586.c,v 1.56 2006/10/12 01:31:00 christos Exp $ */
+/* $NetBSD: i82586.c,v 1.57 2006/11/16 01:32:51 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -144,7 +144,7 @@ Mode of operation:
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i82586.c,v 1.56 2006/10/12 01:31:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i82586.c,v 1.57 2006/11/16 01:32:51 christos Exp $");
#include "bpfilter.h"
@@ -1047,7 +1047,7 @@ bad:
static int
ie_readframe(
struct ie_softc *sc,
- int num __unused) /* frame number to read */
+ int num) /* frame number to read */
{
struct mbuf *m;
u_int16_t bstart, bend;
@@ -1782,7 +1782,7 @@ i82586_start_transceiver(sc)
void
i82586_stop(
struct ifnet *ifp,
- int disable __unused)
+ int disable)
{
struct ie_softc *sc = ifp->if_softc;
diff --git a/sys/dev/ic/icp.c b/sys/dev/ic/icp.c
index e4218c89b37..25d333065fb 100644
--- a/sys/dev/ic/icp.c
+++ b/sys/dev/ic/icp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: icp.c,v 1.21 2006/10/12 01:31:00 christos Exp $ */
+/* $NetBSD: icp.c,v 1.22 2006/11/16 01:32:51 christos Exp $ */
/*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -83,7 +83,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: icp.c,v 1.21 2006/10/12 01:31:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icp.c,v 1.22 2006/11/16 01:32:51 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1307,7 +1307,7 @@ static int icp_event_oldidx;
static int icp_event_lastidx;
gdt_evt_str *
-icp_store_event(struct icp_softc *icp __unused, u_int16_t source, u_int16_t idx,
+icp_store_event(struct icp_softc *icp, u_int16_t source, u_int16_t idx,
gdt_evt_data *evt)
{
gdt_evt_str *e;
@@ -1348,7 +1348,7 @@ icp_store_event(struct icp_softc *icp __unused, u_int16_t source, u_int16_t idx,
}
int
-icp_read_event(struct icp_softc *icp __unused, int handle, gdt_evt_str *estr)
+icp_read_event(struct icp_softc *icp, int handle, gdt_evt_str *estr)
{
gdt_evt_str *e;
int eindex, s;
@@ -1384,7 +1384,7 @@ icp_read_event(struct icp_softc *icp __unused, int handle, gdt_evt_str *estr)
}
void
-icp_readapp_event(struct icp_softc *icp __unused, u_int8_t application,
+icp_readapp_event(struct icp_softc *icp, u_int8_t application,
gdt_evt_str *estr)
{
gdt_evt_str *e;
@@ -1417,7 +1417,7 @@ icp_readapp_event(struct icp_softc *icp __unused, u_int8_t application,
}
void
-icp_clear_events(struct icp_softc *icp __unused)
+icp_clear_events(struct icp_softc *icp)
{
int s;
diff --git a/sys/dev/ic/icp_ioctl.c b/sys/dev/ic/icp_ioctl.c
index 5ef3fd63d35..8172d15e18f 100644
--- a/sys/dev/ic/icp_ioctl.c
+++ b/sys/dev/ic/icp_ioctl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: icp_ioctl.c,v 1.12 2006/11/08 00:17:09 elad Exp $ */
+/* $NetBSD: icp_ioctl.c,v 1.13 2006/11/16 01:32:51 christos Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: icp_ioctl.c,v 1.12 2006/11/08 00:17:09 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icp_ioctl.c,v 1.13 2006/11/16 01:32:51 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -110,7 +110,7 @@ static struct lock icp_ioctl_mutex =
LOCK_INITIALIZER(PRIBIO|PCATCH, "icplk", 0, 0);
static int
-icpopen(dev_t dev, int flag __unused, int mode __unused, struct lwp *l __unused)
+icpopen(dev_t dev, int flag, int mode, struct lwp *l)
{
if (device_lookup(&icp_cd, minor(dev)) == NULL)
@@ -120,7 +120,7 @@ icpopen(dev_t dev, int flag __unused, int mode __unused, struct lwp *l __unused)
}
static int
-icpioctl(dev_t dev, u_long cmd, caddr_t data, int flag __unused,
+icpioctl(dev_t dev, u_long cmd, caddr_t data, int flag,
struct lwp *l)
{
int error;
diff --git a/sys/dev/ic/icpsp.c b/sys/dev/ic/icpsp.c
index 297a1584573..5be9882267e 100644
--- a/sys/dev/ic/icpsp.c
+++ b/sys/dev/ic/icpsp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: icpsp.c,v 1.15 2006/10/12 01:31:00 christos Exp $ */
+/* $NetBSD: icpsp.c,v 1.16 2006/11/16 01:32:51 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: icpsp.c,v 1.15 2006/10/12 01:31:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icpsp.c,v 1.16 2006/11/16 01:32:51 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -89,7 +89,7 @@ static const struct icp_servicecb icpsp_servicecb = {
};
int
-icpsp_match(struct device *parent __unused, struct cfdata *match __unused,
+icpsp_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct icp_attach_args *icpa;
diff --git a/sys/dev/ic/interwave.c b/sys/dev/ic/interwave.c
index d02c962b165..206d8b108cd 100644
--- a/sys/dev/ic/interwave.c
+++ b/sys/dev/ic/interwave.c
@@ -1,4 +1,4 @@
-/* $NetBSD: interwave.c,v 1.29 2006/10/12 01:31:00 christos Exp $ */
+/* $NetBSD: interwave.c,v 1.30 2006/11/16 01:32:51 christos Exp $ */
/*
* Copyright (c) 1997, 1999 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: interwave.c,v 1.29 2006/10/12 01:31:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: interwave.c,v 1.30 2006/11/16 01:32:51 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -216,7 +216,7 @@ iwattach(struct iw_softc *sc)
}
int
-iwopen(struct iw_softc *sc, int flags __unused)
+iwopen(struct iw_softc *sc, int flags)
{
DPRINTF(("iwopen: sc %p\n", sc));
@@ -234,7 +234,7 @@ iwopen(struct iw_softc *sc, int flags __unused)
}
void
-iwclose(void *addr __unused)
+iwclose(void *addr)
{
DPRINTF(("iwclose sc %p\n", addr));
@@ -578,7 +578,7 @@ iw_set_speed(struct iw_softc *sc, u_long freq, char in)
/* Encoding. */
int
-iw_query_encoding(void *addr __unused, audio_encoding_t *fp)
+iw_query_encoding(void *addr, audio_encoding_t *fp)
{
/*
* LINEAR, ALAW, ULAW, ADPCM in HW, we'll use linear unsigned
@@ -698,7 +698,7 @@ iw_set_format(struct iw_softc *sc, u_long precision, int in)
}
int
-iw_set_params(void *addr, int setmode, int usemode __unused, audio_params_t *p,
+iw_set_params(void *addr, int setmode, int usemode, audio_params_t *p,
audio_params_t *q, stream_filter_list_t *pfil, stream_filter_list_t *rfil)
{
audio_params_t phw, rhw;
@@ -778,8 +778,8 @@ iw_set_params(void *addr, int setmode, int usemode __unused, audio_params_t *p,
int
-iw_round_blocksize(void *addr __unused, int blk, int mode __unused,
- const audio_params_t *param __unused)
+iw_round_blocksize(void *addr, int blk, int mode,
+ const audio_params_t *param)
{
/* Round to a multiple of the biggest sample size. */
@@ -882,7 +882,7 @@ iw_mixer_line_level(struct iw_softc *sc, int line, int levl, int levr)
}
int
-iw_commit_settings(void *addr __unused)
+iw_commit_settings(void *addr)
{
return 0;
@@ -1111,7 +1111,7 @@ iw_speaker_ctl(void *addr, int newstate)
}
int
-iw_getdev(void *addr __unused, struct audio_device *retp)
+iw_getdev(void *addr, struct audio_device *retp)
{
*retp = iw_device;
@@ -1119,7 +1119,7 @@ iw_getdev(void *addr __unused, struct audio_device *retp)
}
int
-iw_setfd(void *addr __unused, int flag __unused)
+iw_setfd(void *addr, int flag)
{
return 0;
@@ -1370,7 +1370,7 @@ iw_get_port(void *addr, mixer_ctrl_t *cp)
int
-iw_query_devinfo(void *addr __unused, mixer_devinfo_t *dip)
+iw_query_devinfo(void *addr, mixer_devinfo_t *dip)
{
switch (dip->index) {
@@ -1515,7 +1515,7 @@ iw_malloc(void *addr, int direction, size_t size,
}
void
-iw_free(void *addr __unused, void *ptr, struct malloc_type *pool)
+iw_free(void *addr, void *ptr, struct malloc_type *pool)
{
isa_free(ptr, pool);
}
@@ -1538,7 +1538,7 @@ iw_round_buffersize(void *addr, int direction, size_t size)
}
paddr_t
-iw_mappage(void *addr __unused, void *mem, off_t off, int prot)
+iw_mappage(void *addr, void *mem, off_t off, int prot)
{
return isa_mappage(mem, off, prot);
diff --git a/sys/dev/ic/isp.c b/sys/dev/ic/isp.c
index 4ebfca100dc..ae28cb43619 100644
--- a/sys/dev/ic/isp.c
+++ b/sys/dev/ic/isp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isp.c,v 1.109 2006/10/12 01:31:00 christos Exp $ */
+/* $NetBSD: isp.c,v 1.110 2006/11/16 01:32:51 christos Exp $ */
/*
* This driver, which is contained in NetBSD in the files:
*
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isp.c,v 1.109 2006/10/12 01:31:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isp.c,v 1.110 2006/11/16 01:32:51 christos Exp $");
#ifdef __NetBSD__
#include <dev/ic/isp_netbsd.h>
@@ -4308,7 +4308,7 @@ isp_parse_async(struct ispsoftc *isp, u_int16_t mbox)
static int
isp_handle_other_response(struct ispsoftc *isp, int type,
- isphdr_t *hp, u_int16_t *optrp __unused)
+ isphdr_t *hp, u_int16_t *optrp)
{
switch (type) {
case RQSTYPE_STATUS_CONT:
diff --git a/sys/dev/ic/isp_inline.h b/sys/dev/ic/isp_inline.h
index 07223c5dfe4..6570ff6a0b1 100644
--- a/sys/dev/ic/isp_inline.h
+++ b/sys/dev/ic/isp_inline.h
@@ -1,4 +1,4 @@
-/* $NetBSD: isp_inline.h,v 1.28 2006/10/12 01:31:00 christos Exp $ */
+/* $NetBSD: isp_inline.h,v 1.29 2006/11/16 01:32:51 christos Exp $ */
/*
* This driver, which is contained in NetBSD in the files:
*
@@ -620,7 +620,7 @@ isp_get_rio2(struct ispsoftc *isp, isp_rio2_t *r2src, isp_rio2_t *r2dst)
}
static INLINE void
-isp_put_icb(struct ispsoftc *isp __unused, isp_icb_t *Is, isp_icb_t *Id)
+isp_put_icb(struct ispsoftc *isp, isp_icb_t *Is, isp_icb_t *Id)
{
int i;
ISP_SWAP8(Is->icb_version, Is->_reserved0);
@@ -666,7 +666,7 @@ isp_put_icb(struct ispsoftc *isp __unused, isp_icb_t *Is, isp_icb_t *Id)
}
static INLINE void
-isp_get_pdb(struct ispsoftc *isp __unused, isp_pdb_t *src, isp_pdb_t *dst)
+isp_get_pdb(struct ispsoftc *isp, isp_pdb_t *src, isp_pdb_t *dst)
{
int i;
ISP_IOXGET_16(isp, &src->pdb_options, dst->pdb_options);
@@ -724,7 +724,7 @@ isp_get_pdb(struct ispsoftc *isp __unused, isp_pdb_t *src, isp_pdb_t *dst)
* CT_HDR canonicalization- only needed for SNS responses
*/
static INLINE void
-isp_get_ct_hdr(struct ispsoftc *isp __unused, ct_hdr_t *src, ct_hdr_t *dst)
+isp_get_ct_hdr(struct ispsoftc *isp, ct_hdr_t *src, ct_hdr_t *dst)
{
ISP_IOXGET_8(isp, &src->ct_revision, dst->ct_revision);
ISP_IOXGET_8(isp, &src->ct_portid[0], dst->ct_portid[0]);
@@ -749,7 +749,7 @@ isp_get_ct_hdr(struct ispsoftc *isp __unused, ct_hdr_t *src, ct_hdr_t *dst)
* isn't always 16 bit words.
*/
static INLINE void
-isp_put_sns_request(struct ispsoftc *isp __unused, sns_screq_t *src,
+isp_put_sns_request(struct ispsoftc *isp, sns_screq_t *src,
sns_screq_t *dst)
{
int i, nw = (int) src->snscb_sblen;
@@ -765,7 +765,7 @@ isp_put_sns_request(struct ispsoftc *isp __unused, sns_screq_t *src,
}
static INLINE void
-isp_put_gid_ft_request(struct ispsoftc *isp __unused, sns_gid_ft_req_t *src,
+isp_put_gid_ft_request(struct ispsoftc *isp, sns_gid_ft_req_t *src,
sns_gid_ft_req_t *dst)
{
ISP_IOXPUT_16(isp, src->snscb_rblen, &dst->snscb_rblen);
@@ -783,7 +783,7 @@ isp_put_gid_ft_request(struct ispsoftc *isp __unused, sns_gid_ft_req_t *src,
}
static INLINE void
-isp_put_gxn_id_request(struct ispsoftc *isp __unused, sns_gxn_id_req_t *src,
+isp_put_gxn_id_request(struct ispsoftc *isp, sns_gxn_id_req_t *src,
sns_gxn_id_req_t *dst)
{
ISP_IOXPUT_16(isp, src->snscb_rblen, &dst->snscb_rblen);
diff --git a/sys/dev/ic/isp_netbsd.c b/sys/dev/ic/isp_netbsd.c
index 3d552682623..dabf5bb5b0a 100644
--- a/sys/dev/ic/isp_netbsd.c
+++ b/sys/dev/ic/isp_netbsd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isp_netbsd.c,v 1.70 2006/10/12 01:31:01 christos Exp $ */
+/* $NetBSD: isp_netbsd.c,v 1.71 2006/11/16 01:32:51 christos Exp $ */
/*
* This driver, which is contained in NetBSD in the files:
*
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isp_netbsd.c,v 1.70 2006/10/12 01:31:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isp_netbsd.c,v 1.71 2006/11/16 01:32:51 christos Exp $");
#include <dev/ic/isp_netbsd.h>
#include <sys/scsiio.h>
@@ -234,7 +234,7 @@ ispminphys(struct buf *bp)
static int
ispioctl(struct scsipi_channel *chan, u_long cmd, caddr_t addr,
- int flag __unused, struct proc *p __unused)
+ int flag, struct proc *p)
{
struct ispsoftc *isp = (void *)chan->chan_adapter->adapt_dev;
int retval = ENOTTY;
diff --git a/sys/dev/ic/joy.c b/sys/dev/ic/joy.c
index 690c579eba6..cfde68fa091 100644
--- a/sys/dev/ic/joy.c
+++ b/sys/dev/ic/joy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: joy.c,v 1.12 2006/10/12 01:31:01 christos Exp $ */
+/* $NetBSD: joy.c,v 1.13 2006/11/16 01:32:51 christos Exp $ */
/*-
* Copyright (c) 1995 Jean-Marc Zucconi
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: joy.c,v 1.12 2006/10/12 01:31:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: joy.c,v 1.13 2006/11/16 01:32:51 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -91,7 +91,7 @@ joyattach(sc)
}
int
-joydetach(struct joy_softc *sc, int flags __unused)
+joydetach(struct joy_softc *sc, int flags)
{
int maj, mn;
@@ -104,7 +104,7 @@ joydetach(struct joy_softc *sc, int flags __unused)
}
int
-joyopen(dev_t dev, int flag __unused, int mode __unused, struct lwp *l __unused)
+joyopen(dev_t dev, int flag, int mode, struct lwp *l)
{
int unit = JOYUNIT(dev);
int i = JOYPART(dev);
@@ -125,8 +125,8 @@ joyopen(dev_t dev, int flag __unused, int mode __unused, struct lwp *l __unused)
}
int
-joyclose(dev_t dev, int flag __unused, int mode __unused,
- struct lwp *l __unused)
+joyclose(dev_t dev, int flag, int mode,
+ struct lwp *l)
{
int unit = JOYUNIT(dev);
int i = JOYPART(dev);
@@ -137,7 +137,7 @@ joyclose(dev_t dev, int flag __unused, int mode __unused,
}
int
-joyread(dev_t dev, struct uio *uio, int flag __unused)
+joyread(dev_t dev, struct uio *uio, int flag)
{
int unit = JOYUNIT(dev);
struct joy_softc *sc = joy_cd.cd_devs[unit];
@@ -179,8 +179,8 @@ joyread(dev_t dev, struct uio *uio, int flag __unused)
}
int
-joyioctl(dev_t dev, u_long cmd, caddr_t data, int flag __unused,
- struct lwp *l __unused)
+joyioctl(dev_t dev, u_long cmd, caddr_t data, int flag,
+ struct lwp *l)
{
int unit = JOYUNIT(dev);
struct joy_softc *sc = joy_cd.cd_devs[unit];
diff --git a/sys/dev/ic/lance.c b/sys/dev/ic/lance.c
index 57adb1ccf86..f74a56e50f3 100644
--- a/sys/dev/ic/lance.c
+++ b/sys/dev/ic/lance.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lance.c,v 1.36 2006/10/12 01:31:01 christos Exp $ */
+/* $NetBSD: lance.c,v 1.37 2006/11/16 01:32:51 christos Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lance.c,v 1.36 2006/10/12 01:31:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lance.c,v 1.37 2006/11/16 01:32:51 christos Exp $");
#include "bpfilter.h"
#include "rnd.h"
@@ -284,7 +284,7 @@ lance_reset(sc)
}
void
-lance_stop(struct ifnet *ifp, int disable __unused)
+lance_stop(struct ifnet *ifp, int disable)
{
struct lance_softc *sc = ifp->if_softc;
diff --git a/sys/dev/ic/ld_aac.c b/sys/dev/ic/ld_aac.c
index 4d094a6323b..ca657c3a1e2 100644
--- a/sys/dev/ic/ld_aac.c
+++ b/sys/dev/ic/ld_aac.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_aac.c,v 1.12 2006/10/12 01:31:01 christos Exp $ */
+/* $NetBSD: ld_aac.c,v 1.13 2006/11/16 01:32:51 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_aac.c,v 1.12 2006/10/12 01:31:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_aac.c,v 1.13 2006/11/16 01:32:51 christos Exp $");
#include "rnd.h"
@@ -80,8 +80,8 @@ CFATTACH_DECL(ld_aac, sizeof(struct ld_aac_softc),
ld_aac_match, ld_aac_attach, NULL, NULL);
static int
-ld_aac_match(struct device *parent __unused, struct cfdata *match __unused,
- void *aux __unused)
+ld_aac_match(struct device *parent, struct cfdata *match,
+ void *aux)
{
return (1);
diff --git a/sys/dev/ic/ld_cac.c b/sys/dev/ic/ld_cac.c
index c4b9e640db5..a463ccc1b24 100644
--- a/sys/dev/ic/ld_cac.c
+++ b/sys/dev/ic/ld_cac.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_cac.c,v 1.14 2006/10/12 01:31:01 christos Exp $ */
+/* $NetBSD: ld_cac.c,v 1.15 2006/11/16 01:32:51 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_cac.c,v 1.14 2006/10/12 01:31:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_cac.c,v 1.15 2006/11/16 01:32:51 christos Exp $");
#include "rnd.h"
@@ -84,8 +84,8 @@ CFATTACH_DECL(ld_cac, sizeof(struct ld_cac_softc),
ld_cac_match, ld_cac_attach, NULL, NULL);
int
-ld_cac_match(struct device *parent __unused, struct cfdata *match __unused,
- void *aux __unused)
+ld_cac_match(struct device *parent, struct cfdata *match,
+ void *aux)
{
return (1);
diff --git a/sys/dev/ic/ld_icp.c b/sys/dev/ic/ld_icp.c
index 229174784a2..714f94d5769 100644
--- a/sys/dev/ic/ld_icp.c
+++ b/sys/dev/ic/ld_icp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_icp.c,v 1.15 2006/10/12 01:31:01 christos Exp $ */
+/* $NetBSD: ld_icp.c,v 1.16 2006/11/16 01:32:51 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_icp.c,v 1.15 2006/10/12 01:31:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_icp.c,v 1.16 2006/11/16 01:32:51 christos Exp $");
#include "rnd.h"
@@ -92,7 +92,7 @@ static const struct icp_servicecb ld_icp_servicecb = {
};
int
-ld_icp_match(struct device *parent __unused, struct cfdata *match __unused,
+ld_icp_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct icp_attach_args *icpa;
diff --git a/sys/dev/ic/ld_mlx.c b/sys/dev/ic/ld_mlx.c
index c86dbe67a2e..e1092294fdc 100644
--- a/sys/dev/ic/ld_mlx.c
+++ b/sys/dev/ic/ld_mlx.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_mlx.c,v 1.12 2006/10/12 01:31:01 christos Exp $ */
+/* $NetBSD: ld_mlx.c,v 1.13 2006/11/16 01:32:51 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_mlx.c,v 1.12 2006/10/12 01:31:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_mlx.c,v 1.13 2006/11/16 01:32:51 christos Exp $");
#include "rnd.h"
@@ -85,8 +85,8 @@ CFATTACH_DECL(ld_mlx, sizeof(struct ld_mlx_softc),
ld_mlx_match, ld_mlx_attach, ld_mlx_detach, NULL);
static int
-ld_mlx_match(struct device *parent __unused, struct cfdata *match __unused,
- void *aux __unused)
+ld_mlx_match(struct device *parent, struct cfdata *match,
+ void *aux)
{
return (1);
diff --git a/sys/dev/ic/lpt.c b/sys/dev/ic/lpt.c
index 58b8ba1c2a6..8352454a01e 100644
--- a/sys/dev/ic/lpt.c
+++ b/sys/dev/ic/lpt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lpt.c,v 1.67 2006/10/12 01:31:01 christos Exp $ */
+/* $NetBSD: lpt.c,v 1.68 2006/11/16 01:32:51 christos Exp $ */
/*
* Copyright (c) 1993, 1994 Charles M. Hannum.
@@ -54,7 +54,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lpt.c,v 1.67 2006/10/12 01:31:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpt.c,v 1.68 2006/11/16 01:32:51 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -127,7 +127,7 @@ lpt_attach_subr(sc)
* Reset the printer, then wait until it's selected and not busy.
*/
int
-lptopen(dev_t dev, int flag __unused, int mode __unused, struct lwp *l __unused)
+lptopen(dev_t dev, int flag, int mode, struct lwp *l)
{
u_char flags = LPTFLAGS(dev);
struct lpt_softc *sc;
@@ -248,8 +248,8 @@ lptwakeup(arg)
* Close the device, and free the local line buffer.
*/
int
-lptclose(dev_t dev, int flag __unused, int mode __unused,
- struct lwp *l __unused)
+lptclose(dev_t dev, int flag, int mode,
+ struct lwp *l)
{
struct lpt_softc *sc = device_lookup(&lpt_cd, LPTUNIT(dev));
bus_space_tag_t iot = sc->sc_iot;
@@ -342,7 +342,7 @@ lptpushbytes(sc)
* chars moved to the output queue.
*/
int
-lptwrite(dev_t dev, struct uio *uio, int flags __unused)
+lptwrite(dev_t dev, struct uio *uio, int flags)
{
struct lpt_softc *sc = device_lookup(&lpt_cd, LPTUNIT(dev));
size_t n;
@@ -409,8 +409,8 @@ lptintr(arg)
}
int
-lptioctl(dev_t dev __unused, u_long cmd __unused, caddr_t data __unused,
- int flag __unused, struct lwp *l __unused)
+lptioctl(dev_t dev, u_long cmd, caddr_t data,
+ int flag, struct lwp *l)
{
return ENODEV;
}
diff --git a/sys/dev/ic/mb86950.c b/sys/dev/ic/mb86950.c
index f0a0813197d..23e22eb261c 100644
--- a/sys/dev/ic/mb86950.c
+++ b/sys/dev/ic/mb86950.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mb86950.c,v 1.7 2006/10/12 01:31:01 christos Exp $ */
+/* $NetBSD: mb86950.c,v 1.8 2006/11/16 01:32:51 christos Exp $ */
/*
* All Rights Reserved, Copyright (C) Fujitsu Limited 1995
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mb86950.c,v 1.7 2006/10/12 01:31:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mb86950.c,v 1.8 2006/11/16 01:32:51 christos Exp $");
/*
* Device driver for Fujitsu mb86950 based Ethernet cards.
@@ -270,8 +270,8 @@ mb86950_drain_fifo(sc)
* Install interface into kernel networking data structures
*/
void
-mb86950_config(struct mb86950_softc *sc, int *media __unused,
- int nmedia __unused, int defmedia __unused)
+mb86950_config(struct mb86950_softc *sc, int *media,
+ int nmedia, int defmedia)
{
struct ifnet *ifp = &sc->sc_ec.ec_if;
bus_space_tag_t bst = sc->sc_bst;
diff --git a/sys/dev/ic/mb89352.c b/sys/dev/ic/mb89352.c
index 6ae9b699185..02fe42e9dd9 100644
--- a/sys/dev/ic/mb89352.c
+++ b/sys/dev/ic/mb89352.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mb89352.c,v 1.44 2006/10/12 01:31:01 christos Exp $ */
+/* $NetBSD: mb89352.c,v 1.45 2006/11/16 01:32:51 christos Exp $ */
/* NecBSD: mb89352.c,v 1.4 1998/03/14 07:31:20 kmatsuda Exp */
/*-
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mb89352.c,v 1.44 2006/10/12 01:31:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mb89352.c,v 1.45 2006/11/16 01:32:51 christos Exp $");
#ifdef DDB
#define integrate
@@ -457,7 +457,7 @@ spc_init(struct spc_softc *sc, int bus_reset)
}
void
-spc_free_acb(struct spc_softc *sc, struct spc_acb *acb, int flags __unused)
+spc_free_acb(struct spc_softc *sc, struct spc_acb *acb, int flags)
{
int s;
@@ -650,7 +650,7 @@ spc_sched_msgout(struct spc_softc *sc, u_char m)
* Set synchronous transfer offset and period.
*/
integrate void
-spc_setsync(struct spc_softc *sc __unused, struct spc_tinfo *ti __unused)
+spc_setsync(struct spc_softc *sc, struct spc_tinfo *ti)
{
#if SPC_USE_SYNCHRONOUS
bus_space_tag_t iot = sc->sc_iot;
diff --git a/sys/dev/ic/mlx.c b/sys/dev/ic/mlx.c
index c9125b095ae..d712262e2a9 100644
--- a/sys/dev/ic/mlx.c
+++ b/sys/dev/ic/mlx.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mlx.c,v 1.47 2006/11/08 00:17:09 elad Exp $ */
+/* $NetBSD: mlx.c,v 1.48 2006/11/16 01:32:51 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mlx.c,v 1.47 2006/11/08 00:17:09 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mlx.c,v 1.48 2006/11/16 01:32:51 christos Exp $");
#include "ld.h"
@@ -658,7 +658,7 @@ mlx_print(void *aux, const char *pnp)
* Shut down all configured `mlx' devices.
*/
static void
-mlx_shutdown(void *cookie __unused)
+mlx_shutdown(void *cookie)
{
struct mlx_softc *mlx;
int i;
@@ -693,7 +693,7 @@ mlx_adjqparam(struct mlx_softc *mlx, int mpu, int slop)
* Accept an open operation on the control device.
*/
int
-mlxopen(dev_t dev, int flag __unused, int mode __unused, struct lwp *l __unused)
+mlxopen(dev_t dev, int flag, int mode, struct lwp *l)
{
struct mlx_softc *mlx;
@@ -712,8 +712,8 @@ mlxopen(dev_t dev, int flag __unused, int mode __unused, struct lwp *l __unused)
* Accept the last close on the control device.
*/
int
-mlxclose(dev_t dev, int flag __unused, int mode __unused,
- struct lwp *l __unused)
+mlxclose(dev_t dev, int flag, int mode,
+ struct lwp *l)
{
struct mlx_softc *mlx;
@@ -726,8 +726,8 @@ mlxclose(dev_t dev, int flag __unused, int mode __unused,
* Handle control operations.
*/
int
-mlxioctl(dev_t dev, u_long cmd, caddr_t data, int flag __unused,
- struct lwp *l __unused)
+mlxioctl(dev_t dev, u_long cmd, caddr_t data, int flag,
+ struct lwp *l)
{
struct mlx_softc *mlx;
struct mlx_rebuild_request *rb;
@@ -951,7 +951,7 @@ mlxioctl(dev_t dev, u_long cmd, caddr_t data, int flag __unused,
* Check for commands that have timed out.
*/
static void
-mlx_periodic_create(void *cookie __unused)
+mlx_periodic_create(void *cookie)
{
int rv;
@@ -964,7 +964,7 @@ mlx_periodic_create(void *cookie __unused)
}
static void
-mlx_periodic_thread(void *cookie __unused)
+mlx_periodic_thread(void *cookie)
{
struct mlx_softc *mlx;
int i;
diff --git a/sys/dev/ic/mpu.c b/sys/dev/ic/mpu.c
index 30b46e0bf6e..7647fa3d229 100644
--- a/sys/dev/ic/mpu.c
+++ b/sys/dev/ic/mpu.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mpu.c,v 1.13 2006/10/12 01:31:01 christos Exp $ */
+/* $NetBSD: mpu.c,v 1.14 2006/11/16 01:32:51 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpu.c,v 1.13 2006/10/12 01:31:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpu.c,v 1.14 2006/11/16 01:32:51 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -162,8 +162,8 @@ mpu_reset(sc)
}
int
-mpu_open(void *addr, int flags __unused, void (*iintr)(void *, int),
- void (*ointr)(void *) __unused, void *arg)
+mpu_open(void *addr, int flags, void (*iintr)(void *, int),
+ void (*ointr)(void *), void *arg)
{
struct mpu_softc *sc = addr;
diff --git a/sys/dev/ic/mtd803.c b/sys/dev/ic/mtd803.c
index 3c22087acf7..42ce074056a 100644
--- a/sys/dev/ic/mtd803.c
+++ b/sys/dev/ic/mtd803.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mtd803.c,v 1.11 2006/10/12 01:31:01 christos Exp $ */
+/* $NetBSD: mtd803.c,v 1.12 2006/11/16 01:32:51 christos Exp $ */
/*-
*
@@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mtd803.c,v 1.11 2006/10/12 01:31:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mtd803.c,v 1.12 2006/11/16 01:32:51 christos Exp $");
#include "bpfilter.h"
@@ -414,7 +414,7 @@ mtd_init_desc(sc)
void
-mtd_mii_statchg(struct device *self __unused)
+mtd_mii_statchg(struct device *self)
{
/*struct mtd_softc *sc = (void *)self;*/
@@ -423,7 +423,7 @@ mtd_mii_statchg(struct device *self __unused)
int
-mtd_mii_readreg(struct device *self, int phy __unused, int reg)
+mtd_mii_readreg(struct device *self, int phy, int reg)
{
struct mtd_softc *sc = (void *)self;
@@ -432,7 +432,7 @@ mtd_mii_readreg(struct device *self, int phy __unused, int reg)
void
-mtd_mii_writereg(struct device *self, int phy __unused, int reg, int val)
+mtd_mii_writereg(struct device *self, int phy, int reg, int val)
{
struct mtd_softc *sc = (void *)self;
diff --git a/sys/dev/ic/ncr5380sbc.c b/sys/dev/ic/ncr5380sbc.c
index 1e1a5dda00f..b6a9f438235 100644
--- a/sys/dev/ic/ncr5380sbc.c
+++ b/sys/dev/ic/ncr5380sbc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ncr5380sbc.c,v 1.60 2006/10/12 01:31:01 christos Exp $ */
+/* $NetBSD: ncr5380sbc.c,v 1.61 2006/11/16 01:32:51 christos Exp $ */
/*
* Copyright (c) 1995 David Jones, Gordon W. Ross
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ncr5380sbc.c,v 1.60 2006/10/12 01:31:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ncr5380sbc.c,v 1.61 2006/11/16 01:32:51 christos Exp $");
#include "opt_ddb.h"
@@ -2615,7 +2615,7 @@ ncr5380_attach(sc)
}
int
-ncr5380_detach(struct ncr5380_softc *sc __unused, int flags __unused)
+ncr5380_detach(struct ncr5380_softc *sc, int flags)
{
return (EOPNOTSUPP);
diff --git a/sys/dev/ic/ncr53c9x.c b/sys/dev/ic/ncr53c9x.c
index 38d5256a41a..fec048629e2 100644
--- a/sys/dev/ic/ncr53c9x.c
+++ b/sys/dev/ic/ncr53c9x.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ncr53c9x.c,v 1.122 2006/10/12 01:31:01 christos Exp $ */
+/* $NetBSD: ncr53c9x.c,v 1.123 2006/11/16 01:32:52 christos Exp $ */
/*-
* Copyright (c) 1998, 2002 The NetBSD Foundation, Inc.
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ncr53c9x.c,v 1.122 2006/10/12 01:31:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ncr53c9x.c,v 1.123 2006/11/16 01:32:52 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -792,7 +792,7 @@ ncr53c9x_select(sc, ecb)
}
void
-ncr53c9x_free_ecb(struct ncr53c9x_softc *sc __unused,
+ncr53c9x_free_ecb(struct ncr53c9x_softc *sc,
struct ncr53c9x_ecb *ecb)
{
int s;
@@ -805,7 +805,7 @@ ncr53c9x_free_ecb(struct ncr53c9x_softc *sc __unused,
}
struct ncr53c9x_ecb *
-ncr53c9x_get_ecb(struct ncr53c9x_softc *sc __unused, int flags __unused)
+ncr53c9x_get_ecb(struct ncr53c9x_softc *sc, int flags)
{
struct ncr53c9x_ecb *ecb;
int s;
@@ -1018,8 +1018,8 @@ ncr53c9x_poll(sc, xs, count)
}
int
-ncr53c9x_ioctl(struct scsipi_channel *chan, u_long cmd, caddr_t arg __unused,
- int flag __unused, struct proc *p __unused)
+ncr53c9x_ioctl(struct scsipi_channel *chan, u_long cmd, caddr_t arg,
+ int flag, struct proc *p)
{
struct ncr53c9x_softc *sc = (void *)chan->chan_adapter->adapt_dev;
int s, error = 0;
diff --git a/sys/dev/ic/ne2000.c b/sys/dev/ic/ne2000.c
index 979f3c3d4f1..8757829b7d4 100644
--- a/sys/dev/ic/ne2000.c
+++ b/sys/dev/ic/ne2000.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ne2000.c,v 1.51 2006/10/12 01:31:01 christos Exp $ */
+/* $NetBSD: ne2000.c,v 1.52 2006/11/16 01:32:52 christos Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ne2000.c,v 1.51 2006/10/12 01:31:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ne2000.c,v 1.52 2006/11/16 01:32:52 christos Exp $");
#include "opt_ipkdb.h"
@@ -705,7 +705,7 @@ ne2000_read_hdr(sc, buf, hdr)
}
int
-ne2000_test_mem(struct dp8390_softc *sc __unused)
+ne2000_test_mem(struct dp8390_softc *sc)
{
/* Noop. */
diff --git a/sys/dev/ic/ninjaata32.c b/sys/dev/ic/ninjaata32.c
index eb08f16c730..88fdd134541 100644
--- a/sys/dev/ic/ninjaata32.c
+++ b/sys/dev/ic/ninjaata32.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ninjaata32.c,v 1.4 2006/10/12 20:16:59 dogcow Exp $ */
+/* $NetBSD: ninjaata32.c,v 1.5 2006/11/16 01:32:52 christos Exp $ */
/*
* Copyright (c) 2006 ITOH Yasufumi <itohy@NetBSD.org>.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ninjaata32.c,v 1.4 2006/10/12 20:16:59 dogcow Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ninjaata32.c,v 1.5 2006/11/16 01:32:52 christos Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -370,7 +370,7 @@ njata32_setup_channel(chp)
* map DMA buffer
*/
int
-njata32_dma_init(void *v, int channel __unused, int drive, void *databuf,
+njata32_dma_init(void *v, int channel, int drive, void *databuf,
size_t datalen, int flags)
{
struct njata32_softc *sc = v;
@@ -432,7 +432,7 @@ njata32_dma_init(void *v, int channel __unused, int drive, void *databuf,
* size: xferlen
*/
void
-njata32_piobm_start(void *v, int channel __unused, int drive __unused,
+njata32_piobm_start(void *v, int channel, int drive,
int skip, int xferlen, int flags)
{
struct njata32_softc *sc = v;
@@ -538,7 +538,7 @@ njata32_piobm_start(void *v, int channel __unused, int drive __unused,
* end of DMA
*/
int
-njata32_dma_finish(void *v, int channel __unused, int drive __unused,
+njata32_dma_finish(void *v, int channel, int drive,
int force)
{
struct njata32_softc *sc = v;
@@ -636,7 +636,7 @@ njata32_dma_finish(void *v, int channel __unused, int drive __unused,
* unmap DMA buffer
*/
void
-njata32_piobm_done(void *v, int channel __unused, int drive)
+njata32_piobm_done(void *v, int channel, int drive)
{
struct njata32_softc *sc = v;
struct njata32_device *dev = &sc->sc_dev[drive];
diff --git a/sys/dev/ic/ninjascsi32.c b/sys/dev/ic/ninjascsi32.c
index d8dfb87aa97..c76fc81e24a 100644
--- a/sys/dev/ic/ninjascsi32.c
+++ b/sys/dev/ic/ninjascsi32.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ninjascsi32.c,v 1.7 2006/10/12 01:31:01 christos Exp $ */
+/* $NetBSD: ninjascsi32.c,v 1.8 2006/11/16 01:32:52 christos Exp $ */
/*-
* Copyright (c) 2004, 2006 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ninjascsi32.c,v 1.7 2006/10/12 01:31:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ninjascsi32.c,v 1.8 2006/11/16 01:32:52 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1400,7 +1400,7 @@ njsc32_reset_detected(struct njsc32_softc *sc)
static int
njsc32_scsipi_ioctl(struct scsipi_channel *chan, u_long cmd,
- caddr_t addr __unused, int flag __unused, struct proc *p __unused)
+ caddr_t addr, int flag, struct proc *p)
{
struct njsc32_softc *sc = (void *)chan->chan_adapter->adapt_dev;
diff --git a/sys/dev/ic/opl.c b/sys/dev/ic/opl.c
index e87bc5edeb8..cedf0e0dff6 100644
--- a/sys/dev/ic/opl.c
+++ b/sys/dev/ic/opl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: opl.c,v 1.30 2006/10/12 01:31:01 christos Exp $ */
+/* $NetBSD: opl.c,v 1.31 2006/11/16 01:32:52 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opl.c,v 1.30 2006/10/12 01:31:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opl.c,v 1.31 2006/11/16 01:32:52 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -399,7 +399,7 @@ opl_reset(sc)
}
int
-oplsyn_open(midisyn *ms, int flags __unused)
+oplsyn_open(midisyn *ms, int flags)
{
struct opl_softc *sc = ms->data;
@@ -610,7 +610,7 @@ oplsyn_setv(midisyn *ms,
}
void
-oplsyn_releasev(midisyn *ms, uint_fast16_t voice, uint_fast8_t vel __unused)
+oplsyn_releasev(midisyn *ms, uint_fast16_t voice, uint_fast8_t vel)
{
struct opl_softc *sc = ms->data;
struct opl_voice *v;
@@ -663,8 +663,8 @@ oplsyn_programchange(midisyn *ms, uint_fast8_t chan, uint_fast8_t prog)
}
void
-oplsyn_loadpatch(midisyn *ms __unused, struct sysex_info *sysex __unused,
- struct uio *uio __unused)
+oplsyn_loadpatch(midisyn *ms, struct sysex_info *sysex,
+ struct uio *uio)
{
#if 0
struct opl_softc *sc = ms->data;
diff --git a/sys/dev/ic/pcdisplay_chars.c b/sys/dev/ic/pcdisplay_chars.c
index 5496a0bc796..992a1334b2c 100644
--- a/sys/dev/ic/pcdisplay_chars.c
+++ b/sys/dev/ic/pcdisplay_chars.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pcdisplay_chars.c,v 1.11 2006/10/12 01:31:01 christos Exp $ */
+/* $NetBSD: pcdisplay_chars.c,v 1.12 2006/11/16 01:32:52 christos Exp $ */
/*
* Copyright (c) 1998
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcdisplay_chars.c,v 1.11 2006/10/12 01:31:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcdisplay_chars.c,v 1.12 2006/11/16 01:32:52 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -328,7 +328,7 @@ static const struct {
};
int
-pcdisplay_mapchar(void *id __unused, int uni, unsigned int *index)
+pcdisplay_mapchar(void *id, int uni, unsigned int *index)
{
u_int i;
diff --git a/sys/dev/ic/pdq_ifsubr.c b/sys/dev/ic/pdq_ifsubr.c
index b2bf9d78b48..3b03aaf23f0 100644
--- a/sys/dev/ic/pdq_ifsubr.c
+++ b/sys/dev/ic/pdq_ifsubr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pdq_ifsubr.c,v 1.46 2006/10/12 01:31:01 christos Exp $ */
+/* $NetBSD: pdq_ifsubr.c,v 1.47 2006/11/16 01:32:52 christos Exp $ */
/*-
* Copyright (c) 1995, 1996 Matt Thomas <matt@3am-software.com>
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pdq_ifsubr.c,v 1.46 2006/10/12 01:31:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pdq_ifsubr.c,v 1.47 2006/11/16 01:32:52 christos Exp $");
#ifdef __NetBSD__
#include "opt_inet.h"
@@ -520,7 +520,7 @@ pdq_ifioctl(
void
pdq_ifattach(
pdq_softc_t *sc,
- ifnet_ret_t (*ifwatchdog)(int unit) __unused)
+ ifnet_ret_t (*ifwatchdog)(int unit))
{
struct ifnet *ifp = &sc->sc_if;
diff --git a/sys/dev/ic/rrunner.c b/sys/dev/ic/rrunner.c
index b1e85a95db2..221dff798ef 100644
--- a/sys/dev/ic/rrunner.c
+++ b/sys/dev/ic/rrunner.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rrunner.c,v 1.58 2006/10/12 01:31:01 christos Exp $ */
+/* $NetBSD: rrunner.c,v 1.59 2006/11/16 01:32:52 christos Exp $ */
/*
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rrunner.c,v 1.58 2006/10/12 01:31:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rrunner.c,v 1.59 2006/11/16 01:32:52 christos Exp $");
#include "opt_inet.h"
@@ -706,8 +706,8 @@ bad_init:
*/
int
-esh_fpopen(dev_t dev, int oflags __unused, int devtype __unused,
- struct lwp *l __unused)
+esh_fpopen(dev_t dev, int oflags, int devtype,
+ struct lwp *l)
{
struct esh_softc *sc;
struct rr_ring_ctl *ring_ctl;
@@ -924,8 +924,8 @@ bad_fp_dmamem_alloc:
int
-esh_fpclose(dev_t dev, int fflag __unused, int devtype __unused,
- struct lwp *l __unused)
+esh_fpclose(dev_t dev, int fflag, int devtype,
+ struct lwp *l)
{
struct esh_softc *sc;
struct rr_ring_ctl *ring_ctl;
@@ -996,7 +996,7 @@ esh_fpclose(dev_t dev, int fflag __unused, int devtype __unused,
}
int
-esh_fpread(dev_t dev, struct uio *uio, int ioflag __unused)
+esh_fpread(dev_t dev, struct uio *uio, int ioflag)
{
struct lwp *l = curlwp;
struct proc *p = l->l_proc;
@@ -1154,7 +1154,7 @@ fpread_done:
int
-esh_fpwrite(dev_t dev, struct uio *uio, int ioflag __unused)
+esh_fpwrite(dev_t dev, struct uio *uio, int ioflag)
{
struct lwp *l = curlwp;
struct proc *p = l->l_proc;
diff --git a/sys/dev/ic/rt2560.c b/sys/dev/ic/rt2560.c
index 86903d15966..707b5105dd5 100644
--- a/sys/dev/ic/rt2560.c
+++ b/sys/dev/ic/rt2560.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rt2560.c,v 1.6 2006/10/12 01:31:01 christos Exp $ */
+/* $NetBSD: rt2560.c,v 1.7 2006/11/16 01:32:52 christos Exp $ */
/* $OpenBSD: rt2560.c,v 1.15 2006/04/20 20:31:12 miod Exp $ */
/* $FreeBSD: rt2560.c,v 1.3 2006/03/21 21:15:43 damien Exp $*/
@@ -24,7 +24,7 @@
* http://www.ralinktech.com/
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rt2560.c,v 1.6 2006/10/12 01:31:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rt2560.c,v 1.7 2006/11/16 01:32:52 christos Exp $");
#include "bpfilter.h"
@@ -338,7 +338,7 @@ static const struct {
};
int
-rt2560_attach(void *xsc, int id __unused)
+rt2560_attach(void *xsc, int id)
{
struct rt2560_softc *sc = xsc;
struct ieee80211com *ic = &sc->sc_ic;
@@ -842,7 +842,7 @@ rt2560_free_rx_ring(struct rt2560_softc *sc, struct rt2560_rx_ring *ring)
}
struct ieee80211_node *
-rt2560_node_alloc(struct ieee80211_node_table *nt __unused)
+rt2560_node_alloc(struct ieee80211_node_table *nt)
{
struct rt2560_node *rn;
@@ -885,7 +885,7 @@ rt2560_next_scan(void *arg)
* This function is called for each neighbor node.
*/
void
-rt2560_iter_func(void *arg __unused, struct ieee80211_node *ni)
+rt2560_iter_func(void *arg, struct ieee80211_node *ni)
{
struct rt2560_node *rn = (struct rt2560_node *)ni;
@@ -1528,7 +1528,7 @@ rt2560_beacon_expire(struct rt2560_softc *sc)
}
static void
-rt2560_wakeup_expire(struct rt2560_softc *sc __unused)
+rt2560_wakeup_expire(struct rt2560_softc *sc)
{
DPRINTFN(15, ("wakeup expired\n"));
}
diff --git a/sys/dev/ic/rt2661.c b/sys/dev/ic/rt2661.c
index 9e42459def9..092c30cb6c5 100644
--- a/sys/dev/ic/rt2661.c
+++ b/sys/dev/ic/rt2661.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rt2661.c,v 1.12 2006/10/12 01:31:01 christos Exp $ */
+/* $NetBSD: rt2661.c,v 1.13 2006/11/16 01:32:52 christos Exp $ */
/* $OpenBSD: rt2661.c,v 1.17 2006/05/01 08:41:11 damien Exp $ */
/* $FreeBSD: rt2560.c,v 1.5 2006/06/02 19:59:31 csjp Exp $ */
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rt2661.c,v 1.12 2006/10/12 01:31:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rt2661.c,v 1.13 2006/11/16 01:32:52 christos Exp $");
#include "bpfilter.h"
@@ -147,7 +147,9 @@ static void rt2661_set_chan(struct rt2661_softc *,
static void rt2661_set_bssid(struct rt2661_softc *, const uint8_t *);
static void rt2661_set_macaddr(struct rt2661_softc *, const uint8_t *);
static void rt2661_update_promisc(struct rt2661_softc *);
-static int rt2661_wme_update(struct ieee80211com *) __unused;
+#if 0
+static int rt2661_wme_update(struct ieee80211com *);
+#endif
static void rt2661_update_slot(struct ifnet *);
static const char *
@@ -842,7 +844,7 @@ rt2661_free_rx_ring(struct rt2661_softc *sc, struct rt2661_rx_ring *ring)
}
static struct ieee80211_node *
-rt2661_node_alloc(struct ieee80211_node_table *nt __unused)
+rt2661_node_alloc(struct ieee80211_node_table *nt)
{
struct rt2661_node *rn;
@@ -885,7 +887,7 @@ rt2661_next_scan(void *arg)
* This function is called for each neighbor node.
*/
static void
-rt2661_iter_func(void *arg __unused, struct ieee80211_node *ni)
+rt2661_iter_func(void *arg, struct ieee80211_node *ni)
{
struct rt2661_node *rn = (struct rt2661_node *)ni;
@@ -1294,7 +1296,7 @@ skip: desc->flags |= htole32(RT2661_RX_BUSY);
/* ARGSUSED */
static void
-rt2661_mcu_beacon_expire(struct rt2661_softc *sc __unused)
+rt2661_mcu_beacon_expire(struct rt2661_softc *sc)
{
/* do nothing */
}
@@ -2427,6 +2429,7 @@ rt2661_update_promisc(struct rt2661_softc *sc)
"entering" : "leaving"));
}
+#if 0
/*
* Update QoS (802.11e) settings for each h/w Tx ring.
*/
@@ -2472,6 +2475,7 @@ rt2661_wme_update(struct ieee80211com *ic)
return 0;
}
+#endif
static void
rt2661_update_slot(struct ifnet *ifp)
diff --git a/sys/dev/ic/rtl8169.c b/sys/dev/ic/rtl8169.c
index 323bfa7d793..61251246ae9 100644
--- a/sys/dev/ic/rtl8169.c
+++ b/sys/dev/ic/rtl8169.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rtl8169.c,v 1.61 2006/11/12 15:12:02 tsutsui Exp $ */
+/* $NetBSD: rtl8169.c,v 1.62 2006/11/16 01:32:52 christos Exp $ */
/*
* Copyright (c) 1997, 1998-2003
@@ -218,7 +218,7 @@ re_gmii_readreg(struct device *self, int phy, int reg)
}
static void
-re_gmii_writereg(struct device *dev, int phy __unused, int reg, int data)
+re_gmii_writereg(struct device *dev, int phy, int reg, int data)
{
struct rtk_softc *sc = (void *)dev;
uint32_t rval;
@@ -362,7 +362,7 @@ re_miibus_writereg(struct device *dev, int phy, int reg, int data)
}
static void
-re_miibus_statchg(struct device *dev __unused)
+re_miibus_statchg(struct device *dev)
{
return;
diff --git a/sys/dev/ic/rtl81x9.c b/sys/dev/ic/rtl81x9.c
index df580189413..d572839d0c4 100644
--- a/sys/dev/ic/rtl81x9.c
+++ b/sys/dev/ic/rtl81x9.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rtl81x9.c,v 1.65 2006/11/05 15:49:41 tsutsui Exp $ */
+/* $NetBSD: rtl81x9.c,v 1.66 2006/11/16 01:32:52 christos Exp $ */
/*
* Copyright (c) 1997, 1998
@@ -86,7 +86,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtl81x9.c,v 1.65 2006/11/05 15:49:41 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtl81x9.c,v 1.66 2006/11/16 01:32:52 christos Exp $");
#include "bpfilter.h"
#include "rnd.h"
@@ -520,7 +520,7 @@ STATIC void rtk_phy_writereg(struct device *self, int phy, int reg, int data)
}
STATIC void
-rtk_phy_statchg(struct device *v __unused)
+rtk_phy_statchg(struct device *v)
{
/* Nothing to do. */
diff --git a/sys/dev/ic/rtw.c b/sys/dev/ic/rtw.c
index 1087a90e113..a96f15319ce 100644
--- a/sys/dev/ic/rtw.c
+++ b/sys/dev/ic/rtw.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rtw.c,v 1.80 2006/11/13 03:35:59 dyoung Exp $ */
+/* $NetBSD: rtw.c,v 1.81 2006/11/16 01:32:52 christos Exp $ */
/*-
* Copyright (c) 2004, 2005 David Young. All rights reserved.
*
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtw.c,v 1.80 2006/11/13 03:35:59 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtw.c,v 1.81 2006/11/16 01:32:52 christos Exp $");
#include "bpfilter.h"
@@ -591,7 +591,7 @@ rtw_key_delete(struct ieee80211com *ic, const struct ieee80211_key *k)
static int
rtw_key_set(struct ieee80211com *ic, const struct ieee80211_key *k,
- const u_int8_t mac[IEEE80211_ADDR_LEN] __unused)
+ const u_int8_t mac[IEEE80211_ADDR_LEN])
{
struct rtw_softc *sc = ic->ic_ifp->if_softc;
@@ -606,7 +606,7 @@ rtw_key_set(struct ieee80211com *ic, const struct ieee80211_key *k,
}
static void
-rtw_key_update_begin(struct ieee80211com *ic __unused)
+rtw_key_update_begin(struct ieee80211com *ic)
{
#ifdef RTW_DEBUG
struct ifnet *ifp = ic->ic_ifp;
@@ -824,7 +824,7 @@ rtw_srom_free(struct rtw_srom *sr)
}
static void
-rtw_srom_defaults(struct rtw_srom *sr __unused, uint32_t *flags,
+rtw_srom_defaults(struct rtw_srom *sr, uint32_t *flags,
uint8_t *cs_threshold, enum rtw_rfchipid *rfchipid, uint32_t *rcr)
{
*flags |= (RTW_F_DIGPHY|RTW_F_ANTDIV);
@@ -1030,7 +1030,7 @@ rtw_srom_read(struct rtw_regs *regs, uint32_t flags, struct rtw_srom *sr,
static void
rtw_set_rfprog(struct rtw_regs *regs, enum rtw_rfchipid rfchipid,
- const char *dvname __unused)
+ const char *dvname)
{
uint8_t cfg4;
const char *method;
@@ -1362,7 +1362,7 @@ rtw_rxsoft_init_all(bus_dma_tag_t dmat, struct rtw_rxsoft *desc,
static inline void
rtw_rxdesc_init(struct rtw_rxdesc_blk *rdb, struct rtw_rxsoft *rs,
- int idx, int kick __unused)
+ int idx, int kick)
{
int is_last = (idx == rdb->rdb_ndesc - 1);
uint32_t ctl, octl, obuf;
@@ -1437,7 +1437,7 @@ rtw_io_enable(struct rtw_regs *regs, uint8_t flags, int enable)
}
static void
-rtw_intr_rx(struct rtw_softc *sc, uint16_t isr __unused)
+rtw_intr_rx(struct rtw_softc *sc, uint16_t isr)
{
#define IS_BEACON(__fc0) \
((__fc0 & (IEEE80211_FC0_TYPE_MASK | IEEE80211_FC0_SUBTYPE_MASK)) ==\
@@ -1653,7 +1653,7 @@ next:
}
static void
-rtw_txsoft_release(bus_dma_tag_t dmat, struct ieee80211com *ic __unused,
+rtw_txsoft_release(bus_dma_tag_t dmat, struct ieee80211com *ic,
struct rtw_txsoft *ts)
{
struct mbuf *m;
@@ -1854,7 +1854,7 @@ rtw_intr_beacon(struct rtw_softc *sc, uint16_t isr)
}
static void
-rtw_intr_atim(struct rtw_softc *sc __unused)
+rtw_intr_atim(struct rtw_softc *sc)
{
/* TBD */
return;
@@ -2270,7 +2270,7 @@ rtw_pwrstate_string(enum rtw_pwrstate power)
*/
static void
rtw_maxim_pwrstate(struct rtw_regs *regs, enum rtw_pwrstate power,
- int before_rf, int digphy __unused)
+ int before_rf, int digphy)
{
uint32_t anaparm;
@@ -2310,7 +2310,7 @@ rtw_maxim_pwrstate(struct rtw_regs *regs, enum rtw_pwrstate power,
*/
static void
rtw_rfmd_pwrstate(struct rtw_regs *regs, enum rtw_pwrstate power,
- int before_rf, int digphy __unused)
+ int before_rf, int digphy)
{
uint32_t anaparm;
@@ -3851,8 +3851,8 @@ rtw_establish_hooks(struct rtw_hooks *hooks, const char *dvname,
}
static inline void
-rtw_disestablish_hooks(struct rtw_hooks *hooks, const char *dvname __unused,
- void *arg __unused)
+rtw_disestablish_hooks(struct rtw_hooks *hooks, const char *dvname,
+ void *arg)
{
if (hooks->rh_shutdown != NULL)
shutdownhook_disestablish(hooks->rh_shutdown);
diff --git a/sys/dev/ic/rtwphy.c b/sys/dev/ic/rtwphy.c
index 96e044a46bf..1684df63c44 100644
--- a/sys/dev/ic/rtwphy.c
+++ b/sys/dev/ic/rtwphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rtwphy.c,v 1.11 2006/10/12 01:31:01 christos Exp $ */
+/* $NetBSD: rtwphy.c,v 1.12 2006/11/16 01:32:52 christos Exp $ */
/*-
* Copyright (c) 2004, 2005 David Young. All rights reserved.
*
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtwphy.c,v 1.11 2006/10/12 01:31:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtwphy.c,v 1.12 2006/11/16 01:32:52 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -531,7 +531,7 @@ err:
static int
rtw_grf5101_init(struct rtw_rf *rf, u_int freq, uint8_t opaque_txpower,
- enum rtw_pwrstate power __unused)
+ enum rtw_pwrstate power)
{
int rc;
struct rtw_grf5101 *gr = (struct rtw_grf5101 *)rf;
@@ -587,7 +587,7 @@ rtw_grf5101_destroy(struct rtw_rf *rf)
struct rtw_rf *
rtw_grf5101_create(struct rtw_regs *regs, rtw_rf_write_t rf_write,
- int digphy __unused)
+ int digphy)
{
struct rtw_grf5101 *gr;
struct rtw_rfbus *bus;
@@ -651,7 +651,7 @@ rtw_max2820_destroy(struct rtw_rf *rf)
}
static int
-rtw_max2820_init(struct rtw_rf *rf, u_int freq, uint8_t opaque_txpower __unused,
+rtw_max2820_init(struct rtw_rf *rf, u_int freq, uint8_t opaque_txpower,
enum rtw_pwrstate power)
{
struct rtw_max2820 *mx = (struct rtw_max2820 *)rf;
@@ -694,7 +694,7 @@ rtw_max2820_init(struct rtw_rf *rf, u_int freq, uint8_t opaque_txpower __unused,
}
static int
-rtw_max2820_txpower(struct rtw_rf *rf __unused, uint8_t opaque_txpower __unused)
+rtw_max2820_txpower(struct rtw_rf *rf, uint8_t opaque_txpower)
{
/* TBD */
return 0;
diff --git a/sys/dev/ic/rtwphyio.c b/sys/dev/ic/rtwphyio.c
index 9fbad5122c0..8d047afe7a4 100644
--- a/sys/dev/ic/rtwphyio.c
+++ b/sys/dev/ic/rtwphyio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rtwphyio.c,v 1.13 2006/10/12 01:31:01 christos Exp $ */
+/* $NetBSD: rtwphyio.c,v 1.14 2006/11/16 01:32:52 christos Exp $ */
/*-
* Copyright (c) 2004, 2005 David Young. All rights reserved.
*
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtwphyio.c,v 1.13 2006/10/12 01:31:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtwphyio.c,v 1.14 2006/11/16 01:32:52 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -199,7 +199,7 @@ rtw_rf_macbangbits(struct rtw_regs *regs, uint32_t reg)
}
static uint32_t
-rtw_grf5101_host_crypt(u_int addr __unused, uint32_t val __unused)
+rtw_grf5101_host_crypt(u_int addr, uint32_t val)
{
/* TBD */
return 0;
diff --git a/sys/dev/ic/siop_common.c b/sys/dev/ic/siop_common.c
index 82acd6316b9..0bcda60c1f2 100644
--- a/sys/dev/ic/siop_common.c
+++ b/sys/dev/ic/siop_common.c
@@ -1,4 +1,4 @@
-/* $NetBSD: siop_common.c,v 1.40 2006/10/12 01:31:01 christos Exp $ */
+/* $NetBSD: siop_common.c,v 1.41 2006/11/16 01:32:52 christos Exp $ */
/*
* Copyright (c) 2000, 2002 Manuel Bouyer.
@@ -33,7 +33,7 @@
/* SYM53c7/8xx PCI-SCSI I/O Processors driver */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: siop_common.c,v 1.40 2006/10/12 01:31:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siop_common.c,v 1.41 2006/11/16 01:32:52 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -708,8 +708,8 @@ siop_minphys(bp)
}
int
-siop_ioctl(struct scsipi_channel *chan, u_long cmd, caddr_t arg __unused,
- int flag __unused, struct proc *p __unused)
+siop_ioctl(struct scsipi_channel *chan, u_long cmd, caddr_t arg,
+ int flag, struct proc *p)
{
struct siop_common_softc *sc = (void *)chan->chan_adapter->adapt_dev;
diff --git a/sys/dev/ic/sl811hs.c b/sys/dev/ic/sl811hs.c
index bd7fefa28f8..992eddc391b 100644
--- a/sys/dev/ic/sl811hs.c
+++ b/sys/dev/ic/sl811hs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sl811hs.c,v 1.10 2006/10/12 01:31:01 christos Exp $ */
+/* $NetBSD: sl811hs.c,v 1.11 2006/11/16 01:32:52 christos Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.10 2006/10/12 01:31:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.11 2006/11/16 01:32:52 christos Exp $");
#include "opt_slhci.h"
@@ -495,13 +495,13 @@ slhci_open(usbd_pipe_handle pipe)
}
void
-slhci_softintr(void *arg __unused)
+slhci_softintr(void *arg)
{
DPRINTF(D_TRACE, ("%s()", __FUNCTION__));
}
void
-slhci_poll(struct usbd_bus *bus __unused)
+slhci_poll(struct usbd_bus *bus)
{
DPRINTF(D_TRACE, ("%s()", __FUNCTION__));
}
@@ -610,7 +610,7 @@ slhci_freex(struct usbd_bus *bus, usbd_xfer_handle xfer)
}
void
-slhci_noop(usbd_pipe_handle pipe __unused)
+slhci_noop(usbd_pipe_handle pipe)
{
DPRINTF(D_TRACE, ("%s()", __FUNCTION__));
}
@@ -1053,19 +1053,19 @@ slhci_root_ctrl_start(usbd_xfer_handle xfer)
}
void
-slhci_root_ctrl_abort(usbd_xfer_handle xfer __unused)
+slhci_root_ctrl_abort(usbd_xfer_handle xfer)
{
DPRINTF(D_TRACE, ("SLRCabort "));
}
void
-slhci_root_ctrl_close(usbd_pipe_handle pipe __unused)
+slhci_root_ctrl_close(usbd_pipe_handle pipe)
{
DPRINTF(D_TRACE, ("SLRCclose "));
}
void
-slhci_root_ctrl_done(usbd_xfer_handle xfer __unused)
+slhci_root_ctrl_done(usbd_xfer_handle xfer)
{
DPRINTF(D_TRACE, ("SLRCdone\n"));
}
@@ -1104,7 +1104,7 @@ slhci_root_intr_start(usbd_xfer_handle xfer)
}
static void
-slhci_root_intr_abort(usbd_xfer_handle xfer __unused)
+slhci_root_intr_abort(usbd_xfer_handle xfer)
{
DPRINTF(D_TRACE, ("SLRIabort "));
}
@@ -1121,7 +1121,7 @@ slhci_root_intr_close(usbd_pipe_handle pipe)
}
static void
-slhci_root_intr_done(usbd_xfer_handle xfer __unused)
+slhci_root_intr_done(usbd_xfer_handle xfer)
{
//DPRINTF(D_XFER, ("RIdn "));
}
@@ -1218,13 +1218,13 @@ slhci_device_ctrl_abort(usbd_xfer_handle xfer)
}
static void
-slhci_device_ctrl_close(usbd_pipe_handle pipe __unused)
+slhci_device_ctrl_close(usbd_pipe_handle pipe)
{
DPRINTF(D_TRACE, ("Ccl "));
}
static void
-slhci_device_ctrl_done(usbd_xfer_handle xfer __unused)
+slhci_device_ctrl_done(usbd_xfer_handle xfer)
{
DPRINTF(D_TRACE, ("Cdn "));
}
@@ -1330,77 +1330,77 @@ slhci_device_intr_abort(usbd_xfer_handle xfer)
}
static void
-slhci_device_intr_close(usbd_pipe_handle pipe __unused)
+slhci_device_intr_close(usbd_pipe_handle pipe)
{
DPRINTF(D_TRACE, ("INTRclose "));
}
static void
-slhci_device_intr_done(usbd_xfer_handle xfer __unused)
+slhci_device_intr_done(usbd_xfer_handle xfer)
{
DPRINTF(D_TRACE, ("INTRdone "));
}
static usbd_status
-slhci_device_isoc_transfer(usbd_xfer_handle xfer __unused)
+slhci_device_isoc_transfer(usbd_xfer_handle xfer)
{
DPRINTF(D_TRACE, ("S"));
return USBD_NORMAL_COMPLETION;
}
static usbd_status
-slhci_device_isoc_start(usbd_xfer_handle xfer __unused)
+slhci_device_isoc_start(usbd_xfer_handle xfer)
{
DPRINTF(D_TRACE, ("st "));
return USBD_NORMAL_COMPLETION;
}
static void
-slhci_device_isoc_abort(usbd_xfer_handle xfer __unused)
+slhci_device_isoc_abort(usbd_xfer_handle xfer)
{
DPRINTF(D_TRACE, ("Sab "));
}
static void
-slhci_device_isoc_close(usbd_pipe_handle pipe __unused)
+slhci_device_isoc_close(usbd_pipe_handle pipe)
{
DPRINTF(D_TRACE, ("Scl "));
}
static void
-slhci_device_isoc_done(usbd_xfer_handle xfer __unused)
+slhci_device_isoc_done(usbd_xfer_handle xfer)
{
DPRINTF(D_TRACE, ("Sdn "));
}
static usbd_status
-slhci_device_bulk_transfer(usbd_xfer_handle xfer __unused)
+slhci_device_bulk_transfer(usbd_xfer_handle xfer)
{
DPRINTF(D_TRACE, ("B"));
return USBD_NORMAL_COMPLETION;
}
static usbd_status
-slhci_device_bulk_start(usbd_xfer_handle xfer __unused)
+slhci_device_bulk_start(usbd_xfer_handle xfer)
{
DPRINTF(D_TRACE, ("st "));
return USBD_NORMAL_COMPLETION;
}
static void
-slhci_device_bulk_abort(usbd_xfer_handle xfer __unused)
+slhci_device_bulk_abort(usbd_xfer_handle xfer)
{
DPRINTF(D_TRACE, ("Bab "));
}
static void
-slhci_device_bulk_close(usbd_pipe_handle pipe __unused)
+slhci_device_bulk_close(usbd_pipe_handle pipe)
{
DPRINTF(D_TRACE, ("Bcl "));
}
static void
-slhci_device_bulk_done(usbd_xfer_handle xfer __unused)
+slhci_device_bulk_done(usbd_xfer_handle xfer)
{
DPRINTF(D_TRACE, ("Bdn "));
}
@@ -1526,7 +1526,7 @@ slhci_abort_xfer(usbd_xfer_handle xfer, usbd_status status)
}
void
-slhci_device_clear_toggle(usbd_pipe_handle pipe __unused)
+slhci_device_clear_toggle(usbd_pipe_handle pipe)
{
DPRINTF(D_TRACE, ("SLdevice_clear_toggle "));
}
diff --git a/sys/dev/ic/smc91cxx.c b/sys/dev/ic/smc91cxx.c
index 838a5886dc0..152409eea4b 100644
--- a/sys/dev/ic/smc91cxx.c
+++ b/sys/dev/ic/smc91cxx.c
@@ -1,4 +1,4 @@
-/* $NetBSD: smc91cxx.c,v 1.57 2006/10/12 01:31:01 christos Exp $ */
+/* $NetBSD: smc91cxx.c,v 1.58 2006/11/16 01:32:52 christos Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smc91cxx.c,v 1.57 2006/10/12 01:31:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smc91cxx.c,v 1.58 2006/11/16 01:32:52 christos Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -1450,7 +1450,7 @@ smc91cxx_activate(self, act)
}
int
-smc91cxx_detach(struct device *self, int flags __unused)
+smc91cxx_detach(struct device *self, int flags)
{
struct smc91cxx_softc *sc = (struct smc91cxx_softc *)self;
struct ifnet *ifp = &sc->sc_ec.ec_if;
diff --git a/sys/dev/ic/spic.c b/sys/dev/ic/spic.c
index 425b3cec91a..8ca160af29f 100644
--- a/sys/dev/ic/spic.c
+++ b/sys/dev/ic/spic.c
@@ -1,4 +1,4 @@
-/* $NetBSD: spic.c,v 1.5 2006/11/12 19:00:43 plunky Exp $ */
+/* $NetBSD: spic.c,v 1.6 2006/11/16 01:32:52 christos Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -56,7 +56,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spic.c,v 1.5 2006/11/12 19:00:43 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spic.c,v 1.6 2006/11/16 01:32:52 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -330,8 +330,8 @@ spic_disable(void *v)
}
static int
-spic_ioctl(void *v __unused, u_long cmd, caddr_t data __unused,
- int flag __unused, struct lwp *l __unused)
+spic_ioctl(void *v, u_long cmd, caddr_t data,
+ int flag, struct lwp *l)
{
switch (cmd) {
case WSMOUSEIO_GTYPE:
diff --git a/sys/dev/ic/tcic2.c b/sys/dev/ic/tcic2.c
index cee175aa93a..cae9530361f 100644
--- a/sys/dev/ic/tcic2.c
+++ b/sys/dev/ic/tcic2.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tcic2.c,v 1.25 2006/10/12 01:31:01 christos Exp $ */
+/* $NetBSD: tcic2.c,v 1.26 2006/11/16 01:32:52 christos Exp $ */
/*
* Copyright (c) 1998, 1999 Christoph Badura. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcic2.c,v 1.25 2006/10/12 01:31:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcic2.c,v 1.26 2006/11/16 01:32:52 christos Exp $");
#undef TCICDEBUG
@@ -1047,7 +1047,7 @@ tcic_chip_io_alloc(pch, start, size, align, pcihp)
}
void
-tcic_chip_io_free(pcmcia_chipset_handle_t pch __unused,
+tcic_chip_io_free(pcmcia_chipset_handle_t pch,
struct pcmcia_io_handle *pcihp)
{
bus_space_tag_t iot = pcihp->iot;
diff --git a/sys/dev/ic/tropic.c b/sys/dev/ic/tropic.c
index d93281444b0..495d2812d53 100644
--- a/sys/dev/ic/tropic.c
+++ b/sys/dev/ic/tropic.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tropic.c,v 1.28 2006/10/12 01:31:01 christos Exp $ */
+/* $NetBSD: tropic.c,v 1.29 2006/11/16 01:32:52 christos Exp $ */
/*
* Ported to NetBSD by Onno van der Linden
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tropic.c,v 1.28 2006/10/12 01:31:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tropic.c,v 1.29 2006/11/16 01:32:52 christos Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -1796,7 +1796,7 @@ tr_activate(self, act)
}
int
-tr_detach(struct device *self, int flags __unused)
+tr_detach(struct device *self, int flags)
{
struct tr_softc *sc = (struct tr_softc *)self;
struct ifnet *ifp = &sc->sc_ethercom.ec_if;
diff --git a/sys/dev/ic/uha.c b/sys/dev/ic/uha.c
index 84abe55a720..7c204eb94c1 100644
--- a/sys/dev/ic/uha.c
+++ b/sys/dev/ic/uha.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uha.c,v 1.37 2006/10/12 01:31:01 christos Exp $ */
+/* $NetBSD: uha.c,v 1.38 2006/11/16 01:32:52 christos Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uha.c,v 1.37 2006/10/12 01:31:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uha.c,v 1.38 2006/11/16 01:32:52 christos Exp $");
#undef UHADEBUG
#ifdef DDB
@@ -208,7 +208,7 @@ uha_attach(sc, upd)
}
integrate void
-uha_reset_mscp(struct uha_softc *sc __unused, struct uha_mscp *mscp)
+uha_reset_mscp(struct uha_softc *sc, struct uha_mscp *mscp)
{
mscp->flags = 0;
diff --git a/sys/dev/ic/vga.c b/sys/dev/ic/vga.c
index 17de85dd0e8..379e4a3f892 100644
--- a/sys/dev/ic/vga.c
+++ b/sys/dev/ic/vga.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vga.c,v 1.90 2006/10/12 01:31:02 christos Exp $ */
+/* $NetBSD: vga.c,v 1.91 2006/11/16 01:32:52 christos Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -35,7 +35,7 @@
#include "opt_wsmsgattrs.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vga.c,v 1.90 2006/10/12 01:31:02 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga.c,v 1.91 2006/11/16 01:32:52 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -852,7 +852,7 @@ vga_ioctl(void *v, void *vs, u_long cmd, caddr_t data, int flag, struct lwp *l)
}
static paddr_t
-vga_mmap(void *v, void *vs __unused, off_t offset, int prot)
+vga_mmap(void *v, void *vs, off_t offset, int prot)
{
struct vga_config *vc = v;
const struct vga_funcs *vf = vc->vc_funcs;
@@ -902,7 +902,7 @@ vga_alloc_screen(void *v, const struct wsscreen_descr *type, void **cookiep,
}
void
-vga_free_screen(void *v __unused, void *cookie)
+vga_free_screen(void *v, void *cookie)
{
struct vgascreen *vs = cookie;
struct vga_config *vc = vs->cfg;
@@ -982,7 +982,7 @@ vga_setfont(struct vga_config *vc, struct vgascreen *scr)
}
int
-vga_show_screen(void *v __unused, void *cookie, int waitok __unused,
+vga_show_screen(void *v, void *cookie, int waitok,
void (*cb)(void *, int, int), void *cbarg)
{
struct vgascreen *scr = cookie, *oldscr;
diff --git a/sys/dev/ic/vga_raster.c b/sys/dev/ic/vga_raster.c
index 021891ab5f3..f3faa9d629c 100644
--- a/sys/dev/ic/vga_raster.c
+++ b/sys/dev/ic/vga_raster.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vga_raster.c,v 1.24 2006/10/12 01:31:02 christos Exp $ */
+/* $NetBSD: vga_raster.c,v 1.25 2006/11/16 01:32:52 christos Exp $ */
/*
* Copyright (c) 2001, 2002 Bang Jun-Young
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vga_raster.c,v 1.24 2006/10/12 01:31:02 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga_raster.c,v 1.25 2006/11/16 01:32:52 christos Exp $");
#include "opt_wsmsgattrs.h" /* for WSDISPLAY_CUSTOM_OUTPUT */
@@ -525,7 +525,7 @@ vga_raster_init_screen(struct vga_config *vc, struct vgascreen *scr,
void
vga_common_attach(struct vga_softc *sc, bus_space_tag_t iot,
- bus_space_tag_t memt, int type, int quirks __unused,
+ bus_space_tag_t memt, int type, int quirks,
const struct vga_funcs *vf)
{
int console;
@@ -599,7 +599,7 @@ vga_set_video(struct vga_config *vc, int state)
}
int
-vga_raster_ioctl(void *v, void *vs __unused, u_long cmd, caddr_t data, int flag,
+vga_raster_ioctl(void *v, void *vs, u_long cmd, caddr_t data, int flag,
struct lwp *l)
{
struct vga_config *vc = v;
@@ -648,7 +648,7 @@ vga_raster_ioctl(void *v, void *vs __unused, u_long cmd, caddr_t data, int flag,
}
static paddr_t
-vga_raster_mmap(void *v, void *vs __unused, off_t offset, int prot)
+vga_raster_mmap(void *v, void *vs, off_t offset, int prot)
{
struct vga_config *vc = v;
const struct vga_funcs *vf = vc->vc_funcs;
@@ -694,7 +694,7 @@ vga_raster_alloc_screen(void *v, const struct wsscreen_descr *type,
}
void
-vga_raster_free_screen(void *v __unused, void *cookie)
+vga_raster_free_screen(void *v, void *cookie)
{
struct vgascreen *vs = cookie;
struct vga_config *vc = vs->cfg;
@@ -711,7 +711,7 @@ vga_raster_free_screen(void *v __unused, void *cookie)
}
int
-vga_raster_show_screen(void *v __unused, void *cookie, int waitok __unused,
+vga_raster_show_screen(void *v, void *cookie, int waitok,
void (*cb)(void *, int, int), void *cbarg)
{
struct vgascreen *scr = cookie, *oldscr;
@@ -798,8 +798,8 @@ vga_switch_screen(struct vga_config *vc)
}
static int
-vga_raster_load_font(void *v __unused, void *id __unused,
- struct wsdisplay_font *data __unused)
+vga_raster_load_font(void *v, void *id,
+ struct wsdisplay_font *data)
{
/* XXX */
printf("vga_raster_load_font: called\n");
diff --git a/sys/dev/ic/wi.c b/sys/dev/ic/wi.c
index 59f3fc7da24..e08a03a82e4 100644
--- a/sys/dev/ic/wi.c
+++ b/sys/dev/ic/wi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wi.c,v 1.216 2006/10/12 01:31:02 christos Exp $ */
+/* $NetBSD: wi.c,v 1.217 2006/11/16 01:32:52 christos Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -106,7 +106,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wi.c,v 1.216 2006/10/12 01:31:02 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wi.c,v 1.217 2006/11/16 01:32:52 christos Exp $");
#define WI_HERMES_AUTOINC_WAR /* Work around data write autoinc bug. */
#define WI_HERMES_STATS_WAR /* Work around stats counter bug. */
@@ -1514,7 +1514,7 @@ wi_media_status(struct ifnet *ifp, struct ifmediareq *imr)
}
STATIC struct ieee80211_node *
-wi_node_alloc(struct ieee80211_node_table *nt __unused)
+wi_node_alloc(struct ieee80211_node_table *nt)
{
struct wi_node *wn =
malloc(sizeof(struct wi_node), M_DEVBUF, M_NOWAIT | M_ZERO);
@@ -1569,7 +1569,7 @@ wi_sync_bssid(struct wi_softc *sc, u_int8_t new_bssid[IEEE80211_ADDR_LEN])
static inline void
wi_rssadapt_input(struct ieee80211com *ic, struct ieee80211_node *ni,
- struct ieee80211_frame *wh __unused, int rssi)
+ struct ieee80211_frame *wh, int rssi)
{
struct wi_node *wn;
@@ -2536,7 +2536,7 @@ wi_key_delete(struct ieee80211com *ic, const struct ieee80211_key *k)
static int
wi_key_set(struct ieee80211com *ic, const struct ieee80211_key *k,
- const u_int8_t mac[IEEE80211_ADDR_LEN] __unused)
+ const u_int8_t mac[IEEE80211_ADDR_LEN])
{
struct wi_softc *sc = ic->ic_ifp->if_softc;
@@ -2551,7 +2551,7 @@ wi_key_set(struct ieee80211com *ic, const struct ieee80211_key *k,
}
STATIC void
-wi_key_update_begin(struct ieee80211com *ic __unused)
+wi_key_update_begin(struct ieee80211com *ic)
{
DPRINTF(("%s:\n", __func__));
}
@@ -3042,7 +3042,7 @@ wi_write_rid(struct wi_softc *sc, int rid, void *buf, int buflen)
}
STATIC void
-wi_rssadapt_updatestats_cb(void *arg __unused, struct ieee80211_node *ni)
+wi_rssadapt_updatestats_cb(void *arg, struct ieee80211_node *ni)
{
struct wi_node *wn = (void*)ni;
ieee80211_rssadapt_updatestats(&wn->wn_rssadapt);
diff --git a/sys/dev/ieee1394/firewire.c b/sys/dev/ieee1394/firewire.c
index 960c3095b80..64f0c0d53b9 100644
--- a/sys/dev/ieee1394/firewire.c
+++ b/sys/dev/ieee1394/firewire.c
@@ -1,4 +1,4 @@
-/* $NetBSD: firewire.c,v 1.10 2006/10/12 01:31:15 christos Exp $ */
+/* $NetBSD: firewire.c,v 1.11 2006/11/16 01:32:59 christos Exp $ */
/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
@@ -297,7 +297,7 @@ fw_noderesolve_eui64(struct firewire_comm *fc, struct fw_eui64 *eui)
* Async. request procedure for userland application.
*/
int
-fw_asyreq(struct firewire_comm *fc, int sub __unused, struct fw_xfer *xfer)
+fw_asyreq(struct firewire_comm *fc, int sub, struct fw_xfer *xfer)
{
int err = 0;
struct fw_xferq *xferq;
@@ -417,7 +417,7 @@ firewire_probe(device_t dev)
}
#elif defined(__NetBSD__)
int
-firewirematch(struct device *parent __unused, struct cfdata *cf __unused,
+firewirematch(struct device *parent, struct cfdata *cf,
void *aux)
{
struct fwbus_attach_args *faa = (struct fwbus_attach_args *)aux;
diff --git a/sys/dev/ieee1394/fw_port.h b/sys/dev/ieee1394/fw_port.h
index 876e1fb60f0..eefde833c65 100644
--- a/sys/dev/ieee1394/fw_port.h
+++ b/sys/dev/ieee1394/fw_port.h
@@ -1,4 +1,4 @@
-/* $NetBSD: fw_port.h,v 1.19 2006/10/12 01:31:15 christos Exp $ */
+/* $NetBSD: fw_port.h,v 1.20 2006/11/16 01:32:59 christos Exp $ */
/*
* Copyright (c) 2004 KIYOHARA Takashi
* All rights reserved.
@@ -132,8 +132,8 @@ typedef struct proc fw_proc;
*/
#define FW_CLOSE(dname) \
int \
- __CONCAT(dname,_close)(DEV_T dev, int flags __unused, \
- int fmt __unused, fw_proc *td __unused)
+ __CONCAT(dname,_close)(DEV_T dev, int flags, \
+ int fmt, fw_proc *td)
#define FW_CLOSE_START
/*
@@ -583,7 +583,7 @@ struct fwbus_attach_args {
#define FW_ATTACH(dname) \
void \
__CONCAT(dname,attach) \
- (struct device *parent __unused, struct device *self, void *aux)
+ (struct device *parent, struct device *self, void *aux)
#define FW_ATTACH_START(dname, sc, fwa) \
struct __CONCAT(dname,_softc) *sc = \
(struct __CONCAT(dname,_softc) *)self; \
@@ -596,7 +596,7 @@ struct fwbus_attach_args {
*/
#define FW_DETACH(dname) \
int \
- __CONCAT(dname,detach)(struct device *self, int flags __unused)
+ __CONCAT(dname,detach)(struct device *self, int flags)
#define FW_DETACH_START(dname, sc) \
struct __CONCAT(dname,_softc) *sc = \
(struct __CONCAT(dname,_softc) *)self
@@ -614,8 +614,8 @@ struct fwbus_attach_args {
*/
#define FW_OPEN(dname) \
int \
- __CONCAT(dname,_open)(dev_t _dev, int flags, int fmt __unused, \
- fw_proc *td __unused)
+ __CONCAT(dname,_open)(dev_t _dev, int flags, int fmt, \
+ fw_proc *td)
#define FW_OPEN_START \
struct firewire_softc *sc, *dev; \
\
@@ -628,8 +628,8 @@ struct fwbus_attach_args {
*/
#define FW_CLOSE(dname) \
int \
- __CONCAT(dname,_close)(dev_t _dev, int flags __unused, \
- int fmt __unused, fw_proc *td __unused)
+ __CONCAT(dname,_close)(dev_t _dev, int flags, \
+ int fmt, fw_proc *td)
#define FW_CLOSE_START \
int unit = DEV2UNIT(_dev); \
struct firewire_softc *dev = device_lookup(&ieee1394if_cd, unit); \
@@ -672,7 +672,7 @@ struct fwbus_attach_args {
int \
__CONCAT(dname,_ioctl) \
(dev_t _dev, u_long cmd, caddr_t data, \
- int flag __unused, fw_proc *td __unused)
+ int flag, fw_proc *td)
#define FW_IOCTL_START \
int unit = DEV2UNIT(_dev); \
struct firewire_softc *sc, *dev; \
@@ -686,8 +686,8 @@ struct fwbus_attach_args {
*/
#define FW_POLL(dname) \
int \
- __CONCAT(dname,_poll)(dev_t _dev __unused, int events __unused, \
- fw_proc *td __unused)
+ __CONCAT(dname,_poll)(dev_t _dev, int events, \
+ fw_proc *td)
#define FW_POLL_START \
int unit = DEV2UNIT(_dev); \
struct firewire_softc *dev; \
@@ -701,8 +701,8 @@ struct fwbus_attach_args {
*/
#define FW_MMAP(dname) \
paddr_t \
- __CONCAT(dname,_mmap)(dev_t _dev __unused, off_t offset __unused, \
- int nproto __unused)
+ __CONCAT(dname,_mmap)(dev_t _dev, off_t offset, \
+ int nproto)
#define FW_MMAP_START \
int unit = DEV2UNIT(_dev); \
struct firewire_softc *dev; \
@@ -728,7 +728,7 @@ struct fwbus_attach_args {
*/
#define IF_STOP(dname) \
void \
- __CONCAT(dname,_stop)(struct ifnet *ifp, int disable __unused)
+ __CONCAT(dname,_stop)(struct ifnet *ifp, int disable)
#define IF_STOP_START(dname, ifp, sc) \
struct __CONCAT(dname,_softc) *sc = \
((struct fwip_eth_softc *)(ifp)->if_softc)->fwip
@@ -1152,8 +1152,8 @@ typedef void
static __inline int
_fw_bus_dma_tag_create(bus_dma_tag_t parent,
bus_size_t alignment, bus_size_t boundary,
- bus_addr_t lowaddr __unused, bus_addr_t highaddr __unused,
- void *filtfunc __unused, void *filtfuncarg __unused,
+ bus_addr_t lowaddr, bus_addr_t highaddr,
+ void *filtfunc, void *filtfuncarg,
bus_size_t maxsize, int nsegments, bus_size_t maxsegsz,
int flags, fw_bus_dma_tag_t *fwdmat)
{
diff --git a/sys/dev/ieee1394/fwdev.c b/sys/dev/ieee1394/fwdev.c
index b7fe4861a09..8c0a3e3c936 100644
--- a/sys/dev/ieee1394/fwdev.c
+++ b/sys/dev/ieee1394/fwdev.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fwdev.c,v 1.5 2006/10/12 01:31:15 christos Exp $ */
+/* $NetBSD: fwdev.c,v 1.6 2006/11/16 01:32:59 christos Exp $ */
/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
@@ -328,7 +328,7 @@ FW_CLOSE(fw)
}
static int
-fw_read_async(struct fw_drv1 *d, struct uio *uio, int ioflag __unused)
+fw_read_async(struct fw_drv1 *d, struct uio *uio, int ioflag)
{
int err = 0, s;
struct fw_xfer *xfer;
@@ -441,7 +441,7 @@ readloop:
}
static int
-fw_write_async(struct fw_drv1 *d, struct uio *uio, int ioflag __unused)
+fw_write_async(struct fw_drv1 *d, struct uio *uio, int ioflag)
{
struct fw_xfer *xfer;
struct fw_pkt pkt;
diff --git a/sys/dev/ieee1394/fwdma.c b/sys/dev/ieee1394/fwdma.c
index 7c0812908cc..1a5232ed7ad 100644
--- a/sys/dev/ieee1394/fwdma.c
+++ b/sys/dev/ieee1394/fwdma.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fwdma.c,v 1.6 2006/10/12 01:31:15 christos Exp $ */
+/* $NetBSD: fwdma.c,v 1.7 2006/11/16 01:32:59 christos Exp $ */
/*-
* Copyright (c) 2003
* Hidetoshi Shimokawa. All rights reserved.
@@ -83,7 +83,7 @@ __FBSDID("$FreeBSD: /repoman/r/ncvs/src/sys/dev/firewire/fwdma.c,v 1.7 2005/01/0
#endif
static void
-fwdma_map_cb(void *arg, bus_dma_segment_t *segs, int nseg __unused, int error)
+fwdma_map_cb(void *arg, bus_dma_segment_t *segs, int nseg, int error)
{
bus_addr_t *baddr;
@@ -140,7 +140,7 @@ fwdma_malloc(struct firewire_comm *fc, int alignment, bus_size_t size,
}
void
-fwdma_free(struct firewire_comm *fc __unused, struct fwdma_alloc *dma)
+fwdma_free(struct firewire_comm *fc, struct fwdma_alloc *dma)
{
fw_bus_dmamap_unload(dma->fw_dma_tag, dma->dma_map);
fw_bus_dmamem_free(dma->fw_dma_tag, dma->v_addr, dma->dma_map);
@@ -169,7 +169,7 @@ fwdma_malloc_size(fw_bus_dma_tag_t dmat, bus_dmamap_t *dmamap,
void
fwdma_free_size(fw_bus_dma_tag_t dmat, bus_dmamap_t dmamap, void *vaddr,
- bus_size_t size __unused)
+ bus_size_t size)
{
fw_bus_dmamap_unload(dmat, dmamap);
fw_bus_dmamem_free(dmat, vaddr, dmamap);
diff --git a/sys/dev/ieee1394/fwohci.c b/sys/dev/ieee1394/fwohci.c
index b15fd13022c..d0eef5ebc97 100644
--- a/sys/dev/ieee1394/fwohci.c
+++ b/sys/dev/ieee1394/fwohci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fwohci.c,v 1.102 2006/10/12 01:31:15 christos Exp $ */
+/* $NetBSD: fwohci.c,v 1.103 2006/11/16 01:32:59 christos Exp $ */
/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
@@ -58,7 +58,7 @@
#include <sys/ktr.h>
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.102 2006/10/12 01:31:15 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.103 2006/11/16 01:32:59 christos Exp $");
#if defined(__DragonFly__) || __FreeBSD_version < 500000
#include <machine/clock.h> /* for DELAY() */
@@ -918,7 +918,7 @@ fwohci_execute_db(void *arg, bus_dma_segment_t *segs, int nseg, int error)
static void
fwohci_execute_db2(void *arg, bus_dma_segment_t *segs, int nseg,
- bus_size_t size __unused, int error)
+ bus_size_t size, int error)
{
fwohci_execute_db(arg, segs, nseg, error);
}
@@ -1546,7 +1546,7 @@ fwohci_rx_enable(struct fwohci_softc *sc, struct fwohci_dbch *dbch)
}
static int
-fwohci_next_cycle(struct firewire_comm *fc __unused, int cycle_now)
+fwohci_next_cycle(struct firewire_comm *fc, int cycle_now)
{
int sec, cycle, cycle_match;
@@ -2221,7 +2221,7 @@ again:
}
void
-fwohci_poll(struct firewire_comm *fc, int quick __unused, int count)
+fwohci_poll(struct firewire_comm *fc, int quick, int count)
{
int s;
uint32_t stat;
diff --git a/sys/dev/ieee1394/if_fwip.c b/sys/dev/ieee1394/if_fwip.c
index c67d69f93e9..927b2985619 100644
--- a/sys/dev/ieee1394/if_fwip.c
+++ b/sys/dev/ieee1394/if_fwip.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fwip.c,v 1.5 2006/10/12 01:31:16 christos Exp $ */
+/* $NetBSD: if_fwip.c,v 1.6 2006/11/16 01:32:59 christos Exp $ */
/*-
* Copyright (c) 2004
* Doug Rabson
@@ -254,7 +254,7 @@ fwip_probe(device_t dev)
}
#elif defined(__NetBSD__)
int
-fwipmatch(struct device *parent __unused, struct cfdata *cf __unused, void *aux)
+fwipmatch(struct device *parent, struct cfdata *cf, void *aux)
{
struct fw_attach_args *fwa = aux;
diff --git a/sys/dev/ieee1394/sbp.c b/sys/dev/ieee1394/sbp.c
index 3684d9dcad7..177291c5398 100644
--- a/sys/dev/ieee1394/sbp.c
+++ b/sys/dev/ieee1394/sbp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sbp.c,v 1.12 2006/10/12 01:31:16 christos Exp $ */
+/* $NetBSD: sbp.c,v 1.13 2006/11/16 01:32:59 christos Exp $ */
/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
@@ -573,7 +573,7 @@ END_DEBUG
}
#elif defined(__NetBSD__)
int
-sbpmatch(struct device *parent __unused, struct cfdata *cf __unused, void *aux)
+sbpmatch(struct device *parent, struct cfdata *cf, void *aux)
{
struct fw_attach_args *fwa = aux;
diff --git a/sys/dev/ir/irframe.c b/sys/dev/ir/irframe.c
index be1d83771f6..18f1c810757 100644
--- a/sys/dev/ir/irframe.c
+++ b/sys/dev/ir/irframe.c
@@ -1,4 +1,4 @@
-/* $NetBSD: irframe.c,v 1.35 2006/10/12 01:31:16 christos Exp $ */
+/* $NetBSD: irframe.c,v 1.36 2006/11/16 01:33:00 christos Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: irframe.c,v 1.35 2006/10/12 01:31:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: irframe.c,v 1.36 2006/11/16 01:33:00 christos Exp $");
#include "irframe.h"
@@ -99,7 +99,7 @@ extern struct cfdriver irframe_cd;
#define IRFRAMEUNIT(dev) (minor(dev))
int
-irframe_match(struct device *parent __unused, struct cfdata *match __unused,
+irframe_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct ir_attach_args *ia = aux;
@@ -108,7 +108,7 @@ irframe_match(struct device *parent __unused, struct cfdata *match __unused,
}
void
-irframe_attach(struct device *parent __unused, struct device *self, void *aux)
+irframe_attach(struct device *parent, struct device *self, void *aux)
{
struct irframe_softc *sc = device_private(self);
struct ir_attach_args *ia = aux;
@@ -152,7 +152,7 @@ irframe_attach(struct device *parent __unused, struct device *self, void *aux)
}
int
-irframe_activate(struct device *self __unused, enum devact act)
+irframe_activate(struct device *self, enum devact act)
{
/*struct irframe_softc *sc = device_private(self);*/
@@ -167,7 +167,7 @@ irframe_activate(struct device *self __unused, enum devact act)
}
int
-irframe_detach(struct device *self, int flags __unused)
+irframe_detach(struct device *self, int flags)
{
/*struct irframe_softc *sc = device_private(self);*/
int maj, mn;
@@ -339,8 +339,8 @@ irf_reset_params(struct irframe_softc *sc)
}
int
-irframeioctl(dev_t dev, u_long cmd, caddr_t addr, int flag __unused,
- struct lwp *l __unused)
+irframeioctl(dev_t dev, u_long cmd, caddr_t addr, int flag,
+ struct lwp *l)
{
struct irframe_softc *sc;
void *vaddr = addr;
diff --git a/sys/dev/ir/irframe_tty.c b/sys/dev/ir/irframe_tty.c
index f5837045cce..05c47b3676c 100644
--- a/sys/dev/ir/irframe_tty.c
+++ b/sys/dev/ir/irframe_tty.c
@@ -1,4 +1,4 @@
-/* $NetBSD: irframe_tty.c,v 1.39 2006/10/12 01:31:16 christos Exp $ */
+/* $NetBSD: irframe_tty.c,v 1.40 2006/11/16 01:33:00 christos Exp $ */
/*
* TODO
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: irframe_tty.c,v 1.39 2006/10/12 01:31:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: irframe_tty.c,v 1.40 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -202,7 +202,7 @@ static struct linesw irframet_disc = {
};
void
-irframettyattach(int n __unused)
+irframettyattach(int n)
{
(void) ttyldisc_attach(&irframet_disc);
@@ -215,7 +215,7 @@ irframettyattach(int n __unused)
*/
/* ARGSUSED */
int
-irframetopen(dev_t dev __unused, struct tty *tp)
+irframetopen(dev_t dev, struct tty *tp)
{
struct lwp *l = curlwp; /* XXX */
struct irframet_softc *sc;
@@ -266,7 +266,7 @@ irframetopen(dev_t dev __unused, struct tty *tp)
* Mimics part of ttyclose().
*/
int
-irframetclose(struct tty *tp, int flag __unused)
+irframetclose(struct tty *tp, int flag)
{
struct irframet_softc *sc = (struct irframet_softc *)tp->t_sc;
int s;
@@ -296,8 +296,8 @@ irframetclose(struct tty *tp, int flag __unused)
*/
/* ARGSUSED */
int
-irframetioctl(struct tty *tp, u_long cmd, caddr_t data, int flag __unused,
- struct lwp *l __unused)
+irframetioctl(struct tty *tp, u_long cmd, caddr_t data, int flag,
+ struct lwp *l)
{
struct irframet_softc *sc = (struct irframet_softc *)tp->t_sc;
int error;
@@ -471,8 +471,8 @@ irframetinput(int c, struct tty *tp)
/*** irframe methods ***/
int
-irframet_open(void *h, int flag __unused, int mode __unused,
- struct lwp *l __unused)
+irframet_open(void *h, int flag, int mode,
+ struct lwp *l)
{
struct tty *tp = h;
struct irframet_softc *sc = (struct irframet_softc *)tp->t_sc;
@@ -493,8 +493,8 @@ irframet_open(void *h, int flag __unused, int mode __unused,
}
int
-irframet_close(void *h, int flag __unused, int mode __unused,
- struct lwp *l __unused)
+irframet_close(void *h, int flag, int mode,
+ struct lwp *l)
{
struct tty *tp = h;
struct irframet_softc *sc = (struct irframet_softc *)tp->t_sc;
@@ -609,7 +609,7 @@ irt_putc(struct tty *tp, int c)
}
int
-irframet_write(void *h, struct uio *uio, int flag __unused)
+irframet_write(void *h, struct uio *uio, int flag)
{
struct tty *tp = h;
struct irframet_softc *sc = (struct irframet_softc *)tp->t_sc;
@@ -694,7 +694,7 @@ filt_irframetrdetach(struct knote *kn)
}
static int
-filt_irframetread(struct knote *kn, long hint __unused)
+filt_irframetread(struct knote *kn, long hint)
{
struct tty *tp = kn->kn_hook;
struct irframet_softc *sc = (struct irframet_softc *)tp->t_sc;
@@ -716,7 +716,7 @@ filt_irframetwdetach(struct knote *kn)
}
static int
-filt_irframetwrite(struct knote *kn, long hint __unused)
+filt_irframetwrite(struct knote *kn, long hint)
{
struct tty *tp = kn->kn_hook;
@@ -882,7 +882,7 @@ irt_setline(struct tty *tp, u_int line)
}
void
-irt_delay(struct tty *tp __unused, u_int ms)
+irt_delay(struct tty *tp, u_int ms)
{
if (cold)
delay(ms * 1000);
diff --git a/sys/dev/isa/ad1848_isa.c b/sys/dev/isa/ad1848_isa.c
index ea18bcb1041..2cde43bdc9e 100644
--- a/sys/dev/isa/ad1848_isa.c
+++ b/sys/dev/isa/ad1848_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ad1848_isa.c,v 1.31 2006/10/12 01:31:16 christos Exp $ */
+/* $NetBSD: ad1848_isa.c,v 1.32 2006/11/16 01:33:00 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -102,7 +102,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ad1848_isa.c,v 1.31 2006/10/12 01:31:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ad1848_isa.c,v 1.32 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -754,7 +754,7 @@ ad1848_isa_malloc(
}
void
-ad1848_isa_free(void *addr __unused, void *ptr, struct malloc_type *pool)
+ad1848_isa_free(void *addr, void *ptr, struct malloc_type *pool)
{
isa_free(ptr, pool);
@@ -780,7 +780,7 @@ ad1848_isa_round_buffersize(void *addr, int direction, size_t size)
}
paddr_t
-ad1848_isa_mappage(void *addr __unused, void *mem, off_t off, int prot)
+ad1848_isa_mappage(void *addr, void *mem, off_t off, int prot)
{
return isa_mappage(mem, off, prot);
}
diff --git a/sys/dev/isa/addcom_isa.c b/sys/dev/isa/addcom_isa.c
index 1d694603057..47e553a297c 100644
--- a/sys/dev/isa/addcom_isa.c
+++ b/sys/dev/isa/addcom_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: addcom_isa.c,v 1.14 2006/10/12 01:31:16 christos Exp $ */
+/* $NetBSD: addcom_isa.c,v 1.15 2006/11/16 01:33:00 christos Exp $ */
/*
* Copyright (c) 2000 Michael Graff. All rights reserved.
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: addcom_isa.c,v 1.14 2006/10/12 01:31:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: addcom_isa.c,v 1.15 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -113,7 +113,7 @@ CFATTACH_DECL(addcom_isa, sizeof(struct addcom_softc),
addcomprobe, addcomattach, NULL, NULL);
int
-addcomprobe(struct device *parent __unused, struct cfdata *self __unused,
+addcomprobe(struct device *parent, struct cfdata *self,
void *aux)
{
struct isa_attach_args *ia = aux;
@@ -185,7 +185,7 @@ out:
}
void
-addcomattach(struct device *parent __unused, struct device *self, void *aux)
+addcomattach(struct device *parent, struct device *self, void *aux)
{
struct addcom_softc *sc = (void *)self;
struct isa_attach_args *ia = aux;
diff --git a/sys/dev/isa/adv_isa.c b/sys/dev/isa/adv_isa.c
index 33a5353532e..6923dfb1944 100644
--- a/sys/dev/isa/adv_isa.c
+++ b/sys/dev/isa/adv_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: adv_isa.c,v 1.12 2006/10/12 01:31:16 christos Exp $ */
+/* $NetBSD: adv_isa.c,v 1.13 2006/11/16 01:33:00 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adv_isa.c,v 1.12 2006/10/12 01:31:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adv_isa.c,v 1.13 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -110,7 +110,7 @@ CFATTACH_DECL(adv_isa, sizeof(ASC_SOFTC),
/******************************************************************************/
int
-adv_isa_probe( struct device *parent __unused, struct cfdata *match __unused,
+adv_isa_probe( struct device *parent, struct cfdata *match,
void *aux)
{
struct isa_attach_args *ia = aux;
@@ -207,7 +207,7 @@ adv_isa_probe( struct device *parent __unused, struct cfdata *match __unused,
void
-adv_isa_attach(struct device *parent __unused, struct device *self, void *aux)
+adv_isa_attach(struct device *parent, struct device *self, void *aux)
{
struct isa_attach_args *ia = aux;
ASC_SOFTC *sc = (void *) self;
diff --git a/sys/dev/isa/aha_isa.c b/sys/dev/isa/aha_isa.c
index b9c2115a864..699b0175418 100644
--- a/sys/dev/isa/aha_isa.c
+++ b/sys/dev/isa/aha_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aha_isa.c,v 1.21 2006/10/12 01:31:16 christos Exp $ */
+/* $NetBSD: aha_isa.c,v 1.22 2006/11/16 01:33:00 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aha_isa.c,v 1.21 2006/10/12 01:31:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aha_isa.c,v 1.22 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -70,7 +70,7 @@ CFATTACH_DECL(aha_isa, sizeof(struct aha_softc),
* the actual probe routine to check it out.
*/
int
-aha_isa_probe(struct device *parent __unused, struct cfdata *match __unused,
+aha_isa_probe(struct device *parent, struct cfdata *match,
void *aux)
{
struct isa_attach_args *ia = aux;
@@ -126,7 +126,7 @@ aha_isa_probe(struct device *parent __unused, struct cfdata *match __unused,
* Attach all the sub-devices we can find
*/
void
-aha_isa_attach(struct device *parent __unused, struct device *self, void *aux)
+aha_isa_attach(struct device *parent, struct device *self, void *aux)
{
struct isa_attach_args *ia = aux;
struct aha_softc *sc = (void *)self;
diff --git a/sys/dev/isa/aic_isa.c b/sys/dev/isa/aic_isa.c
index d9c934e9ce8..b064993ef3c 100644
--- a/sys/dev/isa/aic_isa.c
+++ b/sys/dev/isa/aic_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aic_isa.c,v 1.18 2006/10/12 01:31:16 christos Exp $ */
+/* $NetBSD: aic_isa.c,v 1.19 2006/11/16 01:33:00 christos Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Charles M. Hannum. All rights reserved.
@@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic_isa.c,v 1.18 2006/10/12 01:31:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic_isa.c,v 1.19 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -98,7 +98,7 @@ CFATTACH_DECL(aic_isa, sizeof(struct aic_isa_softc),
* returns non-zero value if a controller is found.
*/
int
-aic_isa_probe(struct device *parent __unused, struct cfdata *match __unused,
+aic_isa_probe(struct device *parent, struct cfdata *match,
void *aux)
{
struct isa_attach_args *ia = aux;
@@ -142,7 +142,7 @@ aic_isa_probe(struct device *parent __unused, struct cfdata *match __unused,
}
void
-aic_isa_attach(struct device *parent __unused, struct device *self, void *aux)
+aic_isa_attach(struct device *parent, struct device *self, void *aux)
{
struct isa_attach_args *ia = aux;
struct aic_isa_softc *isc = (void *)self;
diff --git a/sys/dev/isa/aria.c b/sys/dev/isa/aria.c
index 07eac199fad..d7e51787b67 100644
--- a/sys/dev/isa/aria.c
+++ b/sys/dev/isa/aria.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aria.c,v 1.26 2006/10/12 01:31:16 christos Exp $ */
+/* $NetBSD: aria.c,v 1.27 2006/11/16 01:33:00 christos Exp $ */
/*-
* Copyright (c) 1995, 1996, 1998 Roland C. Dowdeswell. All rights reserved.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aria.c,v 1.26 2006/10/12 01:31:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aria.c,v 1.27 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -238,7 +238,7 @@ const struct audio_hw_if aria_hw_if = {
* Probe for the aria hardware.
*/
int
-ariaprobe(struct device *parent __unused, struct cfdata *cf, void *aux)
+ariaprobe(struct device *parent, struct cfdata *cf, void *aux)
{
bus_space_handle_t ioh;
struct isa_attach_args *ia;
@@ -395,7 +395,7 @@ aria_do_kludge(
* pseudo-device driver.
*/
void
-ariaattach(struct device *parent __unused, struct device *self, void *aux)
+ariaattach(struct device *parent, struct device *self, void *aux)
{
bus_space_handle_t ioh;
struct aria_softc *sc;
@@ -495,7 +495,7 @@ ariaopen(void *addr, int flags)
}
int
-aria_getdev(void *addr __unused, struct audio_device *retp)
+aria_getdev(void *addr, struct audio_device *retp)
{
*retp = aria_device;
@@ -576,8 +576,8 @@ aria_query_encoding(void *addr, struct audio_encoding *fp)
*/
int
-aria_round_blocksize(void *addr __unused, int blk __unused, int mode __unused,
- const audio_params_t *param __unused)
+aria_round_blocksize(void *addr, int blk, int mode,
+ const audio_params_t *param)
{
int i;
@@ -592,7 +592,7 @@ aria_round_blocksize(void *addr __unused, int blk __unused, int mode __unused,
}
int
-aria_get_props(void *addr __unused)
+aria_get_props(void *addr)
{
return AUDIO_PROP_FULLDUPLEX;
@@ -601,10 +601,10 @@ aria_get_props(void *addr __unused)
int
aria_set_params(
void *addr,
- int setmode __unused,
- int usemode __unused,
+ int setmode,
+ int usemode,
audio_params_t *p,
- audio_params_t *r __unused,
+ audio_params_t *r,
stream_filter_list_t *pfil,
stream_filter_list_t *rfil
)
diff --git a/sys/dev/isa/ast.c b/sys/dev/isa/ast.c
index fbe622648ce..8a8ac16be4d 100644
--- a/sys/dev/isa/ast.c
+++ b/sys/dev/isa/ast.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ast.c,v 1.57 2006/10/12 01:31:16 christos Exp $ */
+/* $NetBSD: ast.c,v 1.58 2006/11/16 01:33:00 christos Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ast.c,v 1.57 2006/10/12 01:31:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ast.c,v 1.58 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -72,7 +72,7 @@ CFATTACH_DECL(ast, sizeof(struct ast_softc),
astprobe, astattach, NULL, NULL);
int
-astprobe(struct device *parent __unused, struct cfdata *self __unused,
+astprobe(struct device *parent, struct cfdata *self,
void *aux)
{
struct isa_attach_args *ia = aux;
@@ -143,7 +143,7 @@ out:
}
void
-astattach(struct device *parent __unused, struct device *self, void *aux)
+astattach(struct device *parent, struct device *self, void *aux)
{
struct ast_softc *sc = (void *)self;
struct isa_attach_args *ia = aux;
diff --git a/sys/dev/isa/attimer_isa.c b/sys/dev/isa/attimer_isa.c
index 12250ee9ae9..3f2bc3dd5bf 100644
--- a/sys/dev/isa/attimer_isa.c
+++ b/sys/dev/isa/attimer_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: attimer_isa.c,v 1.3 2006/10/12 01:31:16 christos Exp $ */
+/* $NetBSD: attimer_isa.c,v 1.4 2006/11/16 01:33:00 christos Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: attimer_isa.c,v 1.3 2006/10/12 01:31:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: attimer_isa.c,v 1.4 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -91,7 +91,7 @@ CFATTACH_DECL(attimer_isa, sizeof(struct attimer_softc),
attimer_isa_match, attimer_isa_attach, NULL, NULL);
static int
-attimer_isa_match(struct device *parent __unused, struct cfdata *match __unused,
+attimer_isa_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct isa_attach_args *ia = aux;
@@ -134,7 +134,7 @@ attimer_isa_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-attimer_isa_attach(struct device *parent __unused, struct device *self,
+attimer_isa_attach(struct device *parent, struct device *self,
void *aux)
{
struct attimer_softc *sc = (struct attimer_softc *)self;
diff --git a/sys/dev/isa/aztech.c b/sys/dev/isa/aztech.c
index c70a2f33bd2..dfcb529eb49 100644
--- a/sys/dev/isa/aztech.c
+++ b/sys/dev/isa/aztech.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aztech.c,v 1.11 2006/10/12 01:31:16 christos Exp $ */
+/* $NetBSD: aztech.c,v 1.12 2006/11/16 01:33:00 christos Exp $ */
/* $OpenBSD: aztech.c,v 1.2 2001/12/05 10:27:06 mickey Exp $ */
/* $RuOBSD: aztech.c,v 1.11 2001/10/20 13:23:47 pva Exp $ */
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aztech.c,v 1.11 2006/10/12 01:31:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aztech.c,v 1.12 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -118,7 +118,7 @@ u_int8_t az_conv_vol(u_int8_t);
u_int8_t az_unconv_vol(u_int8_t);
int
-az_probe(struct device *parent __unused, struct cfdata *cf __unused, void *aux)
+az_probe(struct device *parent, struct cfdata *cf, void *aux)
{
struct isa_attach_args *ia = aux;
bus_space_tag_t iot = ia->ia_iot;
@@ -161,7 +161,7 @@ az_probe(struct device *parent __unused, struct cfdata *cf __unused, void *aux)
}
void
-az_attach(struct device *parent __unused, struct device *self, void *aux)
+az_attach(struct device *parent, struct device *self, void *aux)
{
struct az_softc *sc = (void *)self;
struct isa_attach_args *ia = aux;
@@ -310,8 +310,8 @@ az_find(bus_space_tag_t iot, bus_space_handle_t ioh)
}
void
-az_lm700x_init(bus_space_tag_t iot __unused, bus_space_handle_t ioh __unused,
- bus_size_t off __unused, u_int32_t data __unused)
+az_lm700x_init(bus_space_tag_t iot, bus_space_handle_t ioh,
+ bus_size_t off, u_int32_t data)
{
/* Do nothing */
return;
diff --git a/sys/dev/isa/bha_isa.c b/sys/dev/isa/bha_isa.c
index d163ae433e3..8071f1113de 100644
--- a/sys/dev/isa/bha_isa.c
+++ b/sys/dev/isa/bha_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bha_isa.c,v 1.28 2006/10/12 01:31:16 christos Exp $ */
+/* $NetBSD: bha_isa.c,v 1.29 2006/11/16 01:33:00 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bha_isa.c,v 1.28 2006/10/12 01:31:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bha_isa.c,v 1.29 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -69,7 +69,7 @@ CFATTACH_DECL(bha_isa, sizeof(struct bha_softc),
* the actual probe routine to check it out.
*/
int
-bha_isa_probe(struct device *parent __unused, struct cfdata *match __unused,
+bha_isa_probe(struct device *parent, struct cfdata *match,
void *aux)
{
struct isa_attach_args *ia = aux;
@@ -125,7 +125,7 @@ bha_isa_probe(struct device *parent __unused, struct cfdata *match __unused,
* Attach all the sub-devices we can find
*/
void
-bha_isa_attach(struct device *parent __unused, struct device *self,
+bha_isa_attach(struct device *parent, struct device *self,
void *aux)
{
struct isa_attach_args *ia = aux;
diff --git a/sys/dev/isa/boca.c b/sys/dev/isa/boca.c
index a210507900b..c90213f891b 100644
--- a/sys/dev/isa/boca.c
+++ b/sys/dev/isa/boca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: boca.c,v 1.46 2006/10/12 01:31:16 christos Exp $ */
+/* $NetBSD: boca.c,v 1.47 2006/11/16 01:33:00 christos Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: boca.c,v 1.46 2006/10/12 01:31:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: boca.c,v 1.47 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -76,7 +76,7 @@ CFATTACH_DECL(boca, sizeof(struct boca_softc),
bocaprobe, bocaattach, NULL, NULL);
int
-bocaprobe(struct device *parent __unused, struct cfdata *self __unused,
+bocaprobe(struct device *parent, struct cfdata *self,
void *aux)
{
struct isa_attach_args *ia = aux;
@@ -148,7 +148,7 @@ out:
}
void
-bocaattach(struct device *parent __unused, struct device *self, void *aux)
+bocaattach(struct device *parent, struct device *self, void *aux)
{
struct boca_softc *sc = (void *)self;
struct isa_attach_args *ia = aux;
diff --git a/sys/dev/isa/cms.c b/sys/dev/isa/cms.c
index 3211d6dabc5..ec358b75a67 100644
--- a/sys/dev/isa/cms.c
+++ b/sys/dev/isa/cms.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cms.c,v 1.13 2006/10/12 01:31:16 christos Exp $ */
+/* $NetBSD: cms.c,v 1.14 2006/11/16 01:33:00 christos Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cms.c,v 1.13 2006/10/12 01:31:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cms.c,v 1.14 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -114,7 +114,7 @@ static char cms_note_table[] = {
#define NOTE_TO_COUNT(note) cms_note_table[(((note)-CMS_FIRST_NOTE)%12)]
int
-cms_probe(struct device *parent __unused, struct cfdata *match __unused,
+cms_probe(struct device *parent, struct cfdata *match,
void *aux)
{
struct isa_attach_args *ia = aux;
@@ -164,7 +164,7 @@ out:
void
-cms_attach(struct device *parent __unused, struct device *self, void *aux)
+cms_attach(struct device *parent, struct device *self, void *aux)
{
struct cms_softc *sc = (struct cms_softc *)self;
struct isa_attach_args *ia = aux;
@@ -208,7 +208,7 @@ cms_attach(struct device *parent __unused, struct device *self, void *aux)
int
-cms_open(midisyn *ms, int flag __unused)
+cms_open(midisyn *ms, int flag)
{
struct cms_softc *sc = (struct cms_softc *)ms->data;
@@ -282,7 +282,7 @@ cms_on(midisyn *ms, uint_fast16_t vidx, midipitch_t mp, int16_t level_cB)
}
void
-cms_off(midisyn *ms, uint_fast16_t vidx, uint_fast8_t vel __unused)
+cms_off(midisyn *ms, uint_fast16_t vidx, uint_fast8_t vel)
{
struct cms_softc *sc = (struct cms_softc *)ms->data;
int chip = CHAN_TO_CHIP(vidx);
diff --git a/sys/dev/isa/com_isa.c b/sys/dev/isa/com_isa.c
index 43ac76dbc61..9900f438514 100644
--- a/sys/dev/isa/com_isa.c
+++ b/sys/dev/isa/com_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com_isa.c,v 1.26 2006/10/12 01:31:16 christos Exp $ */
+/* $NetBSD: com_isa.c,v 1.27 2006/11/16 01:33:00 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_isa.c,v 1.26 2006/10/12 01:31:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_isa.c,v 1.27 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -112,7 +112,7 @@ CFATTACH_DECL(com_isa, sizeof(struct com_isa_softc),
com_isa_probe, com_isa_attach, NULL, NULL);
int
-com_isa_probe(struct device *parent __unused, struct cfdata *match __unused,
+com_isa_probe(struct device *parent, struct cfdata *match,
void *aux)
{
bus_space_tag_t iot;
@@ -162,7 +162,7 @@ com_isa_probe(struct device *parent __unused, struct cfdata *match __unused,
}
void
-com_isa_attach(struct device *parent __unused, struct device *self,
+com_isa_attach(struct device *parent, struct device *self,
void *aux)
{
struct com_isa_softc *isc = (void *)self;
diff --git a/sys/dev/isa/com_multi.c b/sys/dev/isa/com_multi.c
index 6e485cffd39..dbd336a00f1 100644
--- a/sys/dev/isa/com_multi.c
+++ b/sys/dev/isa/com_multi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com_multi.c,v 1.23 2006/10/12 01:31:16 christos Exp $ */
+/* $NetBSD: com_multi.c,v 1.24 2006/11/16 01:33:00 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_multi.c,v 1.23 2006/10/12 01:31:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_multi.c,v 1.24 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -106,7 +106,7 @@ CFATTACH_DECL(com_multi, sizeof(struct com_softc),
com_multi_probe, com_multi_attach, NULL, NULL);
int
-com_multi_probe(struct device *parent __unused, struct cfdata *match, void *aux)
+com_multi_probe(struct device *parent, struct cfdata *match, void *aux)
{
int iobase;
struct cfdata *cf = match;
@@ -126,7 +126,7 @@ com_multi_probe(struct device *parent __unused, struct cfdata *match, void *aux)
}
void
-com_multi_attach(struct device *parent __unused, struct device *self, void *aux)
+com_multi_attach(struct device *parent, struct device *self, void *aux)
{
struct com_softc *sc = (void *)self;
struct commulti_attach_args *ca = aux;
diff --git a/sys/dev/isa/cy_isa.c b/sys/dev/isa/cy_isa.c
index 5cfb8bfdbc2..5a5e0c304b6 100644
--- a/sys/dev/isa/cy_isa.c
+++ b/sys/dev/isa/cy_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cy_isa.c,v 1.20 2006/10/12 01:31:16 christos Exp $ */
+/* $NetBSD: cy_isa.c,v 1.21 2006/11/16 01:33:00 christos Exp $ */
/*
* cy.c
@@ -10,7 +10,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cy_isa.c,v 1.20 2006/10/12 01:31:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cy_isa.c,v 1.21 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -33,7 +33,7 @@ CFATTACH_DECL(cy_isa, sizeof(struct cy_softc),
cy_isa_probe, cy_isa_attach, NULL, NULL);
int
-cy_isa_probe(struct device *parent __unused, struct cfdata *match, void *aux)
+cy_isa_probe(struct device *parent, struct cfdata *match, void *aux)
{
struct isa_attach_args *ia = aux;
struct cy_softc sc;
@@ -76,7 +76,7 @@ cy_isa_probe(struct device *parent __unused, struct cfdata *match, void *aux)
}
void
-cy_isa_attach(struct device *parent __unused, struct device *self, void *aux)
+cy_isa_attach(struct device *parent, struct device *self, void *aux)
{
struct cy_softc *sc = (void *) self;
struct isa_attach_args *ia = aux;
diff --git a/sys/dev/isa/depca_isa.c b/sys/dev/isa/depca_isa.c
index 2f0e6027a9c..938ddb9fc77 100644
--- a/sys/dev/isa/depca_isa.c
+++ b/sys/dev/isa/depca_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: depca_isa.c,v 1.10 2006/10/12 01:31:16 christos Exp $ */
+/* $NetBSD: depca_isa.c,v 1.11 2006/11/16 01:33:00 christos Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: depca_isa.c,v 1.10 2006/10/12 01:31:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: depca_isa.c,v 1.11 2006/11/16 01:33:00 christos Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -122,7 +122,7 @@ CFATTACH_DECL(depca_isa, sizeof(struct depca_isa_softc),
void *depca_isa_intr_establish(struct depca_softc *, struct lance_softc *);
int
-depca_isa_probe(struct device *parent __unused, struct cfdata *match __unused,
+depca_isa_probe(struct device *parent, struct cfdata *match,
void *aux)
{
struct isa_attach_args *ia = aux;
@@ -199,7 +199,7 @@ depca_isa_probe(struct device *parent __unused, struct cfdata *match __unused,
}
void
-depca_isa_attach(struct device *parent __unused, struct device *self, void *aux)
+depca_isa_attach(struct device *parent, struct device *self, void *aux)
{
struct depca_softc *sc = (void *) self;
struct depca_isa_softc *isc = (void *) self;
diff --git a/sys/dev/isa/dpt_isa.c b/sys/dev/isa/dpt_isa.c
index ea19af16ec8..360c5a31fd2 100644
--- a/sys/dev/isa/dpt_isa.c
+++ b/sys/dev/isa/dpt_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dpt_isa.c,v 1.16 2006/10/12 01:31:16 christos Exp $ */
+/* $NetBSD: dpt_isa.c,v 1.17 2006/11/16 01:33:00 christos Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Andrew Doran <ad@NetBSD.org>
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dpt_isa.c,v 1.16 2006/10/12 01:31:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dpt_isa.c,v 1.17 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -93,7 +93,7 @@ dpt_isa_wait(bus_space_handle_t ioh, bus_space_tag_t iot, u_int8_t mask,
* Match a supported board.
*/
static int
-dpt_isa_match(struct device *parent __unused, struct cfdata *match __unused,
+dpt_isa_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct isa_attach_args *ia = aux;
@@ -253,7 +253,7 @@ dpt_isa_probe(struct isa_attach_args *ia, int iobase)
* Attach a matched board.
*/
static void
-dpt_isa_attach(struct device *parent __unused, struct device *self, void *aux)
+dpt_isa_attach(struct device *parent, struct device *self, void *aux)
{
struct isa_attach_args *ia;
isa_chipset_tag_t ic;
diff --git a/sys/dev/isa/ess.c b/sys/dev/isa/ess.c
index 9231b68d355..f99a099c8f4 100644
--- a/sys/dev/isa/ess.c
+++ b/sys/dev/isa/ess.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ess.c,v 1.72 2006/10/12 01:31:16 christos Exp $ */
+/* $NetBSD: ess.c,v 1.73 2006/11/16 01:33:00 christos Exp $ */
/*
* Copyright 1997
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ess.c,v 1.72 2006/10/12 01:31:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ess.c,v 1.73 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -808,7 +808,7 @@ ess_identify(struct ess_softc *sc)
int
-ess_setup_sc(struct ess_softc *sc, int doinit __unused)
+ess_setup_sc(struct ess_softc *sc, int doinit)
{
callout_init(&sc->sc_poll1_ch);
@@ -911,7 +911,7 @@ irq_not1888:
* pseudo-device driver.
*/
void
-essattach(struct ess_softc *sc, int enablejoy __unused)
+essattach(struct ess_softc *sc, int enablejoy)
{
struct audio_attach_args arg;
int i;
@@ -1076,7 +1076,7 @@ essattach(struct ess_softc *sc, int enablejoy __unused)
*/
int
-ess_open(void *addr __unused, int flags __unused)
+ess_open(void *addr, int flags)
{
return 0;
}
@@ -1126,7 +1126,7 @@ ess_speaker_ctl(void *addr, int newstate)
}
int
-ess_getdev(void *addr __unused, struct audio_device *retp)
+ess_getdev(void *addr, struct audio_device *retp)
{
*retp = ess_device;
@@ -1134,7 +1134,7 @@ ess_getdev(void *addr __unused, struct audio_device *retp)
}
int
-ess_query_encoding(void *addr __unused, struct audio_encoding *fp)
+ess_query_encoding(void *addr, struct audio_encoding *fp)
{
/*struct ess_softc *sc = addr;*/
@@ -1635,8 +1635,8 @@ ess_audio2_poll(void *addr)
}
int
-ess_round_blocksize(void *addr __unused, int blk, int mode __unused,
- const audio_params_t *param __unused)
+ess_round_blocksize(void *addr, int blk, int mode,
+ const audio_params_t *param)
{
return blk & -8; /* round for max DMA size */
@@ -2149,7 +2149,7 @@ ess_malloc(void *addr, int direction, size_t size,
}
void
-ess_free(void *addr __unused, void *ptr, struct malloc_type *pool)
+ess_free(void *addr, void *ptr, struct malloc_type *pool)
{
isa_free(ptr, pool);
@@ -2173,21 +2173,21 @@ ess_round_buffersize(void *addr, int direction, size_t size)
}
paddr_t
-ess_mappage(void *addr __unused, void *mem, off_t off, int prot)
+ess_mappage(void *addr, void *mem, off_t off, int prot)
{
return isa_mappage(mem, off, prot);
}
int
-ess_1788_get_props(void *addr __unused)
+ess_1788_get_props(void *addr)
{
return AUDIO_PROP_MMAP | AUDIO_PROP_INDEPENDENT;
}
int
-ess_1888_get_props(void *addr __unused)
+ess_1888_get_props(void *addr)
{
return AUDIO_PROP_MMAP | AUDIO_PROP_INDEPENDENT | AUDIO_PROP_FULLDUPLEX;
diff --git a/sys/dev/isa/ess_isa.c b/sys/dev/isa/ess_isa.c
index 7932f3995b5..c2f5fd38a1e 100644
--- a/sys/dev/isa/ess_isa.c
+++ b/sys/dev/isa/ess_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ess_isa.c,v 1.17 2006/10/20 18:14:59 reinoud Exp $ */
+/* $NetBSD: ess_isa.c,v 1.18 2006/11/16 01:33:00 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ess_isa.c,v 1.17 2006/10/20 18:14:59 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ess_isa.c,v 1.18 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -66,7 +66,7 @@ CFATTACH_DECL(ess_isa, sizeof(struct ess_softc),
ess_isa_probe, ess_isa_attach, NULL, NULL);
int
-ess_isa_probe(struct device *parent __unused, struct cfdata *match __unused,
+ess_isa_probe(struct device *parent, struct cfdata *match,
void *aux)
{
int ret;
@@ -128,7 +128,7 @@ ess_isa_probe(struct device *parent __unused, struct cfdata *match __unused,
}
void
-ess_isa_attach(struct device *parent __unused, struct device *self, void *aux)
+ess_isa_attach(struct device *parent, struct device *self, void *aux)
{
struct ess_softc *sc;
struct isa_attach_args *ia;
diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c
index 16d2e8f812c..9dab60f27fd 100644
--- a/sys/dev/isa/fd.c
+++ b/sys/dev/isa/fd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.69 2006/10/12 01:31:16 christos Exp $ */
+/* $NetBSD: fd.c,v 1.70 2006/11/16 01:33:00 christos Exp $ */
/*-
* Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -88,7 +88,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.69 2006/10/12 01:31:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.70 2006/11/16 01:33:00 christos Exp $");
#include "rnd.h"
#include "opt_ddb.h"
@@ -697,14 +697,14 @@ fdfinish(fd, bp)
}
int
-fdread(dev_t dev, struct uio *uio, int flags __unused)
+fdread(dev_t dev, struct uio *uio, int flags)
{
return (physio(fdstrategy, NULL, dev, B_READ, minphys, uio));
}
int
-fdwrite(dev_t dev, struct uio *uio, int flags __unused)
+fdwrite(dev_t dev, struct uio *uio, int flags)
{
return (physio(fdstrategy, NULL, dev, B_WRITE, minphys, uio));
@@ -810,7 +810,7 @@ out_fdc(iot, ioh, x)
}
int
-fdopen(dev_t dev, int flags __unused, int mode __unused, struct lwp *l __unused)
+fdopen(dev_t dev, int flags, int mode, struct lwp *l)
{
struct fd_softc *fd;
const struct fd_type *type;
@@ -836,7 +836,7 @@ fdopen(dev_t dev, int flags __unused, int mode __unused, struct lwp *l __unused)
}
int
-fdclose(dev_t dev, int flags __unused, int mode __unused, struct lwp *l __unused)
+fdclose(dev_t dev, int flags, int mode, struct lwp *l)
{
struct fd_softc *fd = device_lookup(&fd_cd, FDUNIT(dev));
@@ -1553,7 +1553,7 @@ fdformat(dev, finfo, l)
* floppy.
*/
void
-fd_mountroot_hook(struct device *dev __unused)
+fd_mountroot_hook(struct device *dev)
{
int c;
diff --git a/sys/dev/isa/fdc_isa.c b/sys/dev/isa/fdc_isa.c
index f37892e34ad..e5174e21302 100644
--- a/sys/dev/isa/fdc_isa.c
+++ b/sys/dev/isa/fdc_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fdc_isa.c,v 1.13 2006/10/12 01:31:16 christos Exp $ */
+/* $NetBSD: fdc_isa.c,v 1.14 2006/11/16 01:33:00 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdc_isa.c,v 1.13 2006/10/12 01:31:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdc_isa.c,v 1.14 2006/11/16 01:33:00 christos Exp $");
#include "rnd.h"
@@ -111,8 +111,8 @@ void fdc_isa_forceintr(void *);
#endif
int
-fdc_isa_probe(struct device *parent __unused,
- struct cfdata *match __unused,
+fdc_isa_probe(struct device *parent,
+ struct cfdata *match,
void *aux)
{
struct isa_attach_args *ia = aux;
@@ -188,7 +188,7 @@ fdc_isa_probe(struct device *parent __unused,
}
void
-fdc_isa_attach(struct device *parent __unused,
+fdc_isa_attach(struct device *parent,
struct device *self,
void *aux)
{
diff --git a/sys/dev/isa/gus.c b/sys/dev/isa/gus.c
index cdd33ac142f..cc162767813 100644
--- a/sys/dev/isa/gus.c
+++ b/sys/dev/isa/gus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: gus.c,v 1.95 2006/10/12 01:31:16 christos Exp $ */
+/* $NetBSD: gus.c,v 1.96 2006/11/16 01:33:00 christos Exp $ */
/*-
* Copyright (c) 1996, 1999 The NetBSD Foundation, Inc.
@@ -95,7 +95,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gus.c,v 1.95 2006/10/12 01:31:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gus.c,v 1.96 2006/11/16 01:33:00 christos Exp $");
#include "gus.h"
#if NGUS > 0
@@ -660,7 +660,7 @@ struct audio_device gus_device = {
int
-gusprobe(struct device *parent __unused, struct cfdata *match __unused,
+gusprobe(struct device *parent, struct cfdata *match,
void *aux)
{
struct isa_attach_args *ia;
@@ -821,7 +821,7 @@ bad1:
*/
void
-gusattach(struct device *parent __unused, struct device *self, void *aux)
+gusattach(struct device *parent, struct device *self, void *aux)
{
struct gus_softc *sc;
struct isa_attach_args *ia;
@@ -2279,8 +2279,8 @@ gusmax_set_params(void *addr, int setmode, int usemode, audio_params_t *p,
int
gus_set_params(
void *addr,
- int setmode, int usemode __unused,
- audio_params_t *p, audio_params_t *r __unused,
+ int setmode, int usemode,
+ audio_params_t *p, audio_params_t *r,
stream_filter_list_t *pfil, stream_filter_list_t *rfil)
{
audio_params_t hw;
@@ -2376,7 +2376,7 @@ gusmax_round_blocksize(void * addr, int blocksize,
int
gus_round_blocksize(void * addr, int blocksize,
- int mode __unused, const audio_params_t *param __unused)
+ int mode, const audio_params_t *param)
{
struct gus_softc *sc;
@@ -2997,7 +2997,7 @@ gus_init_cs4231(struct gus_softc *sc)
* Return info about the audio device, for the AUDIO_GETINFO ioctl
*/
int
-gus_getdev(void *addr __unused, struct audio_device *dev)
+gus_getdev(void *addr, struct audio_device *dev)
{
*dev = gus_device;
@@ -3009,8 +3009,8 @@ gus_getdev(void *addr __unused, struct audio_device *dev)
*/
int
-gus_set_in_gain(caddr_t addr __unused, u_int gain __unused,
- u_char balance __unused)
+gus_set_in_gain(caddr_t addr, u_int gain,
+ u_char balance)
{
DPRINTF(("gus_set_in_gain called\n"));
@@ -3018,7 +3018,7 @@ gus_set_in_gain(caddr_t addr __unused, u_int gain __unused,
}
int
-gus_get_in_gain(caddr_t addr __unused)
+gus_get_in_gain(caddr_t addr)
{
DPRINTF(("gus_get_in_gain called\n"));
@@ -3658,7 +3658,7 @@ gusmax_get_props(void *addr)
}
STATIC int
-gusmax_mixer_query_devinfo(void *addr __unused, mixer_devinfo_t *dip)
+gusmax_mixer_query_devinfo(void *addr, mixer_devinfo_t *dip)
{
DPRINTF(("gusmax_query_devinfo: index=%d\n", dip->index));
@@ -4003,7 +4003,7 @@ mute:
}
STATIC int
-gus_query_encoding(void *addr __unused, struct audio_encoding *fp)
+gus_query_encoding(void *addr, struct audio_encoding *fp)
{
switch (fp->index) {
diff --git a/sys/dev/isa/i82365_isa.c b/sys/dev/isa/i82365_isa.c
index 5fd612091b2..836afdb1ae0 100644
--- a/sys/dev/isa/i82365_isa.c
+++ b/sys/dev/isa/i82365_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: i82365_isa.c,v 1.26 2006/10/12 01:31:16 christos Exp $ */
+/* $NetBSD: i82365_isa.c,v 1.27 2006/11/16 01:33:00 christos Exp $ */
/*
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i82365_isa.c,v 1.26 2006/10/12 01:31:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i82365_isa.c,v 1.27 2006/11/16 01:33:00 christos Exp $");
#define PCICISADEBUG
@@ -88,7 +88,7 @@ static struct pcmcia_chip_functions pcic_isa_functions = {
};
int
-pcic_isa_probe(struct device *parent __unused, struct cfdata *match __unused,
+pcic_isa_probe(struct device *parent, struct cfdata *match,
void *aux)
{
struct isa_attach_args *ia = aux;
@@ -183,7 +183,7 @@ pcic_isa_probe(struct device *parent __unused, struct cfdata *match __unused,
}
void
-pcic_isa_attach( struct device *parent __unused, struct device *self,
+pcic_isa_attach( struct device *parent, struct device *self,
void *aux)
{
struct pcic_softc *sc = (void *) self;
diff --git a/sys/dev/isa/if_ai.c b/sys/dev/isa/if_ai.c
index d15c703504e..010e0569cbe 100644
--- a/sys/dev/isa/if_ai.c
+++ b/sys/dev/isa/if_ai.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ai.c,v 1.24 2006/10/12 01:31:16 christos Exp $ */
+/* $NetBSD: if_ai.c,v 1.25 2006/11/16 01:33:00 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ai.c,v 1.24 2006/10/12 01:31:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ai.c,v 1.25 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -135,7 +135,7 @@ ai_reset(sc, why)
}
static void
-ai_atten(struct ie_softc *sc, int why __unused)
+ai_atten(struct ie_softc *sc, int why)
{
struct ai_softc* asc = (struct ai_softc *) sc;
bus_space_write_1(asc->sc_regt, asc->sc_regh, AI_ATTN, 0);
@@ -230,7 +230,7 @@ ai_write_24 (sc, offset, addr)
}
int
-ai_match(struct device *parent __unused, struct cfdata *cf __unused, void *aux)
+ai_match(struct device *parent, struct cfdata *cf, void *aux)
{
int rv = 0;
u_int8_t val, type;
@@ -326,7 +326,7 @@ out:
}
void
-ai_attach(struct device *parent __unused, struct device *self, void *aux)
+ai_attach(struct device *parent, struct device *self, void *aux)
{
struct ai_softc *asc = (void *)self;
struct ie_softc *sc = &asc->sc_ie;
diff --git a/sys/dev/isa/if_ate.c b/sys/dev/isa/if_ate.c
index f7065182a04..2214e6ea525 100644
--- a/sys/dev/isa/if_ate.c
+++ b/sys/dev/isa/if_ate.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ate.c,v 1.46 2006/10/12 01:31:16 christos Exp $ */
+/* $NetBSD: if_ate.c,v 1.47 2006/11/16 01:33:00 christos Exp $ */
/*
* All Rights Reserved, Copyright (C) Fujitsu Limited 1995
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ate.c,v 1.46 2006/10/12 01:31:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ate.c,v 1.47 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -97,7 +97,7 @@ static int const ate_iomap[8] = {
* Determine if the device is present.
*/
int
-ate_match(struct device *parent __unused, struct cfdata *match __unused,
+ate_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct isa_attach_args *ia = aux;
@@ -345,7 +345,7 @@ ate_detect(bus_space_tag_t iot, bus_space_handle_t ioh,
}
void
-ate_attach(struct device *parent __unused, struct device *self, void *aux)
+ate_attach(struct device *parent, struct device *self, void *aux)
{
struct ate_softc *isc = (struct ate_softc *)self;
struct mb86960_softc *sc = &isc->sc_mb86960;
diff --git a/sys/dev/isa/if_cs_isa.c b/sys/dev/isa/if_cs_isa.c
index 1fe38d902a5..fdce5f2a3c5 100644
--- a/sys/dev/isa/if_cs_isa.c
+++ b/sys/dev/isa/if_cs_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cs_isa.c,v 1.17 2006/10/12 01:31:16 christos Exp $ */
+/* $NetBSD: if_cs_isa.c,v 1.18 2006/11/16 01:33:00 christos Exp $ */
/*
* Copyright 1997
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cs_isa.c,v 1.17 2006/10/12 01:31:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cs_isa.c,v 1.18 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -68,7 +68,7 @@ CFATTACH_DECL(cs_isa, sizeof(struct cs_softc),
cs_isa_probe, cs_isa_attach, NULL, NULL);
int
-cs_isa_probe(struct device *parent __unused, struct cfdata *cf __unused,
+cs_isa_probe(struct device *parent, struct cfdata *cf,
void *aux)
{
struct isa_attach_args *ia = aux;
@@ -214,7 +214,7 @@ cs_isa_probe(struct device *parent __unused, struct cfdata *cf __unused,
}
void
-cs_isa_attach(struct device *parent __unused, struct device *self, void *aux)
+cs_isa_attach(struct device *parent, struct device *self, void *aux)
{
struct cs_softc *sc = (struct cs_softc *) self;
struct cs_softc_isa *isc = (void *) self;
diff --git a/sys/dev/isa/if_ec.c b/sys/dev/isa/if_ec.c
index 9433a1b0287..c90508d1712 100644
--- a/sys/dev/isa/if_ec.c
+++ b/sys/dev/isa/if_ec.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ec.c,v 1.28 2006/10/12 01:31:16 christos Exp $ */
+/* $NetBSD: if_ec.c,v 1.29 2006/11/16 01:33:00 christos Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ec.c,v 1.28 2006/10/12 01:31:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ec.c,v 1.29 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -127,7 +127,7 @@ static const int ec_membase[] = {
#define NEC_MEMBASE (sizeof(ec_membase) / sizeof(ec_membase[0]))
int
-ec_probe(struct device *parent __unused, struct cfdata *match __unused,
+ec_probe(struct device *parent, struct cfdata *match,
void *aux)
{
struct isa_attach_args *ia = aux;
@@ -251,7 +251,7 @@ ec_probe(struct device *parent __unused, struct cfdata *match __unused,
}
void
-ec_attach(struct device *parent __unused, struct device *self, void *aux)
+ec_attach(struct device *parent, struct device *self, void *aux)
{
struct ec_softc *esc = (struct ec_softc *)self;
struct dp8390_softc *sc = &esc->sc_dp8390;
@@ -509,7 +509,7 @@ ec_attach(struct device *parent __unused, struct device *self, void *aux)
}
int
-ec_fake_test_mem(struct dp8390_softc *sc __unused)
+ec_fake_test_mem(struct dp8390_softc *sc)
{
/*
diff --git a/sys/dev/isa/if_ef.c b/sys/dev/isa/if_ef.c
index 84b59a4998a..bf2f77056f8 100644
--- a/sys/dev/isa/if_ef.c
+++ b/sys/dev/isa/if_ef.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ef.c,v 1.22 2006/10/12 01:31:16 christos Exp $ */
+/* $NetBSD: if_ef.c,v 1.23 2006/11/16 01:33:00 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ef.c,v 1.22 2006/10/12 01:31:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ef.c,v 1.23 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -200,7 +200,7 @@ ef_reset(sc, why)
}
static void
-ef_atten(struct ie_softc *sc, int why __unused)
+ef_atten(struct ie_softc *sc, int why)
{
struct ef_softc* esc = (struct ef_softc *) sc;
bus_space_write_1(esc->sc_regt, esc->sc_regh, EF_ATTN, 1);
@@ -349,7 +349,7 @@ ef_mediastatus(sc, ifmr)
}
int
-ef_match(struct device *parent, struct cfdata *cf __unused, void *aux)
+ef_match(struct device *parent, struct cfdata *cf, void *aux)
{
struct isa_attach_args * const ia = aux;
diff --git a/sys/dev/isa/if_eg.c b/sys/dev/isa/if_eg.c
index 680fab39a12..370c3e07e06 100644
--- a/sys/dev/isa/if_eg.c
+++ b/sys/dev/isa/if_eg.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_eg.c,v 1.70 2006/10/12 01:31:16 christos Exp $ */
+/* $NetBSD: if_eg.c,v 1.71 2006/11/16 01:33:00 christos Exp $ */
/*
* Copyright (c) 1993 Dean Huxley <dean@fsa.ca>
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_eg.c,v 1.70 2006/10/12 01:31:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_eg.c,v 1.71 2006/11/16 01:33:00 christos Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -162,7 +162,7 @@ egprintpcb(pcb)
static inline void
-egprintstat(u_char b __unused)
+egprintstat(u_char b)
{
DPRINTF(("%s %s %s %s %s %s %s\n",
(b & EG_STAT_HCRE)?"HCRE":"",
@@ -313,7 +313,7 @@ egreadPCB(iot, ioh, pcb)
*/
int
-egprobe(struct device *parent __unused, struct cfdata *match __unused,
+egprobe(struct device *parent, struct cfdata *match,
void *aux)
{
struct isa_attach_args *ia = aux;
@@ -392,7 +392,7 @@ egprobe(struct device *parent __unused, struct cfdata *match __unused,
}
void
-egattach(struct device *parent __unused, struct device *self, void *aux)
+egattach(struct device *parent, struct device *self, void *aux)
{
struct eg_softc *sc = (void *)self;
struct isa_attach_args *ia = aux;
diff --git a/sys/dev/isa/if_el.c b/sys/dev/isa/if_el.c
index 20c517d4e1a..1d62668cdae 100644
--- a/sys/dev/isa/if_el.c
+++ b/sys/dev/isa/if_el.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_el.c,v 1.75 2006/10/12 01:31:16 christos Exp $ */
+/* $NetBSD: if_el.c,v 1.76 2006/11/16 01:33:00 christos Exp $ */
/*
* Copyright (c) 1994, Matthew E. Kimmel. Permission is hereby granted
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_el.c,v 1.75 2006/10/12 01:31:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_el.c,v 1.76 2006/11/16 01:33:00 christos Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -115,7 +115,7 @@ CFATTACH_DECL(el, sizeof(struct el_softc),
* (XXX - cgd -- needs help)
*/
int
-elprobe(struct device *parent __unused, struct cfdata *match __unused,
+elprobe(struct device *parent, struct cfdata *match,
void *aux)
{
struct isa_attach_args *ia = aux;
@@ -203,7 +203,7 @@ elprobe(struct device *parent __unused, struct cfdata *match __unused,
* assume that the IRQ given is correct.
*/
void
-elattach(struct device *parent __unused, struct device *self, void *aux)
+elattach(struct device *parent, struct device *self, void *aux)
{
struct el_softc *sc = (void *)self;
struct isa_attach_args *ia = aux;
diff --git a/sys/dev/isa/if_ep_isa.c b/sys/dev/isa/if_ep_isa.c
index 9bd3d86988d..1b44a4e5ba0 100644
--- a/sys/dev/isa/if_ep_isa.c
+++ b/sys/dev/isa/if_ep_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ep_isa.c,v 1.39 2006/10/12 01:31:16 christos Exp $ */
+/* $NetBSD: if_ep_isa.c,v 1.40 2006/11/16 01:33:00 christos Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ep_isa.c,v 1.39 2006/10/12 01:31:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ep_isa.c,v 1.40 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -156,7 +156,7 @@ epaddcard(bus, iobase, irq, model)
* calls we look for matching cards.
*/
int
-ep_isa_probe(struct device *parent, struct cfdata *match __unused,
+ep_isa_probe(struct device *parent, struct cfdata *match,
void *aux)
{
struct isa_attach_args *ia = aux;
@@ -361,7 +361,7 @@ good:
}
void
-ep_isa_attach(struct device *parent __unused, struct device *self, void *aux)
+ep_isa_attach(struct device *parent, struct device *self, void *aux)
{
struct ep_softc *sc = (void *)self;
struct isa_attach_args *ia = aux;
diff --git a/sys/dev/isa/if_fmv_isa.c b/sys/dev/isa/if_fmv_isa.c
index 5606d1809fa..af19e9e6bf5 100644
--- a/sys/dev/isa/if_fmv_isa.c
+++ b/sys/dev/isa/if_fmv_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fmv_isa.c,v 1.8 2006/10/12 01:31:16 christos Exp $ */
+/* $NetBSD: if_fmv_isa.c,v 1.9 2006/11/16 01:33:00 christos Exp $ */
/*
* All Rights Reserved, Copyright (C) Fujitsu Limited 1995
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fmv_isa.c,v 1.8 2006/10/12 01:31:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fmv_isa.c,v 1.9 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -95,7 +95,7 @@ static int const fmv_iomap[8] = {
* Determine if the device is present.
*/
int
-fmv_isa_match(struct device *parent __unused, struct cfdata *match __unused,
+fmv_isa_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct isa_attach_args *ia = aux;
@@ -261,7 +261,7 @@ fmv_find(bus_space_tag_t iot, bus_space_handle_t ioh, int *iobase, int *irq)
}
void
-fmv_isa_attach(struct device *parent __unused, struct device *self __unused,
+fmv_isa_attach(struct device *parent, struct device *self,
void *aux)
{
struct fmv_isa_softc *isc = (struct fmv_isa_softc *)self;
diff --git a/sys/dev/isa/if_ix.c b/sys/dev/isa/if_ix.c
index 97ae43b7b90..a9398e31383 100644
--- a/sys/dev/isa/if_ix.c
+++ b/sys/dev/isa/if_ix.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ix.c,v 1.25 2006/10/12 01:31:16 christos Exp $ */
+/* $NetBSD: if_ix.c,v 1.26 2006/11/16 01:33:00 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ix.c,v 1.25 2006/10/12 01:31:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ix.c,v 1.26 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -137,7 +137,7 @@ ix_reset(sc, why)
}
static void
-ix_atten(struct ie_softc *sc, int why __unused)
+ix_atten(struct ie_softc *sc, int why)
{
struct ix_softc* isc = (struct ix_softc *) sc;
bus_space_write_1(isc->sc_regt, isc->sc_regh, IX_ATTN, 0);
@@ -511,7 +511,7 @@ ix_mediastatus(sc, ifmr)
}
int
-ix_match(struct device *parent __unused, struct cfdata *cf __unused, void *aux)
+ix_match(struct device *parent, struct cfdata *cf, void *aux)
{
int i;
int rv = 0;
@@ -715,7 +715,7 @@ out:
}
void
-ix_attach(struct device *parent __unused, struct device *self, void *aux)
+ix_attach(struct device *parent, struct device *self, void *aux)
{
struct ix_softc *isc = (void *)self;
struct ie_softc *sc = &isc->sc_ie;
diff --git a/sys/dev/isa/if_iy.c b/sys/dev/isa/if_iy.c
index 9474074f5d8..333a75f7ea4 100644
--- a/sys/dev/isa/if_iy.c
+++ b/sys/dev/isa/if_iy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iy.c,v 1.73 2006/10/12 01:31:16 christos Exp $ */
+/* $NetBSD: if_iy.c,v 1.74 2006/11/16 01:33:00 christos Exp $ */
/* #define IYDEBUG */
/* #define IYMEMDEBUG */
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iy.c,v 1.73 2006/10/12 01:31:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iy.c,v 1.74 2006/11/16 01:33:00 christos Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -192,7 +192,7 @@ static u_int8_t eepro_irqmap[] = EEPP_INTMAP;
static u_int8_t eepro_revirqmap[] = EEPP_RINTMAP;
int
-iyprobe(struct device *parent __unused, struct cfdata *match __unused,
+iyprobe(struct device *parent, struct cfdata *match,
void *aux)
{
struct isa_attach_args *ia = aux;
@@ -292,7 +292,7 @@ out:
}
void
-iyattach(struct device *parent __unused, struct device *self, void *aux)
+iyattach(struct device *parent, struct device *self, void *aux)
{
struct iy_softc *sc = (void *)self;
struct isa_attach_args *ia = aux;
diff --git a/sys/dev/isa/if_lc_isa.c b/sys/dev/isa/if_lc_isa.c
index 7b1b9e40c30..171f1769699 100644
--- a/sys/dev/isa/if_lc_isa.c
+++ b/sys/dev/isa/if_lc_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_lc_isa.c,v 1.26 2006/10/12 01:31:16 christos Exp $ */
+/* $NetBSD: if_lc_isa.c,v 1.27 2006/11/16 01:33:00 christos Exp $ */
/*-
* Copyright (c) 1994, 1995, 1997 Matt Thomas <matt@3am-software.com>
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_lc_isa.c,v 1.26 2006/10/12 01:31:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_lc_isa.c,v 1.27 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -184,7 +184,7 @@ outio:
}
static int
-lemac_isa_probe(struct device *parent __unused, struct cfdata *match, void *aux)
+lemac_isa_probe(struct device *parent, struct cfdata *match, void *aux)
{
struct isa_attach_args *ia = aux;
struct cfdata *cf = match;
@@ -196,7 +196,7 @@ lemac_isa_probe(struct device *parent __unused, struct cfdata *match, void *aux)
}
static void
-lemac_isa_attach(struct device *parent __unused, struct device *self, void *aux)
+lemac_isa_attach(struct device *parent, struct device *self, void *aux)
{
lemac_softc_t *sc = (void *)self;
struct isa_attach_args *ia = aux;
diff --git a/sys/dev/isa/if_le_isa.c b/sys/dev/isa/if_le_isa.c
index e57694a14b9..11581de0978 100644
--- a/sys/dev/isa/if_le_isa.c
+++ b/sys/dev/isa/if_le_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le_isa.c,v 1.42 2006/10/12 01:31:16 christos Exp $ */
+/* $NetBSD: if_le_isa.c,v 1.43 2006/11/16 01:33:00 christos Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le_isa.c,v 1.42 2006/10/12 01:31:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_isa.c,v 1.43 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -187,14 +187,14 @@ le_isa_rdcsr(sc, port)
}
int
-ne2100_isa_probe(struct device *parent __unused, struct cfdata *match,
+ne2100_isa_probe(struct device *parent, struct cfdata *match,
void *aux)
{
return (lance_isa_probe(aux, &ne2100_params, match->cf_flags));
}
int
-bicc_isa_probe(struct device *parent __unused, struct cfdata *match, void *aux)
+bicc_isa_probe(struct device *parent, struct cfdata *match, void *aux)
{
return (lance_isa_probe(aux, &bicc_params, match->cf_flags));
}
@@ -272,7 +272,7 @@ bad:
}
void
-le_dummyattach(struct device *parent __unused, struct device *self,
+le_dummyattach(struct device *parent, struct device *self,
void *aux)
{
printf("\n");
@@ -281,8 +281,8 @@ le_dummyattach(struct device *parent __unused, struct device *self,
}
int
-le_dummyprobe(struct device *parent __unused, struct cfdata *match __unused,
- void *aux __unused)
+le_dummyprobe(struct device *parent, struct cfdata *match,
+ void *aux)
{
return (1);
}
@@ -304,7 +304,7 @@ le_bicc_attach(parent, self, aux)
}
void
-le_isa_attach(struct device *parent __unused, struct le_softc *lesc,
+le_isa_attach(struct device *parent, struct le_softc *lesc,
struct isa_attach_args *ia, struct le_isa_params *p)
{
struct lance_softc *sc = &lesc->sc_am7990.lsc;
diff --git a/sys/dev/isa/if_ne_isa.c b/sys/dev/isa/if_ne_isa.c
index ed6118eef1e..971d12f2c45 100644
--- a/sys/dev/isa/if_ne_isa.c
+++ b/sys/dev/isa/if_ne_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ne_isa.c,v 1.22 2006/10/12 01:31:16 christos Exp $ */
+/* $NetBSD: if_ne_isa.c,v 1.23 2006/11/16 01:33:00 christos Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ne_isa.c,v 1.22 2006/10/12 01:31:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ne_isa.c,v 1.23 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -83,7 +83,7 @@ CFATTACH_DECL(ne_isa, sizeof(struct ne_isa_softc),
ne_isa_match, ne_isa_attach, NULL, NULL);
int
-ne_isa_match(struct device *parent __unused, struct cfdata *match __unused,
+ne_isa_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct isa_attach_args *ia = aux;
@@ -139,7 +139,7 @@ ne_isa_match(struct device *parent __unused, struct cfdata *match __unused,
}
void
-ne_isa_attach(struct device *parent __unused, struct device *self, void *aux)
+ne_isa_attach(struct device *parent, struct device *self, void *aux)
{
struct ne_isa_softc *isc = (struct ne_isa_softc *)self;
struct ne2000_softc *nsc = &isc->sc_ne2000;
diff --git a/sys/dev/isa/if_ntwoc_isa.c b/sys/dev/isa/if_ntwoc_isa.c
index e5e0bac2248..f09a36eabe5 100644
--- a/sys/dev/isa/if_ntwoc_isa.c
+++ b/sys/dev/isa/if_ntwoc_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ntwoc_isa.c,v 1.14 2006/10/12 01:31:16 christos Exp $ */
+/* $NetBSD: if_ntwoc_isa.c,v 1.15 2006/11/16 01:33:00 christos Exp $ */
/*
* Copyright (c) 1999 Christian E. Hopps
* Copyright (c) 1996 John Hay.
@@ -29,11 +29,11 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: if_ntwoc_isa.c,v 1.14 2006/10/12 01:31:16 christos Exp $
+ * $Id: if_ntwoc_isa.c,v 1.15 2006/11/16 01:33:00 christos Exp $
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ntwoc_isa.c,v 1.14 2006/10/12 01:31:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ntwoc_isa.c,v 1.15 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -186,7 +186,7 @@ ntwoc_isa_set_off(struct sca_softc *sca)
}
static int
-ntwoc_isa_probe(struct device *parent __unused, struct cfdata *match, void *aux)
+ntwoc_isa_probe(struct device *parent, struct cfdata *match, void *aux)
{
struct isa_attach_args *ia;
bus_space_tag_t iot, memt;
@@ -381,7 +381,7 @@ out:
* we win! attach the card
*/
static void
-ntwoc_isa_attach(struct device *parent __unused, struct device *self, void *aux)
+ntwoc_isa_attach(struct device *parent, struct device *self, void *aux)
{
struct ntwoc_isa_softc *sc;
struct isa_attach_args *ia;
diff --git a/sys/dev/isa/if_sm_isa.c b/sys/dev/isa/if_sm_isa.c
index a81327f8211..535e077070b 100644
--- a/sys/dev/isa/if_sm_isa.c
+++ b/sys/dev/isa/if_sm_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sm_isa.c,v 1.16 2006/10/12 01:31:16 christos Exp $ */
+/* $NetBSD: if_sm_isa.c,v 1.17 2006/11/16 01:33:00 christos Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sm_isa.c,v 1.16 2006/10/12 01:31:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sm_isa.c,v 1.17 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -80,7 +80,7 @@ CFATTACH_DECL(sm_isa, sizeof(struct sm_isa_softc),
sm_isa_match, sm_isa_attach, NULL, NULL);
int
-sm_isa_match(struct device *parent __unused, struct cfdata *match __unused,
+sm_isa_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct isa_attach_args *ia = aux;
@@ -159,7 +159,7 @@ sm_isa_match(struct device *parent __unused, struct cfdata *match __unused,
}
void
-sm_isa_attach(struct device *parent __unused, struct device *self, void *aux)
+sm_isa_attach(struct device *parent, struct device *self, void *aux)
{
struct sm_isa_softc *isc = (struct sm_isa_softc *)self;
struct smc91cxx_softc *sc = &isc->sc_smc;
diff --git a/sys/dev/isa/if_tr_isa.c b/sys/dev/isa/if_tr_isa.c
index 23fe6548320..fe33e5c4af8 100644
--- a/sys/dev/isa/if_tr_isa.c
+++ b/sys/dev/isa/if_tr_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tr_isa.c,v 1.15 2006/10/12 01:31:16 christos Exp $ */
+/* $NetBSD: if_tr_isa.c,v 1.16 2006/11/16 01:33:00 christos Exp $ */
/* XXXJRT changes isa_attach_args too early!! */
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tr_isa.c,v 1.15 2006/10/12 01:31:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tr_isa.c,v 1.16 2006/11/16 01:33:00 christos Exp $");
#undef TRISADEBUG
@@ -206,7 +206,7 @@ tr_isa_probe(parent, match, aux)
int trtcm_setspeed(struct tr_softc *, int);
void
-tr_isa_attach(struct device *parent __unused, struct device *self, void *aux)
+tr_isa_attach(struct device *parent, struct device *self, void *aux)
{
struct tr_softc *sc = (void *) self;
struct isa_attach_args *ia = aux;
diff --git a/sys/dev/isa/if_tribm_isa.c b/sys/dev/isa/if_tribm_isa.c
index 616d3b398d7..a6fb5f71a74 100644
--- a/sys/dev/isa/if_tribm_isa.c
+++ b/sys/dev/isa/if_tribm_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tribm_isa.c,v 1.9 2006/10/12 01:31:16 christos Exp $ */
+/* $NetBSD: if_tribm_isa.c,v 1.10 2006/11/16 01:33:00 christos Exp $ */
/* XXXJRT changes isa_attach_args too early */
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tribm_isa.c,v 1.9 2006/10/12 01:31:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tribm_isa.c,v 1.10 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -64,7 +64,7 @@ void tr_isa_unmap_io(struct isa_attach_args *, bus_space_handle_t,
bus_space_handle_t);
int
-tribm_isa_probe(struct device *parent __unused, struct cfdata *match __unused,
+tribm_isa_probe(struct device *parent, struct cfdata *match,
void *aux)
{
struct isa_attach_args *ia = aux;
diff --git a/sys/dev/isa/if_trtcm_isa.c b/sys/dev/isa/if_trtcm_isa.c
index 9d770654217..0ed2139dd38 100644
--- a/sys/dev/isa/if_trtcm_isa.c
+++ b/sys/dev/isa/if_trtcm_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_trtcm_isa.c,v 1.12 2006/10/12 01:31:16 christos Exp $ */
+/* $NetBSD: if_trtcm_isa.c,v 1.13 2006/11/16 01:33:00 christos Exp $ */
/* XXXJRT verify doens't change isa_attach_args too early */
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_trtcm_isa.c,v 1.12 2006/10/12 01:31:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_trtcm_isa.c,v 1.13 2006/11/16 01:33:00 christos Exp $");
#undef TRTCMISADEBUG
@@ -189,7 +189,7 @@ tcmdumpeeprom(iot, ioh)
#endif
int
-trtcm_isa_mediachange(struct tr_softc *sc __unused)
+trtcm_isa_mediachange(struct tr_softc *sc)
{
return EINVAL;
}
@@ -207,7 +207,7 @@ trtcm_isa_mediastatus(sc, ifmr)
/* XXX hard coded constants in readeeprom elink_idseq */
int
-trtcm_isa_probe(struct device *parent, struct cfdata *match __unused,
+trtcm_isa_probe(struct device *parent, struct cfdata *match,
void *aux)
{
struct isa_attach_args *ia = aux;
diff --git a/sys/dev/isa/if_we_isa.c b/sys/dev/isa/if_we_isa.c
index 835afaf79d6..e39e9297fc0 100644
--- a/sys/dev/isa/if_we_isa.c
+++ b/sys/dev/isa/if_we_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_we_isa.c,v 1.16 2006/10/12 01:31:16 christos Exp $ */
+/* $NetBSD: if_we_isa.c,v 1.17 2006/11/16 01:33:00 christos Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_we_isa.c,v 1.16 2006/10/12 01:31:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_we_isa.c,v 1.17 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -143,7 +143,7 @@ do { \
} while (0)
int
-we_isa_probe(struct device *parent __unused, struct cfdata *cf, void *aux)
+we_isa_probe(struct device *parent, struct cfdata *cf, void *aux)
{
struct isa_attach_args *ia = aux;
bus_space_tag_t asict, memt;
@@ -297,7 +297,7 @@ we_isa_probe(struct device *parent __unused, struct cfdata *cf, void *aux)
}
void
-we_isa_attach(struct device *parent __unused, struct device *self, void *aux)
+we_isa_attach(struct device *parent, struct device *self, void *aux)
{
struct we_softc *wsc = (struct we_softc *)self;
struct dp8390_softc *sc = &wsc->sc_dp8390;
diff --git a/sys/dev/isa/ioat66.c b/sys/dev/isa/ioat66.c
index 37299618430..a00bdde9ca6 100644
--- a/sys/dev/isa/ioat66.c
+++ b/sys/dev/isa/ioat66.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ioat66.c,v 1.14 2006/10/12 01:31:17 christos Exp $ */
+/* $NetBSD: ioat66.c,v 1.15 2006/11/16 01:33:00 christos Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ioat66.c,v 1.14 2006/10/12 01:31:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ioat66.c,v 1.15 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -76,7 +76,7 @@ CFATTACH_DECL(ioat, sizeof(struct ioat66_softc),
ioat66probe, ioat66attach, NULL, NULL);
int
-ioat66probe(struct device *parent __unused, struct cfdata *self __unused,
+ioat66probe(struct device *parent, struct cfdata *self,
void *aux)
{
struct isa_attach_args *ia = aux;
@@ -143,7 +143,7 @@ out:
}
void
-ioat66attach(struct device *parent __unused, struct device *self, void *aux)
+ioat66attach(struct device *parent, struct device *self, void *aux)
{
struct ioat66_softc *sc = (void *)self;
struct isa_attach_args *ia = aux;
diff --git a/sys/dev/isa/isa.c b/sys/dev/isa/isa.c
index cf404b94a25..87249e3da45 100644
--- a/sys/dev/isa/isa.c
+++ b/sys/dev/isa/isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isa.c,v 1.125 2006/10/12 01:31:17 christos Exp $ */
+/* $NetBSD: isa.c,v 1.126 2006/11/16 01:33:00 christos Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa.c,v 1.125 2006/10/12 01:31:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa.c,v 1.126 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -77,8 +77,8 @@ int isasubmatch(struct device *, struct cfdata *, const int *, void *);
int isasearch(struct device *, struct cfdata *, const int *, void *);
int
-isamatch(struct device *parent __unused, struct cfdata *cf __unused,
- void *aux __unused)
+isamatch(struct device *parent, struct cfdata *cf,
+ void *aux)
{
/* XXX check other indicators */
@@ -160,7 +160,7 @@ isarescan(struct device *self, const char *ifattr, const int *locators)
}
void
-isachilddetached(struct device *self __unused, struct device *child __unused)
+isachilddetached(struct device *self, struct device *child)
{
/* nothing to do */
}
@@ -289,7 +289,7 @@ checkattachargs(struct isa_attach_args *ia, const int *loc)
int
isasubmatch(struct device *parent, struct cfdata *cf,
- const int *ldesc __unused, void *aux)
+ const int *ldesc, void *aux)
{
struct isa_attach_args *ia = aux;
@@ -381,7 +381,7 @@ isaprint(void *aux, const char *isa)
int
isasearch(struct device *parent, struct cfdata *cf,
- const int *slocs, void *aux __unused)
+ const int *slocs, void *aux)
{
struct isa_io res_io[1];
struct isa_iomem res_mem[1];
diff --git a/sys/dev/isa/isabusprint.c b/sys/dev/isa/isabusprint.c
index cc1553c4632..068e230edef 100644
--- a/sys/dev/isa/isabusprint.c
+++ b/sys/dev/isa/isabusprint.c
@@ -1,6 +1,6 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isabusprint.c,v 1.4 2006/10/12 01:31:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isabusprint.c,v 1.5 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -8,7 +8,7 @@ __KERNEL_RCSID(0, "$NetBSD: isabusprint.c,v 1.4 2006/10/12 01:31:17 christos Exp
#include <dev/isa/isavar.h>
int
-isabusprint(void *via __unused, const char *pnp)
+isabusprint(void *via, const char *pnp)
{
if (pnp)
aprint_normal("isa at %s", pnp);
diff --git a/sys/dev/isa/isic_isa.c b/sys/dev/isa/isic_isa.c
index 1b2c10e44fb..f1973b523ba 100644
--- a/sys/dev/isa/isic_isa.c
+++ b/sys/dev/isa/isic_isa.c
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isa.c,v 1.26 2006/10/16 12:58:54 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isa.c,v 1.27 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/errno.h>
@@ -101,7 +101,7 @@ CFATTACH_DECL(isic_isa, sizeof(struct isic_softc),
* Probe card
*/
static int
-isic_isa_probe(struct device *parent __unused, struct cfdata *cf, void *aux)
+isic_isa_probe(struct device *parent, struct cfdata *cf, void *aux)
{
struct isa_attach_args *ia = aux;
bus_space_tag_t memt = ia->ia_memt, iot = ia->ia_iot;
@@ -783,7 +783,7 @@ isicattach(int flags, struct isic_softc *sc)
* Attach the card
*/
static void
-isic_isa_attach(struct device *parent __unused, struct device *self, void *aux)
+isic_isa_attach(struct device *parent, struct device *self, void *aux)
{
struct isic_softc *sc = (void *)self;
struct isa_attach_args *ia = aux;
diff --git a/sys/dev/isa/it.c b/sys/dev/isa/it.c
index 1b72868bc1f..28f7d67fc05 100644
--- a/sys/dev/isa/it.c
+++ b/sys/dev/isa/it.c
@@ -1,4 +1,4 @@
-/* $NetBSD: it.c,v 1.5 2006/10/12 01:31:17 christos Exp $ */
+/* $NetBSD: it.c,v 1.6 2006/11/16 01:33:00 christos Exp $ */
/* $OpenBSD: it.c,v 1.19 2006/04/10 00:57:54 deraadt Exp $ */
/*
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: it.c,v 1.5 2006/10/12 01:31:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: it.c,v 1.6 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -86,7 +86,7 @@ static int it_streinfo(struct sysmon_envsys *, envsys_basic_info_t *);
static int
-it_isa_match(struct device *parent __unused, struct cfdata *match __unused,
+it_isa_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct isa_attach_args *ia = aux;
@@ -117,7 +117,7 @@ it_isa_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-it_isa_attach(struct device *parent __unused, struct device *self, void *aux)
+it_isa_attach(struct device *parent, struct device *self, void *aux)
{
struct it_softc *sc = (void *)self;
struct isa_attach_args *ia = aux;
diff --git a/sys/dev/isa/joy_isa.c b/sys/dev/isa/joy_isa.c
index 8a249645df9..6dc5554848c 100644
--- a/sys/dev/isa/joy_isa.c
+++ b/sys/dev/isa/joy_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: joy_isa.c,v 1.9 2006/10/12 01:31:17 christos Exp $ */
+/* $NetBSD: joy_isa.c,v 1.10 2006/11/16 01:33:00 christos Exp $ */
/*-
* Copyright (c) 1995 Jean-Marc Zucconi
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: joy_isa.c,v 1.9 2006/10/12 01:31:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: joy_isa.c,v 1.10 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -55,7 +55,7 @@ CFATTACH_DECL(joy_isa, sizeof(struct joy_softc),
joy_isa_probe, joy_isa_attach, NULL, NULL);
int
-joy_isa_probe(struct device *parent __unused, struct cfdata *match __unused,
+joy_isa_probe(struct device *parent, struct cfdata *match,
void *aux)
{
struct isa_attach_args *ia = aux;
@@ -95,7 +95,7 @@ joy_isa_probe(struct device *parent __unused, struct cfdata *match __unused,
}
void
-joy_isa_attach(struct device *parent __unused, struct device *self, void *aux)
+joy_isa_attach(struct device *parent, struct device *self, void *aux)
{
struct joy_softc *sc = (struct joy_softc *) self;
struct isa_attach_args *ia = aux;
diff --git a/sys/dev/isa/lm_isa.c b/sys/dev/isa/lm_isa.c
index f946e7a1861..bfc0cdb6776 100644
--- a/sys/dev/isa/lm_isa.c
+++ b/sys/dev/isa/lm_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lm_isa.c,v 1.12 2006/10/12 01:31:17 christos Exp $ */
+/* $NetBSD: lm_isa.c,v 1.13 2006/11/16 01:33:00 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lm_isa.c,v 1.12 2006/10/12 01:31:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lm_isa.c,v 1.13 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -77,7 +77,7 @@ CFATTACH_DECL(lm_isa, sizeof(struct lm_softc),
int
-lm_isa_match(struct device *parent __unused, struct cfdata *match __unused,
+lm_isa_match(struct device *parent, struct cfdata *match,
void *aux)
{
bus_space_tag_t iot;
@@ -122,7 +122,7 @@ lm_isa_match(struct device *parent __unused, struct cfdata *match __unused,
void
-lm_isa_attach(struct device *parent __unused, struct device *self, void *aux)
+lm_isa_attach(struct device *parent, struct device *self, void *aux)
{
struct lm_softc *lmsc = (void *)self;
int iobase;
diff --git a/sys/dev/isa/lpt_isa.c b/sys/dev/isa/lpt_isa.c
index cd7b58db540..9b77e6ebbc5 100644
--- a/sys/dev/isa/lpt_isa.c
+++ b/sys/dev/isa/lpt_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lpt_isa.c,v 1.62 2006/10/12 01:31:17 christos Exp $ */
+/* $NetBSD: lpt_isa.c,v 1.63 2006/11/16 01:33:00 christos Exp $ */
/*
* Copyright (c) 1993, 1994 Charles M. Hannum.
@@ -54,7 +54,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lpt_isa.c,v 1.62 2006/10/12 01:31:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpt_isa.c,v 1.63 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -104,7 +104,7 @@ int lpt_port_test(bus_space_tag_t, bus_space_handle_t, bus_addr_t,
*/
int
lpt_port_test(bus_space_tag_t iot, bus_space_handle_t ioh,
- bus_addr_t base __unused, bus_size_t off, u_char data, u_char mask)
+ bus_addr_t base, bus_size_t off, u_char data, u_char mask)
{
int timeout;
u_char temp;
@@ -143,7 +143,7 @@ lpt_port_test(bus_space_tag_t iot, bus_space_handle_t ioh,
* 3) Set the data and control ports to a value of 0
*/
int
-lpt_isa_probe(struct device *parent __unused, struct cfdata *match __unused,
+lpt_isa_probe(struct device *parent, struct cfdata *match,
void *aux)
{
struct isa_attach_args *ia = aux;
@@ -214,7 +214,7 @@ out:
}
void
-lpt_isa_attach(struct device *parent __unused, struct device *self, void *aux)
+lpt_isa_attach(struct device *parent, struct device *self, void *aux)
{
struct lpt_isa_softc *sc = (void *)self;
struct lpt_softc *lsc = &sc->sc_lpt;
diff --git a/sys/dev/isa/mcd.c b/sys/dev/isa/mcd.c
index 1ee7f74f9b3..ede064c1135 100644
--- a/sys/dev/isa/mcd.c
+++ b/sys/dev/isa/mcd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mcd.c,v 1.95 2006/10/12 01:31:17 christos Exp $ */
+/* $NetBSD: mcd.c,v 1.96 2006/11/16 01:33:00 christos Exp $ */
/*
* Copyright (c) 1993, 1994, 1995 Charles M. Hannum. All rights reserved.
@@ -56,7 +56,7 @@
/*static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mcd.c,v 1.95 2006/10/12 01:31:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcd.c,v 1.96 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -233,7 +233,7 @@ struct dkdriver mcddkdriver = { mcdstrategy, NULL, };
#define DELAY_GETREPLY 100000 /* 100000 * 25us */
void
-mcdattach(struct device *parent __unused, struct device *self, void *aux)
+mcdattach(struct device *parent, struct device *self, void *aux)
{
struct mcd_softc *sc = (void *)self;
struct isa_attach_args *ia = aux;
@@ -288,7 +288,7 @@ mcdattach(struct device *parent __unused, struct device *self, void *aux)
}
int
-mcdopen(dev_t dev, int flag __unused, int fmt, struct lwp *l __unused)
+mcdopen(dev_t dev, int flag, int fmt, struct lwp *l)
{
int error, part;
struct mcd_softc *sc;
@@ -387,7 +387,7 @@ bad3:
}
int
-mcdclose(dev_t dev, int flag __unused, int fmt, struct lwp *l __unused)
+mcdclose(dev_t dev, int flag, int fmt, struct lwp *l)
{
struct mcd_softc *sc = device_lookup(&mcd_cd, MCDUNIT(dev));
int part = MCDPART(dev);
@@ -538,21 +538,21 @@ loop:
}
int
-mcdread(dev_t dev, struct uio *uio, int flags __unused)
+mcdread(dev_t dev, struct uio *uio, int flags)
{
return (physio(mcdstrategy, NULL, dev, B_READ, minphys, uio));
}
int
-mcdwrite(dev_t dev, struct uio *uio, int flags __unused)
+mcdwrite(dev_t dev, struct uio *uio, int flags)
{
return (physio(mcdstrategy, NULL, dev, B_WRITE, minphys, uio));
}
int
-mcdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct lwp *l __unused)
+mcdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct lwp *l)
{
struct mcd_softc *sc = device_lookup(&mcd_cd, MCDUNIT(dev));
int error;
@@ -792,7 +792,7 @@ mcd_get_parms(sc)
}
int
-mcdsize(dev_t dev __unused)
+mcdsize(dev_t dev)
{
/* CD-ROMs are read-only. */
@@ -800,8 +800,8 @@ mcdsize(dev_t dev __unused)
}
int
-mcddump(dev_t dev __unused, daddr_t blkno __unused, caddr_t va __unused,
- size_t size __unused)
+mcddump(dev_t dev, daddr_t blkno, caddr_t va,
+ size_t size)
{
/* Not implemented. */
@@ -893,7 +893,7 @@ mcd_find(iot, ioh, sc)
}
int
-mcdprobe(struct device *parent __unused, struct cfdata *match __unused,
+mcdprobe(struct device *parent, struct cfdata *match,
void *aux)
{
struct isa_attach_args *ia = aux;
diff --git a/sys/dev/isa/midi_pcppi.c b/sys/dev/isa/midi_pcppi.c
index 807aee15d17..ea30d6faffe 100644
--- a/sys/dev/isa/midi_pcppi.c
+++ b/sys/dev/isa/midi_pcppi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: midi_pcppi.c,v 1.14 2006/10/12 01:31:17 christos Exp $ */
+/* $NetBSD: midi_pcppi.c,v 1.15 2006/11/16 01:33:00 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: midi_pcppi.c,v 1.14 2006/10/12 01:31:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: midi_pcppi.c,v 1.15 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -88,8 +88,8 @@ struct midisyn_methods midi_pcppi_hw = {
int midi_pcppi_attached = 0; /* Not very nice */
int
-midi_pcppi_match(struct device *parent __unused, struct cfdata *match __unused,
- void *aux __unused)
+midi_pcppi_match(struct device *parent, struct cfdata *match,
+ void *aux)
{
return (!midi_pcppi_attached);
}
@@ -118,7 +118,7 @@ midi_pcppi_attach(parent, self, aux)
void
midi_pcppi_on(midisyn *ms,
- uint_fast16_t voice __unused, midipitch_t mp, int16_t level __unused)
+ uint_fast16_t voice, midipitch_t mp, int16_t level)
{
pcppi_tag_t t = ms->data;
@@ -128,8 +128,7 @@ midi_pcppi_on(midisyn *ms,
}
void
-midi_pcppi_off(midisyn *ms, uint_fast16_t __unused voice,
- uint_fast8_t vel __unused)
+midi_pcppi_off(midisyn *ms, uint_fast16_t voice, uint_fast8_t vel)
{
pcppi_tag_t t = ms->data;
diff --git a/sys/dev/isa/moxa_isa.c b/sys/dev/isa/moxa_isa.c
index 5cbf76063ae..7958edadb4c 100644
--- a/sys/dev/isa/moxa_isa.c
+++ b/sys/dev/isa/moxa_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: moxa_isa.c,v 1.13 2006/10/12 01:31:17 christos Exp $ */
+/* $NetBSD: moxa_isa.c,v 1.14 2006/11/16 01:33:00 christos Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: moxa_isa.c,v 1.13 2006/10/12 01:31:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: moxa_isa.c,v 1.14 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -72,7 +72,7 @@ CFATTACH_DECL(moxa_isa, sizeof(struct moxa_isa_softc),
moxa_isaprobe, moxa_isaattach, NULL, NULL);
int
-moxa_isaprobe(struct device *parent __unused, struct cfdata *self __unused,
+moxa_isaprobe(struct device *parent, struct cfdata *self,
void *aux)
{
struct isa_attach_args *ia = aux;
@@ -142,7 +142,7 @@ out:
}
void
-moxa_isaattach(struct device *parent __unused, struct device *self, void *aux)
+moxa_isaattach(struct device *parent, struct device *self, void *aux)
{
struct moxa_isa_softc *sc = (void *)self;
struct isa_attach_args *ia = aux;
diff --git a/sys/dev/isa/mpu_isa.c b/sys/dev/isa/mpu_isa.c
index dc37b43a24d..7a697bf604c 100644
--- a/sys/dev/isa/mpu_isa.c
+++ b/sys/dev/isa/mpu_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mpu_isa.c,v 1.15 2006/10/12 01:31:17 christos Exp $ */
+/* $NetBSD: mpu_isa.c,v 1.16 2006/11/16 01:33:00 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpu_isa.c,v 1.15 2006/10/12 01:31:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpu_isa.c,v 1.16 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -67,7 +67,7 @@ CFATTACH_DECL(mpu_isa, sizeof(struct mpu_isa_softc),
mpu_isa_match, mpu_isa_attach, NULL, NULL);
int
-mpu_isa_match(struct device *parent __unused, struct cfdata *match __unused,
+mpu_isa_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct isa_attach_args *ia = aux;
@@ -107,7 +107,7 @@ mpu_isa_match(struct device *parent __unused, struct cfdata *match __unused,
}
void
-mpu_isa_attach(struct device *parent __unused, struct device *self, void *aux)
+mpu_isa_attach(struct device *parent, struct device *self, void *aux)
{
struct mpu_isa_softc *sc = (struct mpu_isa_softc *)self;
struct isa_attach_args *ia = aux;
diff --git a/sys/dev/isa/mpu_sb.c b/sys/dev/isa/mpu_sb.c
index 72be938bfa7..0bb3f77940d 100644
--- a/sys/dev/isa/mpu_sb.c
+++ b/sys/dev/isa/mpu_sb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mpu_sb.c,v 1.10 2006/10/12 01:31:17 christos Exp $ */
+/* $NetBSD: mpu_sb.c,v 1.11 2006/11/16 01:33:00 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpu_sb.c,v 1.10 2006/10/12 01:31:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpu_sb.c,v 1.11 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -64,7 +64,7 @@ CFATTACH_DECL(mpu_sb, sizeof(struct mpu_softc),
mpu_sb_match, mpu_sb_attach, NULL, NULL);
int
-mpu_sb_match(struct device *parent, struct cfdata *match __unused,
+mpu_sb_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct audio_attach_args *aa = (struct audio_attach_args *)aux;
@@ -80,7 +80,7 @@ mpu_sb_match(struct device *parent, struct cfdata *match __unused,
}
void
-mpu_sb_attach(struct device *parent, struct device *self, void *aux __unused)
+mpu_sb_attach(struct device *parent, struct device *self, void *aux)
{
struct sbdsp_softc *ssc = (struct sbdsp_softc *)parent;
struct mpu_softc *sc = (struct mpu_softc *)self;
diff --git a/sys/dev/isa/mpu_ym.c b/sys/dev/isa/mpu_ym.c
index 71859d99b1a..db7b712f8ab 100644
--- a/sys/dev/isa/mpu_ym.c
+++ b/sys/dev/isa/mpu_ym.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mpu_ym.c,v 1.11 2006/10/12 01:31:17 christos Exp $ */
+/* $NetBSD: mpu_ym.c,v 1.12 2006/11/16 01:33:00 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpu_ym.c,v 1.11 2006/10/12 01:31:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpu_ym.c,v 1.12 2006/11/16 01:33:00 christos Exp $");
#define NMPU_YM 1
@@ -72,7 +72,7 @@ CFATTACH_DECL(mpu_ym, sizeof(struct mpu_softc),
mpu_ym_match, mpu_ym_attach, NULL, NULL);
int
-mpu_ym_match(struct device *parent, struct cfdata *match __unused, void *aux)
+mpu_ym_match(struct device *parent, struct cfdata *match, void *aux)
{
struct audio_attach_args *aa = (struct audio_attach_args *)aux;
struct ym_softc *ssc = (struct ym_softc *)parent;
@@ -87,7 +87,7 @@ mpu_ym_match(struct device *parent, struct cfdata *match __unused, void *aux)
}
void
-mpu_ym_attach(struct device *parent, struct device *self, void *aux __unused)
+mpu_ym_attach(struct device *parent, struct device *self, void *aux)
{
struct ym_softc *ssc = (struct ym_softc *)parent;
struct mpu_softc *sc = (struct mpu_softc *)self;
diff --git a/sys/dev/isa/nca_isa.c b/sys/dev/isa/nca_isa.c
index 7150ba15aef..88d5de8bff6 100644
--- a/sys/dev/isa/nca_isa.c
+++ b/sys/dev/isa/nca_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nca_isa.c,v 1.17 2006/10/12 01:31:17 christos Exp $ */
+/* $NetBSD: nca_isa.c,v 1.18 2006/11/16 01:33:00 christos Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nca_isa.c,v 1.17 2006/10/12 01:31:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nca_isa.c,v 1.18 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -252,7 +252,7 @@ nca_isa_find(iot, ioh, max_offset, epd)
* If so, call the real probe to see what it is.
*/
int
-nca_isa_match(struct device *parent __unused, struct cfdata *match __unused,
+nca_isa_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct isa_attach_args *ia = aux;
@@ -312,7 +312,7 @@ nca_isa_match(struct device *parent __unused, struct cfdata *match __unused,
* Attach this instance, and then all the sub-devices
*/
void
-nca_isa_attach(struct device *parent __unused, struct device *self, void *aux)
+nca_isa_attach(struct device *parent, struct device *self, void *aux)
{
struct isa_attach_args *ia = aux;
struct nca_isa_softc *esc = (void *)self;
diff --git a/sys/dev/isa/nsclpcsio_isa.c b/sys/dev/isa/nsclpcsio_isa.c
index 6a4bf1e331a..6db22eff125 100644
--- a/sys/dev/isa/nsclpcsio_isa.c
+++ b/sys/dev/isa/nsclpcsio_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nsclpcsio_isa.c,v 1.14 2006/10/12 01:31:17 christos Exp $ */
+/* $NetBSD: nsclpcsio_isa.c,v 1.15 2006/11/16 01:33:00 christos Exp $ */
/*
* Copyright (c) 2002
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nsclpcsio_isa.c,v 1.14 2006/10/12 01:31:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nsclpcsio_isa.c,v 1.15 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -142,8 +142,8 @@ nscheck(iot, base)
}
static int
-nsclpcsio_isa_match(struct device *parent __unused,
- struct cfdata *match __unused, void *aux)
+nsclpcsio_isa_match(struct device *parent,
+ struct cfdata *match, void *aux)
{
struct isa_attach_args *ia = aux;
int iobase;
@@ -182,7 +182,7 @@ found:
}
static void
-nsclpcsio_isa_attach(struct device *parent __unused, struct device *self,
+nsclpcsio_isa_attach(struct device *parent, struct device *self,
void *aux)
{
struct nsclpcsio_softc *sc = (void *)self;
@@ -410,7 +410,7 @@ tms_gtredata(sme, data)
}
static int
-tms_streinfo(struct sysmon_envsys *sme __unused,
+tms_streinfo(struct sysmon_envsys *sme,
struct envsys_basic_info *info)
{
#if 0
diff --git a/sys/dev/isa/opl_ess.c b/sys/dev/isa/opl_ess.c
index 90e4e7245ac..158ca671473 100644
--- a/sys/dev/isa/opl_ess.c
+++ b/sys/dev/isa/opl_ess.c
@@ -1,4 +1,4 @@
-/* $NetBSD: opl_ess.c,v 1.12 2006/10/12 01:31:17 christos Exp $ */
+/* $NetBSD: opl_ess.c,v 1.13 2006/11/16 01:33:00 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opl_ess.c,v 1.12 2006/10/12 01:31:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opl_ess.c,v 1.13 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -70,7 +70,7 @@ CFATTACH_DECL(opl_ess, sizeof(struct opl_softc),
opl_ess_match, opl_ess_attach, NULL, NULL);
int
-opl_ess_match(struct device *parent, struct cfdata *match __unused, void *aux)
+opl_ess_match(struct device *parent, struct cfdata *match, void *aux)
{
struct audio_attach_args *aa = (struct audio_attach_args *)aux;
struct ess_softc *ssc = (struct ess_softc *)parent;
@@ -81,7 +81,7 @@ opl_ess_match(struct device *parent, struct cfdata *match __unused, void *aux)
}
void
-opl_ess_attach(struct device *parent, struct device *self, void *aux __unused)
+opl_ess_attach(struct device *parent, struct device *self, void *aux)
{
struct ess_softc *ssc = (struct ess_softc *)parent;
struct opl_softc *sc = (struct opl_softc *)self;
diff --git a/sys/dev/isa/opl_isa.c b/sys/dev/isa/opl_isa.c
index 725f913fd2c..8fb953b78e2 100644
--- a/sys/dev/isa/opl_isa.c
+++ b/sys/dev/isa/opl_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: opl_isa.c,v 1.15 2006/10/12 01:31:17 christos Exp $ */
+/* $NetBSD: opl_isa.c,v 1.16 2006/11/16 01:33:00 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opl_isa.c,v 1.15 2006/10/12 01:31:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opl_isa.c,v 1.16 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -70,7 +70,7 @@ CFATTACH_DECL(opl_isa, sizeof(struct opl_softc),
opl_isa_match, opl_isa_attach, NULL, NULL);
int
-opl_isa_match(struct device *parent __unused, struct cfdata *match __unused,
+opl_isa_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct isa_attach_args *ia = aux;
@@ -102,7 +102,7 @@ opl_isa_match(struct device *parent __unused, struct cfdata *match __unused,
}
void
-opl_isa_attach(struct device *parent __unused, struct device *self, void *aux)
+opl_isa_attach(struct device *parent, struct device *self, void *aux)
{
struct opl_softc *sc = (struct opl_softc *)self;
struct isa_attach_args *ia = aux;
diff --git a/sys/dev/isa/opl_sb.c b/sys/dev/isa/opl_sb.c
index ca56c29a501..08f77c22ec7 100644
--- a/sys/dev/isa/opl_sb.c
+++ b/sys/dev/isa/opl_sb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: opl_sb.c,v 1.13 2006/10/12 01:31:17 christos Exp $ */
+/* $NetBSD: opl_sb.c,v 1.14 2006/11/16 01:33:00 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opl_sb.c,v 1.13 2006/10/12 01:31:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opl_sb.c,v 1.14 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -68,7 +68,7 @@ CFATTACH_DECL(opl_sb, sizeof(struct opl_softc),
opl_sb_match, opl_sb_attach, NULL, NULL);
int
-opl_sb_match(struct device *parent, struct cfdata *match __unused, void *aux)
+opl_sb_match(struct device *parent, struct cfdata *match, void *aux)
{
struct audio_attach_args *aa = (struct audio_attach_args *)aux;
struct sbdsp_softc *ssc = (struct sbdsp_softc *)parent;
@@ -79,7 +79,7 @@ opl_sb_match(struct device *parent, struct cfdata *match __unused, void *aux)
}
void
-opl_sb_attach(struct device *parent, struct device *self, void *aux __unused)
+opl_sb_attach(struct device *parent, struct device *self, void *aux)
{
struct sbdsp_softc *ssc = (struct sbdsp_softc *)parent;
struct opl_softc *sc = (struct opl_softc *)self;
diff --git a/sys/dev/isa/opl_wss.c b/sys/dev/isa/opl_wss.c
index 7f678c85594..c8f2d3372b1 100644
--- a/sys/dev/isa/opl_wss.c
+++ b/sys/dev/isa/opl_wss.c
@@ -1,4 +1,4 @@
-/* $NetBSD: opl_wss.c,v 1.9 2006/10/12 01:31:17 christos Exp $ */
+/* $NetBSD: opl_wss.c,v 1.10 2006/11/16 01:33:00 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opl_wss.c,v 1.9 2006/10/12 01:31:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opl_wss.c,v 1.10 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -68,7 +68,7 @@ CFATTACH_DECL(opl_wss, sizeof(struct opl_softc),
opl_wss_match, opl_wss_attach, NULL, NULL);
int
-opl_wss_match(struct device *parent, struct cfdata *match __unused, void *aux)
+opl_wss_match(struct device *parent, struct cfdata *match, void *aux)
{
struct audio_attach_args *aa = (struct audio_attach_args *)aux;
struct wss_softc *ssc = (struct wss_softc *)parent;
@@ -79,7 +79,7 @@ opl_wss_match(struct device *parent, struct cfdata *match __unused, void *aux)
}
void
-opl_wss_attach(struct device *parent, struct device *self, void *aux __unused)
+opl_wss_attach(struct device *parent, struct device *self, void *aux)
{
struct wss_softc *ssc = (struct wss_softc *)parent;
struct opl_softc *sc = (struct opl_softc *)self;
diff --git a/sys/dev/isa/opl_ym.c b/sys/dev/isa/opl_ym.c
index a0e40c1e418..c61d10e559a 100644
--- a/sys/dev/isa/opl_ym.c
+++ b/sys/dev/isa/opl_ym.c
@@ -1,4 +1,4 @@
-/* $NetBSD: opl_ym.c,v 1.12 2006/10/12 01:31:17 christos Exp $ */
+/* $NetBSD: opl_ym.c,v 1.13 2006/11/16 01:33:00 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opl_ym.c,v 1.12 2006/10/12 01:31:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opl_ym.c,v 1.13 2006/11/16 01:33:00 christos Exp $");
#include "mpu_ym.h"
@@ -74,7 +74,7 @@ CFATTACH_DECL(opl_ym, sizeof(struct opl_softc),
opl_ym_match, opl_ym_attach, NULL, NULL);
int
-opl_ym_match(struct device *parent, struct cfdata *match __unused, void *aux)
+opl_ym_match(struct device *parent, struct cfdata *match, void *aux)
{
struct audio_attach_args *aa = (struct audio_attach_args *)aux;
struct ym_softc *ssc = (struct ym_softc *)parent;
@@ -85,7 +85,7 @@ opl_ym_match(struct device *parent, struct cfdata *match __unused, void *aux)
}
void
-opl_ym_attach(struct device *parent, struct device *self, void *aux __unused)
+opl_ym_attach(struct device *parent, struct device *self, void *aux)
{
struct ym_softc *ssc = (struct ym_softc *)parent;
struct opl_softc *sc = (struct opl_softc *)self;
diff --git a/sys/dev/isa/pas.c b/sys/dev/isa/pas.c
index dced398f136..b881c417898 100644
--- a/sys/dev/isa/pas.c
+++ b/sys/dev/isa/pas.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pas.c,v 1.64 2006/10/12 01:31:17 christos Exp $ */
+/* $NetBSD: pas.c,v 1.65 2006/11/16 01:33:00 christos Exp $ */
/*
* Copyright (c) 1991-1993 Regents of the University of California.
@@ -57,7 +57,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pas.c,v 1.64 2006/10/12 01:31:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pas.c,v 1.65 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -296,7 +296,7 @@ pasprobe(struct device *parent, struct cfdata *match, void *aux)
* Probe for the soundblaster hardware.
*/
static int
-pasfind(struct device *parent __unused, struct pas_softc *sc,
+pasfind(struct device *parent, struct pas_softc *sc,
struct isa_attach_args *ia, int probing)
{
int iobase;
@@ -492,7 +492,7 @@ pasattach(struct device *parent, struct device *self, void *aux)
}
int
-pas_getdev(void *addr __unused, struct audio_device *retp)
+pas_getdev(void *addr, struct audio_device *retp)
{
*retp = pas_device;
diff --git a/sys/dev/isa/pcdisplay.c b/sys/dev/isa/pcdisplay.c
index 3adab7a8861..20a0d578172 100644
--- a/sys/dev/isa/pcdisplay.c
+++ b/sys/dev/isa/pcdisplay.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pcdisplay.c,v 1.31 2006/10/12 01:31:17 christos Exp $ */
+/* $NetBSD: pcdisplay.c,v 1.32 2006/11/16 01:33:00 christos Exp $ */
/*
* Copyright (c) 1998
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcdisplay.c,v 1.31 2006/10/12 01:31:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcdisplay.c,v 1.32 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -224,7 +224,7 @@ pcdisplay_init(dc, iot, memt, mono)
}
int
-pcdisplay_match(struct device *parent __unused, struct cfdata *match __unused,
+pcdisplay_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct isa_attach_args *ia = aux;
@@ -285,7 +285,7 @@ pcdisplay_match(struct device *parent __unused, struct cfdata *match __unused,
}
void
-pcdisplay_attach(struct device *parent __unused, struct device *self, void *aux)
+pcdisplay_attach(struct device *parent, struct device *self, void *aux)
{
struct isa_attach_args *ia = aux;
struct pcdisplay_softc *sc = (struct pcdisplay_softc *)self;
@@ -375,8 +375,8 @@ pcdisplay_is_console(iot)
}
static int
-pcdisplay_ioctl(void *v __unused, void *vs __unused, u_long cmd __unused,
- caddr_t data __unused, int flag __unused, struct lwp *l __unused)
+pcdisplay_ioctl(void *v, void *vs, u_long cmd,
+ caddr_t data, int flag, struct lwp *l)
{
/*
* XXX "do something!"
@@ -385,14 +385,14 @@ pcdisplay_ioctl(void *v __unused, void *vs __unused, u_long cmd __unused,
}
static paddr_t
-pcdisplay_mmap(void *v __unused, void *vs __unused, off_t offset __unused,
- int prot __unused)
+pcdisplay_mmap(void *v, void *vs, off_t offset,
+ int prot)
{
return (-1);
}
static int
-pcdisplay_alloc_screen(void *v, const struct wsscreen_descr *type __unused,
+pcdisplay_alloc_screen(void *v, const struct wsscreen_descr *type,
void **cookiep, int *curxp, int *curyp, long *defattrp)
{
struct pcdisplay_softc *sc = v;
@@ -409,7 +409,7 @@ pcdisplay_alloc_screen(void *v, const struct wsscreen_descr *type __unused,
}
static void
-pcdisplay_free_screen(void *v, void *cookie __unused)
+pcdisplay_free_screen(void *v, void *cookie)
{
struct pcdisplay_softc *sc = v;
@@ -420,9 +420,9 @@ pcdisplay_free_screen(void *v, void *cookie __unused)
}
static int
-pcdisplay_show_screen(void *v __unused, void *cookie __unused,
- int waitok __unused, void (*cb)(void *, int, int) __unused,
- void *cbarg __unused)
+pcdisplay_show_screen(void *v, void *cookie,
+ int waitok, void (*cb)(void *, int, int),
+ void *cbarg)
{
#ifdef DIAGNOSTIC
struct pcdisplay_softc *sc = v;
@@ -434,7 +434,7 @@ pcdisplay_show_screen(void *v __unused, void *cookie __unused,
}
static int
-pcdisplay_allocattr(void *id __unused, int fg __unused, int bg __unused,
+pcdisplay_allocattr(void *id, int fg, int bg,
int flags, long *attrp)
{
if (flags & WSATTR_REVERSE)
diff --git a/sys/dev/isa/pckbc_isa.c b/sys/dev/isa/pckbc_isa.c
index 52735be8dcd..c72a62262ac 100644
--- a/sys/dev/isa/pckbc_isa.c
+++ b/sys/dev/isa/pckbc_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbc_isa.c,v 1.19 2006/10/12 01:31:17 christos Exp $ */
+/* $NetBSD: pckbc_isa.c,v 1.20 2006/11/16 01:33:00 christos Exp $ */
/*
* Copyright (c) 1998
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pckbc_isa.c,v 1.19 2006/10/12 01:31:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbc_isa.c,v 1.20 2006/11/16 01:33:00 christos Exp $");
#include "opt_pckbc.h"
@@ -64,7 +64,7 @@ CFATTACH_DECL(pckbc_isa, sizeof(struct pckbc_isa_softc),
void pckbc_isa_intr_establish(struct pckbc_softc *, pckbc_slot_t);
int
-pckbc_isa_match(struct device *parent __unused, struct cfdata *match __unused,
+pckbc_isa_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct isa_attach_args *ia = aux;
@@ -144,7 +144,7 @@ pckbc_isa_match(struct device *parent __unused, struct cfdata *match __unused,
}
void
-pckbc_isa_attach(struct device *parent __unused, struct device *self, void *aux)
+pckbc_isa_attach(struct device *parent, struct device *self, void *aux)
{
struct pckbc_isa_softc *isc = (void *)self;
struct pckbc_softc *sc = &isc->sc_pckbc;
diff --git a/sys/dev/isa/pcppi.c b/sys/dev/isa/pcppi.c
index 3f93dc73124..8a92dc7079d 100644
--- a/sys/dev/isa/pcppi.c
+++ b/sys/dev/isa/pcppi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pcppi.c,v 1.19 2006/11/05 21:06:26 cube Exp $ */
+/* $NetBSD: pcppi.c,v 1.20 2006/11/16 01:33:00 christos Exp $ */
/*
* Copyright (c) 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcppi.c,v 1.19 2006/11/05 21:06:26 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcppi.c,v 1.20 2006/11/16 01:33:00 christos Exp $");
#include "attimer.h"
@@ -72,7 +72,7 @@ static void pcppi_attach_speaker(struct device *);
#define PCPPIPRI (PZERO - 1)
int
-pcppi_match(struct device *parent __unused, struct cfdata *match __unused,
+pcppi_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct isa_attach_args *ia = aux;
@@ -151,7 +151,7 @@ lose:
}
void
-pcppi_isa_attach(struct device *parent __unused, struct device *self, void *aux)
+pcppi_isa_attach(struct device *parent, struct device *self, void *aux)
{
struct pcppi_softc *sc = (struct pcppi_softc *)self;
struct isa_attach_args *ia = aux;
@@ -287,7 +287,7 @@ pcppi_bell_stop(void *arg)
#if NPCKBD > 0
void
-pcppi_pckbd_bell(void *arg, u_int pitch, u_int period, u_int volume __unused,
+pcppi_pckbd_bell(void *arg, u_int pitch, u_int period, u_int volume,
int poll)
{
diff --git a/sys/dev/isa/radiotrack.c b/sys/dev/isa/radiotrack.c
index 92bb0ff6b06..60068b3f07f 100644
--- a/sys/dev/isa/radiotrack.c
+++ b/sys/dev/isa/radiotrack.c
@@ -1,4 +1,4 @@
-/* $NetBSD: radiotrack.c,v 1.13 2006/10/12 01:31:17 christos Exp $ */
+/* $NetBSD: radiotrack.c,v 1.14 2006/11/16 01:33:00 christos Exp $ */
/* $OpenBSD: radiotrack.c,v 1.1 2001/12/05 10:27:06 mickey Exp $ */
/* $RuOBSD: radiotrack.c,v 1.3 2001/10/18 16:51:36 pva Exp $ */
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radiotrack.c,v 1.13 2006/10/12 01:31:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radiotrack.c,v 1.14 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -131,7 +131,7 @@ u_int8_t rt_conv_vol(u_int8_t);
u_int8_t rt_unconv_vol(u_int8_t);
int
-rt_probe(struct device *parent __unused, struct cfdata *cf __unused, void *aux)
+rt_probe(struct device *parent, struct cfdata *cf, void *aux)
{
struct isa_attach_args *ia = aux;
bus_space_tag_t iot = ia->ia_iot;
@@ -174,7 +174,7 @@ rt_probe(struct device *parent __unused, struct cfdata *cf __unused, void *aux)
}
void
-rt_attach(struct device *parent __unused, struct device *self, void *aux)
+rt_attach(struct device *parent, struct device *self, void *aux)
{
struct rt_softc *sc = (void *) self;
struct isa_attach_args *ia = aux;
@@ -373,8 +373,8 @@ rt_find(bus_space_tag_t iot, bus_space_handle_t ioh)
}
void
-rt_lm700x_init(bus_space_tag_t iot __unused, bus_space_handle_t ioh __unused,
- bus_size_t off __unused, u_int32_t data __unused)
+rt_lm700x_init(bus_space_tag_t iot, bus_space_handle_t ioh,
+ bus_size_t off, u_int32_t data)
{
/* Do nothing */
return;
diff --git a/sys/dev/isa/radiotrack2.c b/sys/dev/isa/radiotrack2.c
index 8b206d76e62..5be6c85bb2d 100644
--- a/sys/dev/isa/radiotrack2.c
+++ b/sys/dev/isa/radiotrack2.c
@@ -1,4 +1,4 @@
-/* $NetBSD: radiotrack2.c,v 1.12 2006/10/12 01:31:17 christos Exp $ */
+/* $NetBSD: radiotrack2.c,v 1.13 2006/11/16 01:33:00 christos Exp $ */
/* $OpenBSD: radiotrack2.c,v 1.1 2001/12/05 10:27:06 mickey Exp $ */
/* $RuOBSD: radiotrack2.c,v 1.2 2001/10/18 16:51:36 pva Exp $ */
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radiotrack2.c,v 1.12 2006/10/12 01:31:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radiotrack2.c,v 1.13 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -121,7 +121,7 @@ void rtii_rset(bus_space_tag_t, bus_space_handle_t, bus_size_t, u_int32_t);
void rtii_write_bit(bus_space_tag_t, bus_space_handle_t, bus_size_t, int);
int
-rtii_probe(struct device *parent __unused, struct cfdata *cf __unused,
+rtii_probe(struct device *parent, struct cfdata *cf,
void *aux)
{
struct isa_attach_args *ia = aux;
@@ -165,7 +165,7 @@ rtii_probe(struct device *parent __unused, struct cfdata *cf __unused,
}
void
-rtii_attach(struct device *parent __unused, struct device *self, void *aux)
+rtii_attach(struct device *parent, struct device *self, void *aux)
{
struct rtii_softc *sc = (void *) self;
struct isa_attach_args *ia = aux;
@@ -213,7 +213,7 @@ rtii_set_mute(struct rtii_softc *sc)
void
rtii_init(bus_space_tag_t iot, bus_space_handle_t ioh, bus_size_t off,
- u_int32_t d __unused)
+ u_int32_t d)
{
bus_space_write_1(iot, ioh, off, RTII_RESET | RTII_WREN_OFF);
bus_space_write_1(iot, ioh, off, RTII_RESET | RTII_WREN_ON);
@@ -222,7 +222,7 @@ rtii_init(bus_space_tag_t iot, bus_space_handle_t ioh, bus_size_t off,
void
rtii_rset(bus_space_tag_t iot, bus_space_handle_t ioh, bus_size_t off,
- u_int32_t d __unused)
+ u_int32_t d)
{
bus_space_write_1(iot, ioh, off, RTII_RESET | RTII_WREN_OFF);
}
diff --git a/sys/dev/isa/rtfps.c b/sys/dev/isa/rtfps.c
index e0de618c283..c63e517c6b5 100644
--- a/sys/dev/isa/rtfps.c
+++ b/sys/dev/isa/rtfps.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rtfps.c,v 1.51 2006/10/12 01:31:17 christos Exp $ */
+/* $NetBSD: rtfps.c,v 1.52 2006/11/16 01:33:00 christos Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtfps.c,v 1.51 2006/10/12 01:31:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtfps.c,v 1.52 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -74,7 +74,7 @@ CFATTACH_DECL(rtfps, sizeof(struct rtfps_softc),
rtfpsprobe, rtfpsattach, NULL, NULL);
int
-rtfpsprobe(struct device *parent __unused, struct cfdata *self __unused,
+rtfpsprobe(struct device *parent, struct cfdata *self,
void *aux)
{
struct isa_attach_args *ia = aux;
@@ -141,7 +141,7 @@ out:
}
void
-rtfpsattach(struct device *parent __unused, struct device *self, void *aux)
+rtfpsattach(struct device *parent, struct device *self, void *aux)
{
struct rtfps_softc *sc = (void *)self;
struct isa_attach_args *ia = aux;
diff --git a/sys/dev/isa/satlink.c b/sys/dev/isa/satlink.c
index b40d2a41124..693e5705853 100644
--- a/sys/dev/isa/satlink.c
+++ b/sys/dev/isa/satlink.c
@@ -1,4 +1,4 @@
-/* $NetBSD: satlink.c,v 1.29 2006/10/12 01:31:17 christos Exp $ */
+/* $NetBSD: satlink.c,v 1.30 2006/11/16 01:33:00 christos Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: satlink.c,v 1.29 2006/10/12 01:31:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: satlink.c,v 1.30 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -122,7 +122,7 @@ const struct cdevsw satlink_cdevsw = {
};
int
-satlinkprobe(struct device *parent __unused, struct cfdata *match __unused,
+satlinkprobe(struct device *parent, struct cfdata *match,
void *aux)
{
struct isa_attach_args *ia = aux;
@@ -166,7 +166,7 @@ satlinkprobe(struct device *parent __unused, struct cfdata *match __unused,
}
void
-satlinkattach(struct device *parent __unused, struct device *self, void *aux)
+satlinkattach(struct device *parent, struct device *self, void *aux)
{
struct satlink_softc *sc = (struct satlink_softc *)self;
struct isa_attach_args *ia = aux;
@@ -251,8 +251,8 @@ satlinkattach(struct device *parent __unused, struct device *self, void *aux)
}
int
-satlinkopen(dev_t dev, int flags __unused, int fmt __unused,
- struct lwp *l __unused)
+satlinkopen(dev_t dev, int flags, int fmt,
+ struct lwp *l)
{
struct satlink_softc *sc;
int error;
@@ -285,8 +285,8 @@ satlinkopen(dev_t dev, int flags __unused, int fmt __unused,
}
int
-satlinkclose(dev_t dev, int flags __unused, int fmt __unused,
- struct lwp *l __unused)
+satlinkclose(dev_t dev, int flags, int fmt,
+ struct lwp *l)
{
struct satlink_softc *sc = device_lookup(&satlink_cd, minor(dev));
int s;
@@ -375,8 +375,8 @@ satlinkread(dev, uio, flags)
}
int
-satlinkioctl(dev_t dev, u_long cmd, caddr_t data, int flags __unused,
- struct lwp *l __unused)
+satlinkioctl(dev_t dev, u_long cmd, caddr_t data, int flags,
+ struct lwp *l)
{
struct satlink_softc *sc = device_lookup(&satlink_cd, minor(dev));
@@ -437,7 +437,7 @@ filt_satlinkrdetach(struct knote *kn)
}
static int
-filt_satlinkread(struct knote *kn, long hint __unused)
+filt_satlinkread(struct knote *kn, long hint)
{
struct satlink_softc *sc = kn->kn_hook;
diff --git a/sys/dev/isa/sb_isa.c b/sys/dev/isa/sb_isa.c
index cae3c94a439..79593175076 100644
--- a/sys/dev/isa/sb_isa.c
+++ b/sys/dev/isa/sb_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sb_isa.c,v 1.33 2006/10/12 01:31:17 christos Exp $ */
+/* $NetBSD: sb_isa.c,v 1.34 2006/11/16 01:33:00 christos Exp $ */
/*
* Copyright (c) 1991-1993 Regents of the University of California.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sb_isa.c,v 1.33 2006/10/12 01:31:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sb_isa.c,v 1.34 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -102,7 +102,7 @@ sb_isa_match(parent, match, aux)
}
static int
-sbfind(struct device *parent __unused, struct sbdsp_softc *sc, int probing,
+sbfind(struct device *parent, struct sbdsp_softc *sc, int probing,
struct isa_attach_args *ia)
{
int rc = 0;
diff --git a/sys/dev/isa/sbdsp.c b/sys/dev/isa/sbdsp.c
index 1e8b60450c5..17d9dfd073d 100644
--- a/sys/dev/isa/sbdsp.c
+++ b/sys/dev/isa/sbdsp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sbdsp.c,v 1.125 2006/10/12 01:31:17 christos Exp $ */
+/* $NetBSD: sbdsp.c,v 1.126 2006/11/16 01:33:00 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -81,7 +81,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbdsp.c,v 1.125 2006/10/12 01:31:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbdsp.c,v 1.126 2006/11/16 01:33:00 christos Exp $");
#include "midi.h"
#include "mpu.h"
@@ -915,14 +915,14 @@ sbdsp_speaker_ctl(void *addr, int newstate)
}
int
-sbdsp_round_blocksize(void *addr __unused, int blk, int mode __unused,
- const audio_params_t *param __unused)
+sbdsp_round_blocksize(void *addr, int blk, int mode,
+ const audio_params_t *param)
{
return blk & -4; /* round to biggest sample size */
}
int
-sbdsp_open(void *addr, int flags __unused)
+sbdsp_open(void *addr, int flags)
{
struct sbdsp_softc *sc;
int error, state;
@@ -1094,7 +1094,7 @@ sbdsp_rdsp(struct sbdsp_softc *sc)
}
void
-sbdsp_pause(struct sbdsp_softc *sc __unused)
+sbdsp_pause(struct sbdsp_softc *sc)
{
(void) tsleep(sbdsp_pause, PWAIT, "sbpause", hz / 8);
@@ -2280,7 +2280,7 @@ sbdsp_mixer_query_devinfo(void *addr, mixer_devinfo_t *dip)
}
void *
-sb_malloc(void *addr, int direction __unused, size_t size,
+sb_malloc(void *addr, int direction, size_t size,
struct malloc_type *pool, int flags)
{
struct sbdsp_softc *sc;
@@ -2295,14 +2295,14 @@ sb_malloc(void *addr, int direction __unused, size_t size,
}
void
-sb_free(void *addr __unused, void *ptr, struct malloc_type *pool)
+sb_free(void *addr, void *ptr, struct malloc_type *pool)
{
isa_free(ptr, pool);
}
size_t
-sb_round_buffersize(void *addr, int direction __unused, size_t size)
+sb_round_buffersize(void *addr, int direction, size_t size)
{
struct sbdsp_softc *sc;
bus_size_t maxsize;
@@ -2319,7 +2319,7 @@ sb_round_buffersize(void *addr, int direction __unused, size_t size)
}
paddr_t
-sb_mappage(void *addr __unused, void *mem, off_t off, int prot)
+sb_mappage(void *addr, void *mem, off_t off, int prot)
{
return isa_mappage(mem, off, prot);
@@ -2341,8 +2341,8 @@ sbdsp_get_props(void *addr)
*/
int
-sbdsp_midi_open(void *addr, int flags __unused, void (*iintr)(void *, int),
- void (*ointr)(void *) __unused, void *arg)
+sbdsp_midi_open(void *addr, int flags, void (*iintr)(void *, int),
+ void (*ointr)(void *), void *arg)
{
struct sbdsp_softc *sc;
diff --git a/sys/dev/isa/seagate.c b/sys/dev/isa/seagate.c
index 1b53701dadb..834f3e5c825 100644
--- a/sys/dev/isa/seagate.c
+++ b/sys/dev/isa/seagate.c
@@ -1,4 +1,4 @@
-/* $NetBSD: seagate.c,v 1.60 2006/10/12 01:31:17 christos Exp $ */
+/* $NetBSD: seagate.c,v 1.61 2006/11/16 01:33:00 christos Exp $ */
/*
* ST01/02, Future Domain TMC-885, TMC-950 SCSI driver
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: seagate.c,v 1.60 2006/10/12 01:31:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: seagate.c,v 1.61 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -327,7 +327,7 @@ sea_queue_length(sea)
* Returns 1 if card recognized, 0 if errors.
*/
int
-seaprobe(struct device *parent __unused, struct cfdata *match __unused,
+seaprobe(struct device *parent, struct cfdata *match,
void *aux)
{
struct isa_attach_args *ia = aux;
@@ -386,7 +386,7 @@ seaprobe(struct device *parent __unused, struct cfdata *match __unused,
* Attach all sub-devices we can find
*/
void
-seaattach(struct device *parent __unused, struct device *self, void *aux)
+seaattach(struct device *parent, struct device *self, void *aux)
{
struct isa_attach_args *ia = aux;
struct sea_softc *sea = (void *)self;
@@ -661,7 +661,7 @@ sea_scsipi_request(chan, req, arg)
* put it in the hash table too; otherwise return an error or sleep.
*/
struct sea_scb *
-sea_get_scb(struct sea_softc *sea, int flags __unused)
+sea_get_scb(struct sea_softc *sea, int flags)
{
int s;
struct sea_scb *scb;
@@ -821,7 +821,7 @@ sea_grow_scb(sea)
sea->sc_adapter.adapt_openings++;
}
void
-sea_free_scb(struct sea_softc *sea, struct sea_scb *scb, int flags __unused)
+sea_free_scb(struct sea_softc *sea, struct sea_scb *scb, int flags)
{
int s;
@@ -1242,7 +1242,7 @@ sea_done(sea, scb)
* Wait for completion of command in polled mode.
*/
int
-sea_poll(struct sea_softc *sea __unused, struct scsipi_xfer *xs, int count)
+sea_poll(struct sea_softc *sea, struct scsipi_xfer *xs, int count)
{
int s;
diff --git a/sys/dev/isa/sf16fmr2.c b/sys/dev/isa/sf16fmr2.c
index 8ecc67fd678..9aa78b30031 100644
--- a/sys/dev/isa/sf16fmr2.c
+++ b/sys/dev/isa/sf16fmr2.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sf16fmr2.c,v 1.12 2006/10/12 01:31:17 christos Exp $ */
+/* $NetBSD: sf16fmr2.c,v 1.13 2006/11/16 01:33:00 christos Exp $ */
/* $OpenBSD: sf16fmr2.c,v 1.3 2001/12/18 18:48:08 mickey Exp $ */
/* $RuOBSD: sf16fmr2.c,v 1.12 2001/10/18 16:51:36 pva Exp $ */
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sf16fmr2.c,v 1.12 2006/10/12 01:31:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sf16fmr2.c,v 1.13 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -121,7 +121,7 @@ void sf2r_rset(bus_space_tag_t, bus_space_handle_t, bus_size_t, u_int32_t);
void sf2r_write_bit(bus_space_tag_t, bus_space_handle_t, bus_size_t, int);
int
-sf2r_probe(struct device *parent __unused, struct cfdata *cf __unused,
+sf2r_probe(struct device *parent, struct cfdata *cf,
void *aux)
{
struct isa_attach_args *ia = aux;
@@ -165,7 +165,7 @@ sf2r_probe(struct device *parent __unused, struct cfdata *cf __unused,
}
void
-sf2r_attach(struct device *parent __unused, struct device *self, void *aux)
+sf2r_attach(struct device *parent, struct device *self, void *aux)
{
struct sf2r_softc *sc = (void *) self;
struct isa_attach_args *ia = aux;
@@ -213,14 +213,14 @@ sf2r_set_mute(struct sf2r_softc *sc)
void
sf2r_init(bus_space_tag_t iot, bus_space_handle_t ioh, bus_size_t off,
- u_int32_t d __unused)
+ u_int32_t d)
{
bus_space_write_1(iot, ioh, off, SF16FMR2_MUTE);
}
void
sf2r_rset(bus_space_tag_t iot, bus_space_handle_t ioh, bus_size_t off,
- u_int32_t d __unused)
+ u_int32_t d)
{
bus_space_write_1(iot, ioh, off, SF16FMR2_MUTE);
bus_space_write_1(iot, ioh, off, SF16FMR2_UNMUTE);
diff --git a/sys/dev/isa/slhci_isa.c b/sys/dev/isa/slhci_isa.c
index 1a989cc97dd..8679652691b 100644
--- a/sys/dev/isa/slhci_isa.c
+++ b/sys/dev/isa/slhci_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: slhci_isa.c,v 1.5 2006/10/12 01:31:17 christos Exp $ */
+/* $NetBSD: slhci_isa.c,v 1.6 2006/11/16 01:33:00 christos Exp $ */
/*
* Copyright (c) 2001 Kiyoshi Ikehara. All rights reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: slhci_isa.c,v 1.5 2006/10/12 01:31:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: slhci_isa.c,v 1.6 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -66,7 +66,7 @@ CFATTACH_DECL(slhci_isa, sizeof(struct slhci_isa_softc),
slhci_isa_match, slhci_isa_attach, NULL, NULL);
static int
-slhci_isa_match(struct device *parent __unused, struct cfdata *cf __unused,
+slhci_isa_match(struct device *parent, struct cfdata *cf,
void *aux)
{
struct slhci_softc sc;
@@ -91,7 +91,7 @@ slhci_isa_match(struct device *parent __unused, struct cfdata *cf __unused,
}
static void
-slhci_isa_attach(struct device *parent __unused, struct device *self, void *aux)
+slhci_isa_attach(struct device *parent, struct device *self, void *aux)
{
struct slhci_isa_softc *isc = (struct slhci_isa_softc *)self;
struct slhci_softc *sc = &isc->sc;
diff --git a/sys/dev/isa/spkr.c b/sys/dev/isa/spkr.c
index cef020b7804..f908af69d78 100644
--- a/sys/dev/isa/spkr.c
+++ b/sys/dev/isa/spkr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: spkr.c,v 1.22 2006/10/12 01:31:17 christos Exp $ */
+/* $NetBSD: spkr.c,v 1.23 2006/11/16 01:33:00 christos Exp $ */
/*
* Copyright (c) 1990 Eric S. Raymond (esr@snark.thyrsus.com)
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.22 2006/10/12 01:31:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.23 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -407,14 +407,14 @@ static void *spkr_inbuf;
static int spkr_attached = 0;
int
-spkrprobe(struct device *parent __unused, struct cfdata *match __unused,
- void *aux __unused)
+spkrprobe(struct device *parent, struct cfdata *match,
+ void *aux)
{
return (!spkr_attached);
}
void
-spkrattach(struct device *parent __unused, struct device *self __unused,
+spkrattach(struct device *parent, struct device *self,
void *aux)
{
printf("\n");
@@ -423,8 +423,8 @@ spkrattach(struct device *parent __unused, struct device *self __unused,
}
int
-spkropen(dev_t dev, int flags __unused, int mode __unused,
- struct lwp *l __unused)
+spkropen(dev_t dev, int flags, int mode,
+ struct lwp *l)
{
#ifdef SPKRDEBUG
printf("spkropen: entering with dev = %x\n", dev);
@@ -444,7 +444,7 @@ spkropen(dev_t dev, int flags __unused, int mode __unused,
}
int
-spkrwrite(dev_t dev, struct uio *uio, int flags __unused)
+spkrwrite(dev_t dev, struct uio *uio, int flags)
{
int n;
int error;
@@ -465,8 +465,8 @@ spkrwrite(dev_t dev, struct uio *uio, int flags __unused)
}
}
-int spkrclose(dev_t dev, int flags __unused, int mode __unused,
- struct lwp *l __unused)
+int spkrclose(dev_t dev, int flags, int mode,
+ struct lwp *l)
{
#ifdef SPKRDEBUG
printf("spkrclose: entering with dev = %x\n", dev);
@@ -483,8 +483,8 @@ int spkrclose(dev_t dev, int flags __unused, int mode __unused,
return(0);
}
-int spkrioctl(dev_t dev, u_long cmd, caddr_t data, int flag __unused,
- struct lwp *l __unused)
+int spkrioctl(dev_t dev, u_long cmd, caddr_t data, int flag,
+ struct lwp *l)
{
#ifdef SPKRDEBUG
printf("spkrioctl: entering with dev = %x, cmd = %lx\n", dev, cmd);
diff --git a/sys/dev/isa/tcic2_isa.c b/sys/dev/isa/tcic2_isa.c
index 324819a2ca2..67f8b347fba 100644
--- a/sys/dev/isa/tcic2_isa.c
+++ b/sys/dev/isa/tcic2_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tcic2_isa.c,v 1.16 2006/10/12 01:31:17 christos Exp $ */
+/* $NetBSD: tcic2_isa.c,v 1.17 2006/11/16 01:33:00 christos Exp $ */
/*
*
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcic2_isa.c,v 1.16 2006/10/12 01:31:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcic2_isa.c,v 1.17 2006/11/16 01:33:00 christos Exp $");
#undef TCICISADEBUG
@@ -142,7 +142,7 @@ static struct pcmcia_chip_functions tcic_isa_functions = {
};
int
-tcic_isa_probe(struct device *parent __unused, struct cfdata *match __unused,
+tcic_isa_probe(struct device *parent, struct cfdata *match,
void *aux)
{
struct isa_attach_args *ia = aux;
@@ -217,7 +217,7 @@ tcic_isa_probe(struct device *parent __unused, struct cfdata *match __unused,
}
void
-tcic_isa_attach(struct device *parent __unused, struct device *self, void *aux)
+tcic_isa_attach(struct device *parent, struct device *self, void *aux)
{
struct tcic_softc *sc = (void *) self;
struct isa_attach_args *ia = aux;
diff --git a/sys/dev/isa/tcom.c b/sys/dev/isa/tcom.c
index c0f278a2ad0..65723400d7a 100644
--- a/sys/dev/isa/tcom.c
+++ b/sys/dev/isa/tcom.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tcom.c,v 1.12 2006/10/12 01:31:17 christos Exp $ */
+/* $NetBSD: tcom.c,v 1.13 2006/11/16 01:33:00 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcom.c,v 1.12 2006/10/12 01:31:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcom.c,v 1.13 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -118,7 +118,7 @@ CFATTACH_DECL(tcom, sizeof(struct tcom_softc),
tcomprobe, tcomattach, NULL, NULL);
int
-tcomprobe(struct device *parent __unused, struct cfdata *self __unused,
+tcomprobe(struct device *parent, struct cfdata *self,
void *aux)
{
struct isa_attach_args *ia = aux;
@@ -188,7 +188,7 @@ out:
}
void
-tcomattach(struct device *parent __unused, struct device *self, void *aux)
+tcomattach(struct device *parent, struct device *self, void *aux)
{
struct tcom_softc *sc = (void *)self;
struct isa_attach_args *ia = aux;
diff --git a/sys/dev/isa/uha_isa.c b/sys/dev/isa/uha_isa.c
index 78ec45b4d16..148c88e480e 100644
--- a/sys/dev/isa/uha_isa.c
+++ b/sys/dev/isa/uha_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uha_isa.c,v 1.30 2006/10/12 01:31:17 christos Exp $ */
+/* $NetBSD: uha_isa.c,v 1.31 2006/11/16 01:33:00 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uha_isa.c,v 1.30 2006/10/12 01:31:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uha_isa.c,v 1.31 2006/11/16 01:33:00 christos Exp $");
#include "opt_ddb.h"
@@ -85,7 +85,7 @@ void u14_init(struct uha_softc *);
* the actual probe routine to check it out.
*/
int
-uha_isa_probe(struct device *parent __unused, struct cfdata *match __unused,
+uha_isa_probe(struct device *parent, struct cfdata *match,
void *aux)
{
struct isa_attach_args *ia = aux;
@@ -141,7 +141,7 @@ uha_isa_probe(struct device *parent __unused, struct cfdata *match __unused,
* Attach all the sub-devices we can find
*/
void
-uha_isa_attach(struct device *parent __unused, struct device *self, void *aux)
+uha_isa_attach(struct device *parent, struct device *self, void *aux)
{
struct isa_attach_args *ia = aux;
struct uha_softc *sc = (void *)self;
diff --git a/sys/dev/isa/vga_isa.c b/sys/dev/isa/vga_isa.c
index 06ff3dcd550..159cf9c693b 100644
--- a/sys/dev/isa/vga_isa.c
+++ b/sys/dev/isa/vga_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vga_isa.c,v 1.19 2006/10/12 01:31:17 christos Exp $ */
+/* $NetBSD: vga_isa.c,v 1.20 2006/11/16 01:33:00 christos Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vga_isa.c,v 1.19 2006/10/12 01:31:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga_isa.c,v 1.20 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -54,7 +54,7 @@ CFATTACH_DECL(vga_isa, sizeof(struct vga_softc),
vga_isa_match, vga_isa_attach, NULL, NULL);
int
-vga_isa_match(struct device *parent __unused, struct cfdata *match __unused,
+vga_isa_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct isa_attach_args *ia = aux;
@@ -103,7 +103,7 @@ vga_isa_match(struct device *parent __unused, struct cfdata *match __unused,
}
void
-vga_isa_attach(struct device *parent __unused, struct device *self, void *aux)
+vga_isa_attach(struct device *parent, struct device *self, void *aux)
{
struct vga_softc *sc = (void *) self;
struct isa_attach_args *ia = aux;
diff --git a/sys/dev/isa/wdc_isa.c b/sys/dev/isa/wdc_isa.c
index 36cbf3a5969..400be7ebc4e 100644
--- a/sys/dev/isa/wdc_isa.c
+++ b/sys/dev/isa/wdc_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc_isa.c,v 1.50 2006/10/12 01:31:17 christos Exp $ */
+/* $NetBSD: wdc_isa.c,v 1.51 2006/11/16 01:33:00 christos Exp $ */
/*-
* Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_isa.c,v 1.50 2006/10/12 01:31:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_isa.c,v 1.51 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -88,7 +88,7 @@ static int wdc_isa_dma_finish(void*, int, int, int);
#endif
static int
-wdc_isa_probe(struct device *parent __unused, struct cfdata *match __unused,
+wdc_isa_probe(struct device *parent, struct cfdata *match,
void *aux)
{
struct ata_channel ch;
@@ -153,7 +153,7 @@ out:
}
static void
-wdc_isa_attach(struct device *parent __unused, struct device *self, void *aux)
+wdc_isa_attach(struct device *parent, struct device *self, void *aux)
{
struct wdc_isa_softc *sc = (void *)self;
struct wdc_regs *wdr;
diff --git a/sys/dev/isa/wds.c b/sys/dev/isa/wds.c
index 9d23ddbd409..8cd313f5bcc 100644
--- a/sys/dev/isa/wds.c
+++ b/sys/dev/isa/wds.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wds.c,v 1.64 2006/10/12 01:31:17 christos Exp $ */
+/* $NetBSD: wds.c,v 1.65 2006/11/16 01:33:00 christos Exp $ */
/*
* XXX
@@ -86,7 +86,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wds.c,v 1.64 2006/10/12 01:31:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wds.c,v 1.65 2006/11/16 01:33:00 christos Exp $");
#include "opt_ddb.h"
@@ -259,7 +259,7 @@ wds_cmd(iot, ioh, ibuf, icnt)
* Check for the presence of a WD7000 SCSI controller.
*/
int
-wdsprobe(struct device *parent __unused, struct cfdata *match __unused,
+wdsprobe(struct device *parent, struct cfdata *match,
void *aux)
{
struct isa_attach_args *ia = aux;
@@ -324,7 +324,7 @@ wdsprobe(struct device *parent __unused, struct cfdata *match __unused,
* Attach all available units.
*/
void
-wdsattach(struct device *parent __unused, struct device *self, void *aux)
+wdsattach(struct device *parent, struct device *self, void *aux)
{
struct isa_attach_args *ia = aux;
struct wds_softc *sc = (void *)self;
@@ -523,7 +523,7 @@ wdsintr(arg)
}
integrate void
-wds_reset_scb(struct wds_softc *sc __unused, struct wds_scb *scb)
+wds_reset_scb(struct wds_softc *sc, struct wds_scb *scb)
{
scb->flags = 0;
diff --git a/sys/dev/isa/wss.c b/sys/dev/isa/wss.c
index ed89783cfba..5acd13015ee 100644
--- a/sys/dev/isa/wss.c
+++ b/sys/dev/isa/wss.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wss.c,v 1.66 2006/10/12 01:31:17 christos Exp $ */
+/* $NetBSD: wss.c,v 1.67 2006/11/16 01:33:00 christos Exp $ */
/*
* Copyright (c) 1994 John Brezak
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wss.c,v 1.66 2006/10/12 01:31:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wss.c,v 1.67 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -173,7 +173,7 @@ wssattach(struct wss_softc *sc)
}
int
-wss_getdev(void *addr __unused, struct audio_device *retp)
+wss_getdev(void *addr, struct audio_device *retp)
{
*retp = wss_device;
@@ -214,7 +214,7 @@ wss_mixer_get_port(void *addr, mixer_ctrl_t *cp)
}
int
-wss_query_devinfo(void *addr __unused, mixer_devinfo_t *dip)
+wss_query_devinfo(void *addr, mixer_devinfo_t *dip)
{
DPRINTF(("wss_query_devinfo: index=%d\n", dip->index));
diff --git a/sys/dev/isa/wss_isa.c b/sys/dev/isa/wss_isa.c
index 12062de4bba..64a6bce637c 100644
--- a/sys/dev/isa/wss_isa.c
+++ b/sys/dev/isa/wss_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wss_isa.c,v 1.22 2006/10/12 01:31:17 christos Exp $ */
+/* $NetBSD: wss_isa.c,v 1.23 2006/11/16 01:33:00 christos Exp $ */
/*
* Copyright (c) 1994 John Brezak
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wss_isa.c,v 1.22 2006/10/12 01:31:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wss_isa.c,v 1.23 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -120,7 +120,7 @@ wss_isa_probe(struct device *parent, struct cfdata *match, void *aux)
}
static int
-wssfind(struct device *parent __unused, struct wss_softc *sc, int probing,
+wssfind(struct device *parent, struct wss_softc *sc, int probing,
struct isa_attach_args *ia)
{
static u_char interrupt_bits[12] = {
diff --git a/sys/dev/isa/wt.c b/sys/dev/isa/wt.c
index f15c9b18684..d815f37b663 100644
--- a/sys/dev/isa/wt.c
+++ b/sys/dev/isa/wt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wt.c,v 1.73 2006/10/12 01:31:17 christos Exp $ */
+/* $NetBSD: wt.c,v 1.74 2006/11/16 01:33:00 christos Exp $ */
/*
* Streamer tape driver.
@@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wt.c,v 1.73 2006/10/12 01:31:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wt.c,v 1.74 2006/11/16 01:33:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -193,7 +193,7 @@ extern struct cfdriver wt_cd;
* Probe for the presence of the device.
*/
int
-wtprobe(struct device *parent __unused, struct cfdata *match __unused,
+wtprobe(struct device *parent, struct cfdata *match,
void *aux)
{
struct isa_attach_args *ia = aux;
@@ -258,7 +258,7 @@ done:
* Device is found, configure it.
*/
void
-wtattach(struct device *parent __unused, struct device *self, void *aux)
+wtattach(struct device *parent, struct device *self, void *aux)
{
struct wt_softc *sc = (void *)self;
struct isa_attach_args *ia = aux;
@@ -330,8 +330,8 @@ ok:
}
static int
-wtdump(dev_t dev __unused, daddr_t blkno __unused, caddr_t va __unused,
- size_t size __unused)
+wtdump(dev_t dev, daddr_t blkno, caddr_t va,
+ size_t size)
{
/* Not implemented. */
@@ -339,7 +339,7 @@ wtdump(dev_t dev __unused, daddr_t blkno __unused, caddr_t va __unused,
}
static int
-wtsize(dev_t dev __unused)
+wtsize(dev_t dev)
{
/* Not implemented. */
@@ -350,7 +350,7 @@ wtsize(dev_t dev __unused)
* Open routine, called on every device open.
*/
static int
-wtopen(dev_t dev, int flag, int mode __unused, struct lwp *l __unused)
+wtopen(dev_t dev, int flag, int mode, struct lwp *l)
{
int unit = minor(dev) & T_UNIT;
struct wt_softc *sc;
@@ -435,8 +435,8 @@ wtopen(dev_t dev, int flag, int mode __unused, struct lwp *l __unused)
* Close routine, called on last device close.
*/
static int
-wtclose(dev_t dev, int flags __unused, int mode __unused,
- struct lwp *l __unused)
+wtclose(dev_t dev, int flags, int mode,
+ struct lwp *l)
{
struct wt_softc *sc = device_lookup(&wt_cd, minor(dev) & T_UNIT);
@@ -485,8 +485,8 @@ done:
* ioctl(int fd, WTQICMD, int qicop) -- do QIC op
*/
static int
-wtioctl(dev_t dev, unsigned long cmd, caddr_t addr, int flag __unused,
- struct lwp *l __unused)
+wtioctl(dev_t dev, unsigned long cmd, caddr_t addr, int flag,
+ struct lwp *l)
{
struct wt_softc *sc = device_lookup(&wt_cd, minor(dev) & T_UNIT);
int error, count, op;
@@ -657,14 +657,14 @@ xit:
}
static int
-wtread(dev_t dev, struct uio *uio, int flags __unused)
+wtread(dev_t dev, struct uio *uio, int flags)
{
return (physio(wtstrategy, NULL, dev, B_READ, minphys, uio));
}
static int
-wtwrite(dev_t dev, struct uio *uio, int flags __unused)
+wtwrite(dev_t dev, struct uio *uio, int flags)
{
return (physio(wtstrategy, NULL, dev, B_WRITE, minphys, uio));
diff --git a/sys/dev/isapnp/aha_isapnp.c b/sys/dev/isapnp/aha_isapnp.c
index 5da3dc94594..0fecd641025 100644
--- a/sys/dev/isapnp/aha_isapnp.c
+++ b/sys/dev/isapnp/aha_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aha_isapnp.c,v 1.11 2006/10/12 01:31:24 christos Exp $ */
+/* $NetBSD: aha_isapnp.c,v 1.12 2006/11/16 01:33:05 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aha_isapnp.c,v 1.11 2006/10/12 01:31:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aha_isapnp.c,v 1.12 2006/11/16 01:33:05 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -67,7 +67,7 @@ CFATTACH_DECL(aha_isapnp, sizeof(struct aha_softc),
aha_isapnp_probe, aha_isapnp_attach, NULL, NULL);
int
-aha_isapnp_probe(struct device *parent __unused, struct cfdata *match __unused,
+aha_isapnp_probe(struct device *parent, struct cfdata *match,
void *aux)
{
int pri, variant;
@@ -79,7 +79,7 @@ aha_isapnp_probe(struct device *parent __unused, struct cfdata *match __unused,
}
void
-aha_isapnp_attach(struct device *parent __unused, struct device *self,
+aha_isapnp_attach(struct device *parent, struct device *self,
void *aux)
{
struct aha_softc *sc = device_private(self);
diff --git a/sys/dev/isapnp/aic_isapnp.c b/sys/dev/isapnp/aic_isapnp.c
index c42ef1c7b9e..975efcd4d0f 100644
--- a/sys/dev/isapnp/aic_isapnp.c
+++ b/sys/dev/isapnp/aic_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aic_isapnp.c,v 1.13 2006/10/12 01:31:24 christos Exp $ */
+/* $NetBSD: aic_isapnp.c,v 1.14 2006/11/16 01:33:05 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic_isapnp.c,v 1.13 2006/10/12 01:31:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic_isapnp.c,v 1.14 2006/11/16 01:33:05 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -71,7 +71,7 @@ CFATTACH_DECL(aic_isapnp, sizeof(struct aic_isapnp_softc),
aic_isapnp_match, aic_isapnp_attach, NULL, NULL);
int
-aic_isapnp_match(struct device *parent __unused, struct cfdata *match __unused,
+aic_isapnp_match(struct device *parent, struct cfdata *match,
void *aux)
{
int pri, variant;
@@ -83,7 +83,7 @@ aic_isapnp_match(struct device *parent __unused, struct cfdata *match __unused,
}
void
-aic_isapnp_attach(struct device *parent __unused, struct device *self,
+aic_isapnp_attach(struct device *parent, struct device *self,
void *aux)
{
struct aic_isapnp_softc *isc = device_private(self);
diff --git a/sys/dev/isapnp/com_isapnp.c b/sys/dev/isapnp/com_isapnp.c
index 99d9e9c8093..e06526c73db 100644
--- a/sys/dev/isapnp/com_isapnp.c
+++ b/sys/dev/isapnp/com_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com_isapnp.c,v 1.25 2006/10/12 01:31:24 christos Exp $ */
+/* $NetBSD: com_isapnp.c,v 1.26 2006/11/16 01:33:05 christos Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_isapnp.c,v 1.25 2006/10/12 01:31:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_isapnp.c,v 1.26 2006/11/16 01:33:05 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -74,7 +74,7 @@ CFATTACH_DECL(com_isapnp, sizeof(struct com_isapnp_softc),
com_isapnp_match, com_isapnp_attach, NULL, NULL);
int
-com_isapnp_match(struct device *parent __unused, struct cfdata *match __unused,
+com_isapnp_match(struct device *parent, struct cfdata *match,
void *aux)
{
int pri, variant;
@@ -86,7 +86,7 @@ com_isapnp_match(struct device *parent __unused, struct cfdata *match __unused,
}
void
-com_isapnp_attach(struct device *parent __unused, struct device *self,
+com_isapnp_attach(struct device *parent, struct device *self,
void *aux)
{
struct com_isapnp_softc *isc = device_private(self);
diff --git a/sys/dev/isapnp/ess_isapnp.c b/sys/dev/isapnp/ess_isapnp.c
index 587725d30ae..ca4e319a794 100644
--- a/sys/dev/isapnp/ess_isapnp.c
+++ b/sys/dev/isapnp/ess_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ess_isapnp.c,v 1.16 2006/10/12 01:31:24 christos Exp $ */
+/* $NetBSD: ess_isapnp.c,v 1.17 2006/11/16 01:33:05 christos Exp $ */
/*
* Copyright (c) 1991-1993 Regents of the University of California.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ess_isapnp.c,v 1.16 2006/10/12 01:31:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ess_isapnp.c,v 1.17 2006/11/16 01:33:05 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -75,7 +75,7 @@ CFATTACH_DECL(ess_isapnp, sizeof(struct ess_softc),
* Probe for the ess hardware.
*/
int
-ess_isapnp_match(struct device *parent __unused, struct cfdata *match __unused,
+ess_isapnp_match(struct device *parent, struct cfdata *match,
void *aux)
{
int pri, variant;
@@ -92,7 +92,7 @@ ess_isapnp_match(struct device *parent __unused, struct cfdata *match __unused,
* pseudo-device driver.
*/
void
-ess_isapnp_attach(struct device *parent __unused, struct device *self,
+ess_isapnp_attach(struct device *parent, struct device *self,
void *aux)
{
struct ess_softc *sc;
diff --git a/sys/dev/isapnp/gus_isapnp.c b/sys/dev/isapnp/gus_isapnp.c
index 357605f8c9d..469475d4411 100644
--- a/sys/dev/isapnp/gus_isapnp.c
+++ b/sys/dev/isapnp/gus_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: gus_isapnp.c,v 1.29 2006/10/12 01:31:24 christos Exp $ */
+/* $NetBSD: gus_isapnp.c,v 1.30 2006/11/16 01:33:05 christos Exp $ */
/*
* Copyright (c) 1997, 1999 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gus_isapnp.c,v 1.29 2006/10/12 01:31:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gus_isapnp.c,v 1.30 2006/11/16 01:33:05 christos Exp $");
#include "guspnp.h"
#if NGUSPNP > 0
@@ -126,7 +126,7 @@ extern struct cfdriver guspnp_cd;
static int gus_0 = 1; /* XXX what's this */
int
-gus_isapnp_match(struct device *parent __unused, struct cfdata *match __unused,
+gus_isapnp_match(struct device *parent, struct cfdata *match,
void *aux)
{
int pri, variant;
@@ -142,7 +142,7 @@ gus_isapnp_match(struct device *parent __unused, struct cfdata *match __unused,
* pseudo-device driver.
*/
void
-gus_isapnp_attach(struct device *parent __unused, struct device *self,
+gus_isapnp_attach(struct device *parent, struct device *self,
void *aux)
{
struct iw_softc *sc;
diff --git a/sys/dev/isapnp/i82365_isapnp.c b/sys/dev/isapnp/i82365_isapnp.c
index c42bb698565..7100bca55a8 100644
--- a/sys/dev/isapnp/i82365_isapnp.c
+++ b/sys/dev/isapnp/i82365_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: i82365_isapnp.c,v 1.22 2006/10/12 01:31:24 christos Exp $ */
+/* $NetBSD: i82365_isapnp.c,v 1.23 2006/11/16 01:33:05 christos Exp $ */
/*
* Copyright (c) 1998 Bill Sommerfeld. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i82365_isapnp.c,v 1.22 2006/10/12 01:31:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i82365_isapnp.c,v 1.23 2006/11/16 01:33:05 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -92,7 +92,7 @@ static struct pcmcia_chip_functions pcic_isa_functions = {
};
int
-pcic_isapnp_match(struct device *parent __unused, struct cfdata *match __unused,
+pcic_isapnp_match(struct device *parent, struct cfdata *match,
void *aux)
{
int pri, variant;
@@ -104,7 +104,7 @@ pcic_isapnp_match(struct device *parent __unused, struct cfdata *match __unused,
}
void
-pcic_isapnp_attach(struct device *parent __unused, struct device *self,
+pcic_isapnp_attach(struct device *parent, struct device *self,
void *aux)
{
struct pcic_softc *sc = device_private(self);
diff --git a/sys/dev/isapnp/if_an_isapnp.c b/sys/dev/isapnp/if_an_isapnp.c
index 4dde285b673..eca040d47e4 100644
--- a/sys/dev/isapnp/if_an_isapnp.c
+++ b/sys/dev/isapnp/if_an_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_an_isapnp.c,v 1.14 2006/10/12 01:31:24 christos Exp $ */
+/* $NetBSD: if_an_isapnp.c,v 1.15 2006/11/16 01:33:05 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_an_isapnp.c,v 1.14 2006/10/12 01:31:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_an_isapnp.c,v 1.15 2006/11/16 01:33:05 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -90,7 +90,7 @@ CFATTACH_DECL(an_isapnp, sizeof(struct an_isapnp_softc),
an_isapnp_match, an_isapnp_attach, NULL, NULL);
int
-an_isapnp_match(struct device *parent __unused, struct cfdata *match __unused,
+an_isapnp_match(struct device *parent, struct cfdata *match,
void *aux)
{
int pri, variant;
@@ -102,7 +102,7 @@ an_isapnp_match(struct device *parent __unused, struct cfdata *match __unused,
}
void
-an_isapnp_attach(struct device *parent __unused, struct device *self, void *aux)
+an_isapnp_attach(struct device *parent, struct device *self, void *aux)
{
struct an_isapnp_softc *isc = device_private(self);
struct an_softc *sc = &isc->sc_an;
diff --git a/sys/dev/isapnp/if_ep_isapnp.c b/sys/dev/isapnp/if_ep_isapnp.c
index 59a01fdbb8d..1fdf278aedf 100644
--- a/sys/dev/isapnp/if_ep_isapnp.c
+++ b/sys/dev/isapnp/if_ep_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ep_isapnp.c,v 1.30 2006/10/12 01:31:24 christos Exp $ */
+/* $NetBSD: if_ep_isapnp.c,v 1.31 2006/11/16 01:33:05 christos Exp $ */
/*
* Copyright (c) 1997 Jonathan Stone <jonathan@NetBSD.org>
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ep_isapnp.c,v 1.30 2006/10/12 01:31:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ep_isapnp.c,v 1.31 2006/11/16 01:33:05 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -70,7 +70,7 @@ CFATTACH_DECL(ep_isapnp, sizeof(struct ep_softc),
ep_isapnp_match, ep_isapnp_attach, NULL, NULL);
int
-ep_isapnp_match(struct device *parent __unused, struct cfdata *match __unused,
+ep_isapnp_match(struct device *parent, struct cfdata *match,
void *aux)
{
int pri, variant;
@@ -82,7 +82,7 @@ ep_isapnp_match(struct device *parent __unused, struct cfdata *match __unused,
}
void
-ep_isapnp_attach(struct device *parent __unused, struct device *self, void *aux)
+ep_isapnp_attach(struct device *parent, struct device *self, void *aux)
{
struct ep_softc *sc = device_private(self);
struct isapnp_attach_args *ipa = aux;
diff --git a/sys/dev/isapnp/if_fmv_isapnp.c b/sys/dev/isapnp/if_fmv_isapnp.c
index 5c9948d7039..ff341f0be06 100644
--- a/sys/dev/isapnp/if_fmv_isapnp.c
+++ b/sys/dev/isapnp/if_fmv_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fmv_isapnp.c,v 1.7 2006/10/12 01:31:24 christos Exp $ */
+/* $NetBSD: if_fmv_isapnp.c,v 1.8 2006/11/16 01:33:05 christos Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fmv_isapnp.c,v 1.7 2006/10/12 01:31:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fmv_isapnp.c,v 1.8 2006/11/16 01:33:05 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -76,7 +76,7 @@ CFATTACH_DECL(fmv_isapnp, sizeof(struct fmv_isapnp_softc),
fmv_isapnp_match, fmv_isapnp_attach, NULL, NULL);
int
-fmv_isapnp_match(struct device *parent __unused, struct cfdata *match __unused,
+fmv_isapnp_match(struct device *parent, struct cfdata *match,
void *aux)
{
int pri, variant;
@@ -88,7 +88,7 @@ fmv_isapnp_match(struct device *parent __unused, struct cfdata *match __unused,
}
void
-fmv_isapnp_attach(struct device *parent __unused, struct device *self,
+fmv_isapnp_attach(struct device *parent, struct device *self,
void *aux)
{
struct fmv_isapnp_softc *isc = device_private(self);
diff --git a/sys/dev/isapnp/if_le_isapnp.c b/sys/dev/isapnp/if_le_isapnp.c
index de18c555426..0613543e98f 100644
--- a/sys/dev/isapnp/if_le_isapnp.c
+++ b/sys/dev/isapnp/if_le_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le_isapnp.c,v 1.29 2006/10/12 01:31:24 christos Exp $ */
+/* $NetBSD: if_le_isapnp.c,v 1.30 2006/11/16 01:33:05 christos Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le_isapnp.c,v 1.29 2006/10/12 01:31:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_isapnp.c,v 1.30 2006/11/16 01:33:05 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -166,7 +166,7 @@ le_isapnp_rdcsr(sc, port)
}
int
-le_isapnp_match(struct device *parent __unused, struct cfdata *match __unused,
+le_isapnp_match(struct device *parent, struct cfdata *match,
void *aux)
{
int pri, variant;
@@ -178,7 +178,7 @@ le_isapnp_match(struct device *parent __unused, struct cfdata *match __unused,
}
void
-le_isapnp_attach(struct device *parent __unused, struct device *self, void *aux)
+le_isapnp_attach(struct device *parent, struct device *self, void *aux)
{
struct le_isapnp_softc *lesc = device_private(self);
struct lance_softc *sc = &lesc->sc_am7990.lsc;
diff --git a/sys/dev/isapnp/if_ne_isapnp.c b/sys/dev/isapnp/if_ne_isapnp.c
index 0d860e0cb99..9786b1185f6 100644
--- a/sys/dev/isapnp/if_ne_isapnp.c
+++ b/sys/dev/isapnp/if_ne_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ne_isapnp.c,v 1.22 2006/10/12 01:31:24 christos Exp $ */
+/* $NetBSD: if_ne_isapnp.c,v 1.23 2006/11/16 01:33:05 christos Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ne_isapnp.c,v 1.22 2006/10/12 01:31:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ne_isapnp.c,v 1.23 2006/11/16 01:33:05 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -87,7 +87,7 @@ CFATTACH_DECL(ne_isapnp, sizeof(struct ne_isapnp_softc),
ne_isapnp_match, ne_isapnp_attach, NULL, NULL);
static int
-ne_isapnp_match(struct device *parent __unused, struct cfdata *match __unused,
+ne_isapnp_match(struct device *parent, struct cfdata *match,
void *aux)
{
int pri, variant;
@@ -100,7 +100,7 @@ ne_isapnp_match(struct device *parent __unused, struct cfdata *match __unused,
static void
ne_isapnp_attach(
- struct device *parent __unused,
+ struct device *parent,
struct device *self,
void *aux)
{
diff --git a/sys/dev/isapnp/if_tr_isapnp.c b/sys/dev/isapnp/if_tr_isapnp.c
index 4d100ffbec2..bead5593f7f 100644
--- a/sys/dev/isapnp/if_tr_isapnp.c
+++ b/sys/dev/isapnp/if_tr_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tr_isapnp.c,v 1.14 2006/10/12 01:31:24 christos Exp $ */
+/* $NetBSD: if_tr_isapnp.c,v 1.15 2006/11/16 01:33:05 christos Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tr_isapnp.c,v 1.14 2006/10/12 01:31:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tr_isapnp.c,v 1.15 2006/11/16 01:33:05 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -75,7 +75,7 @@ CFATTACH_DECL(tr_isapnp, sizeof(struct tr_softc),
tr_isapnp_match, tr_isapnp_attach, NULL, NULL);
int
-tr_isapnp_match(struct device *parent __unused, struct cfdata *match __unused,
+tr_isapnp_match(struct device *parent, struct cfdata *match,
void *aux)
{
int pri, variant;
@@ -88,7 +88,7 @@ tr_isapnp_match(struct device *parent __unused, struct cfdata *match __unused,
void
-tr_isapnp_attach(struct device *parent __unused, struct device *self,
+tr_isapnp_attach(struct device *parent, struct device *self,
void *aux)
{
struct tr_softc *sc = device_private(self);
diff --git a/sys/dev/isapnp/isapnp.c b/sys/dev/isapnp/isapnp.c
index 9030d88892d..03aa2f77560 100644
--- a/sys/dev/isapnp/isapnp.c
+++ b/sys/dev/isapnp/isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isapnp.c,v 1.51 2006/10/12 01:31:24 christos Exp $ */
+/* $NetBSD: isapnp.c,v 1.52 2006/11/16 01:33:05 christos Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isapnp.c,v 1.51 2006/10/12 01:31:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isapnp.c,v 1.52 2006/11/16 01:33:05 christos Exp $");
#include "isadma.h"
@@ -602,7 +602,7 @@ isapnp_print(aux, str)
*/
static int
isapnp_submatch(struct device *parent, struct cfdata *match,
- const int *ldesc __unused, void *aux)
+ const int *ldesc, void *aux)
{
return (config_match(parent, match, aux));
@@ -883,7 +883,7 @@ isapnp_configure(sc, ipa)
* Probe routine
*/
static int
-isapnp_match(struct device *parent, struct cfdata *match __unused, void *aux)
+isapnp_match(struct device *parent, struct cfdata *match, void *aux)
{
struct isapnp_softc sc;
struct isa_attach_args *ia = aux;
@@ -932,7 +932,7 @@ isapnp_match(struct device *parent, struct cfdata *match __unused, void *aux)
* Attach the PnP `bus'.
*/
static void
-isapnp_attach(struct device *parent __unused, struct device *self, void *aux)
+isapnp_attach(struct device *parent, struct device *self, void *aux)
{
struct isapnp_softc *sc = device_private(self);
struct isa_attach_args *ia = aux;
diff --git a/sys/dev/isapnp/isic_isapnp.c b/sys/dev/isapnp/isic_isapnp.c
index a34c4523fb8..09ca7a7bc79 100644
--- a/sys/dev/isapnp/isic_isapnp.c
+++ b/sys/dev/isapnp/isic_isapnp.c
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isapnp.c,v 1.23 2006/10/16 13:00:36 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isapnp.c,v 1.24 2006/11/16 01:33:05 christos Exp $");
#include <sys/param.h>
#include <sys/errno.h>
@@ -163,8 +163,8 @@ isic_isapnp_descriptions[] =
* Probe card
*/
static int
-isic_isapnp_probe(struct device *parent __unused,
- struct cfdata *cf __unused, void *aux)
+isic_isapnp_probe(struct device *parent,
+ struct cfdata *cf, void *aux)
{
struct isapnp_attach_args *ipa = aux;
const struct isic_isapnp_card_desc *desc = isic_isapnp_descriptions;
@@ -194,7 +194,7 @@ isic_isapnp_probe(struct device *parent __unused,
#endif
static void
-isic_isapnp_attach(struct device *parent __unused,
+isic_isapnp_attach(struct device *parent,
struct device *self, void *aux)
{
static const char *ISACversion[] = {
diff --git a/sys/dev/isapnp/joy_isapnp.c b/sys/dev/isapnp/joy_isapnp.c
index b9357b0f171..3ccab869731 100644
--- a/sys/dev/isapnp/joy_isapnp.c
+++ b/sys/dev/isapnp/joy_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: joy_isapnp.c,v 1.8 2006/10/12 01:31:24 christos Exp $ */
+/* $NetBSD: joy_isapnp.c,v 1.9 2006/11/16 01:33:05 christos Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: joy_isapnp.c,v 1.8 2006/10/12 01:31:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: joy_isapnp.c,v 1.9 2006/11/16 01:33:05 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -60,7 +60,7 @@ CFATTACH_DECL(joy_isapnp, sizeof(struct joy_softc),
joy_isapnp_match, joy_isapnp_attach, NULL, NULL);
int
-joy_isapnp_match(struct device *parent __unused, struct cfdata *match __unused,
+joy_isapnp_match(struct device *parent, struct cfdata *match,
void *aux)
{
int pri, variant;
@@ -72,7 +72,7 @@ joy_isapnp_match(struct device *parent __unused, struct cfdata *match __unused,
}
void
-joy_isapnp_attach(struct device *parent __unused, struct device *self,
+joy_isapnp_attach(struct device *parent, struct device *self,
void *aux)
{
struct joy_softc *sc = device_private(self);
diff --git a/sys/dev/isapnp/mpu_isapnp.c b/sys/dev/isapnp/mpu_isapnp.c
index b6fd58432b6..bd8e9934630 100644
--- a/sys/dev/isapnp/mpu_isapnp.c
+++ b/sys/dev/isapnp/mpu_isapnp.c
@@ -1,7 +1,7 @@
-/* $NetBSD: mpu_isapnp.c,v 1.14 2006/10/12 01:31:24 christos Exp $ */
+/* $NetBSD: mpu_isapnp.c,v 1.15 2006/11/16 01:33:05 christos Exp $ */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpu_isapnp.c,v 1.14 2006/10/12 01:31:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpu_isapnp.c,v 1.15 2006/11/16 01:33:05 christos Exp $");
#include "midi.h"
@@ -43,7 +43,7 @@ CFATTACH_DECL(mpu_isapnp, sizeof(struct mpu_isapnp_softc),
mpu_isapnp_match, mpu_isapnp_attach, NULL, NULL);
int
-mpu_isapnp_match(struct device *parent __unused, struct cfdata *match __unused,
+mpu_isapnp_match(struct device *parent, struct cfdata *match,
void *aux)
{
int pri, variant;
@@ -55,7 +55,7 @@ mpu_isapnp_match(struct device *parent __unused, struct cfdata *match __unused,
}
void
-mpu_isapnp_attach(struct device *parent __unused, struct device *self,
+mpu_isapnp_attach(struct device *parent, struct device *self,
void *aux)
{
struct mpu_isapnp_softc *sc = device_private(self);
diff --git a/sys/dev/isapnp/sb_isapnp.c b/sys/dev/isapnp/sb_isapnp.c
index 8501370ecf2..389e123424a 100644
--- a/sys/dev/isapnp/sb_isapnp.c
+++ b/sys/dev/isapnp/sb_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sb_isapnp.c,v 1.49 2006/10/12 01:31:24 christos Exp $ */
+/* $NetBSD: sb_isapnp.c,v 1.50 2006/11/16 01:33:05 christos Exp $ */
/*
* Copyright (c) 1991-1993 Regents of the University of California.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sb_isapnp.c,v 1.49 2006/10/12 01:31:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sb_isapnp.c,v 1.50 2006/11/16 01:33:05 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -77,7 +77,7 @@ CFATTACH_DECL(sb_isapnp, sizeof(struct sbdsp_softc),
* Probe for the soundblaster hardware.
*/
int
-sb_isapnp_match(struct device *parent __unused, struct cfdata *match __unused,
+sb_isapnp_match(struct device *parent, struct cfdata *match,
void *aux)
{
int pri, variant;
@@ -93,7 +93,7 @@ sb_isapnp_match(struct device *parent __unused, struct cfdata *match __unused,
* pseudo-device driver.
*/
void
-sb_isapnp_attach(struct device *parent __unused, struct device *self, void *aux)
+sb_isapnp_attach(struct device *parent, struct device *self, void *aux)
{
struct sbdsp_softc *sc;
struct isapnp_attach_args *ipa;
diff --git a/sys/dev/isapnp/wdc_isapnp.c b/sys/dev/isapnp/wdc_isapnp.c
index f534eac3884..eb2cd82baee 100644
--- a/sys/dev/isapnp/wdc_isapnp.c
+++ b/sys/dev/isapnp/wdc_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc_isapnp.c,v 1.35 2006/10/12 01:31:24 christos Exp $ */
+/* $NetBSD: wdc_isapnp.c,v 1.36 2006/11/16 01:33:05 christos Exp $ */
/*-
* Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_isapnp.c,v 1.35 2006/10/12 01:31:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_isapnp.c,v 1.36 2006/11/16 01:33:05 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -82,7 +82,7 @@ static void wdc_isapnp_dma_finish(void *);
#endif
static int
-wdc_isapnp_probe(struct device *parent __unused, struct cfdata *match __unused,
+wdc_isapnp_probe(struct device *parent, struct cfdata *match,
void *aux)
{
int pri, variant;
@@ -94,7 +94,7 @@ wdc_isapnp_probe(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-wdc_isapnp_attach(struct device *parent __unused, struct device *self,
+wdc_isapnp_attach(struct device *parent, struct device *self,
void *aux)
{
struct wdc_isapnp_softc *sc = device_private(self);
diff --git a/sys/dev/isapnp/wss_isapnp.c b/sys/dev/isapnp/wss_isapnp.c
index 8e1ab3d756a..60d2f96e454 100644
--- a/sys/dev/isapnp/wss_isapnp.c
+++ b/sys/dev/isapnp/wss_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wss_isapnp.c,v 1.19 2006/10/12 01:31:24 christos Exp $ */
+/* $NetBSD: wss_isapnp.c,v 1.20 2006/11/16 01:33:05 christos Exp $ */
/*
* Copyright (c) 1997, 1999 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wss_isapnp.c,v 1.19 2006/10/12 01:31:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wss_isapnp.c,v 1.20 2006/11/16 01:33:05 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -76,7 +76,7 @@ CFATTACH_DECL(wss_isapnp, sizeof(struct wss_softc),
* Probe for the WSS hardware.
*/
int
-wss_isapnp_match(struct device *parent __unused, struct cfdata *match __unused,
+wss_isapnp_match(struct device *parent, struct cfdata *match,
void *aux)
{
int pri, variant;
@@ -92,7 +92,7 @@ wss_isapnp_match(struct device *parent __unused, struct cfdata *match __unused,
* pseudo-device driver.
*/
void
-wss_isapnp_attach(struct device *parent __unused, struct device *self,
+wss_isapnp_attach(struct device *parent, struct device *self,
void *aux)
{
struct wss_softc *sc;
diff --git a/sys/dev/isapnp/ym_isapnp.c b/sys/dev/isapnp/ym_isapnp.c
index 0f175fbbac3..1c637f97d0d 100644
--- a/sys/dev/isapnp/ym_isapnp.c
+++ b/sys/dev/isapnp/ym_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ym_isapnp.c,v 1.20 2006/10/12 01:31:24 christos Exp $ */
+/* $NetBSD: ym_isapnp.c,v 1.21 2006/11/16 01:33:05 christos Exp $ */
/*
* Copyright (c) 1991-1993 Regents of the University of California.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ym_isapnp.c,v 1.20 2006/10/12 01:31:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ym_isapnp.c,v 1.21 2006/11/16 01:33:05 christos Exp $");
#include "mpu_ym.h"
@@ -85,7 +85,7 @@ CFATTACH_DECL(ym_isapnp, sizeof(struct ym_softc),
* Probe for the Yamaha hardware.
*/
int
-ym_isapnp_match(struct device *parent __unused, struct cfdata *match __unused,
+ym_isapnp_match(struct device *parent, struct cfdata *match,
void *aux)
{
int pri, variant;
@@ -101,7 +101,7 @@ ym_isapnp_match(struct device *parent __unused, struct cfdata *match __unused,
* pseudo-device driver.
*/
void
-ym_isapnp_attach(struct device *parent __unused, struct device *self, void *aux)
+ym_isapnp_attach(struct device *parent, struct device *self, void *aux)
{
struct ym_softc *sc;
struct ad1848_softc *ac;
diff --git a/sys/dev/kttcp.c b/sys/dev/kttcp.c
index 4760343cbf8..3065a2fee13 100644
--- a/sys/dev/kttcp.c
+++ b/sys/dev/kttcp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kttcp.c,v 1.20 2006/10/12 01:30:51 christos Exp $ */
+/* $NetBSD: kttcp.c,v 1.21 2006/11/16 01:32:45 christos Exp $ */
/*
* Copyright (c) 2002 Wasabi Systems, Inc.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kttcp.c,v 1.20 2006/10/12 01:30:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kttcp.c,v 1.21 2006/11/16 01:32:45 christos Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -103,13 +103,13 @@ const struct cdevsw kttcp_cdevsw = {
};
void
-kttcpattach(int count __unused)
+kttcpattach(int count)
{
/* Do nothing. */
}
int
-kttcpioctl(dev_t dev __unused, u_long cmd, caddr_t data, int flag,
+kttcpioctl(dev_t dev, u_long cmd, caddr_t data, int flag,
struct lwp *l)
{
int error;
@@ -383,7 +383,7 @@ nopages:
static int
kttcp_soreceive(struct socket *so, unsigned long long slen,
- unsigned long long *done, struct lwp *l __unused, int *flagsp)
+ unsigned long long *done, struct lwp *l, int *flagsp)
{
struct mbuf *m, **mp;
int flags, len, error, s, offset, moff, type;
diff --git a/sys/dev/ld.c b/sys/dev/ld.c
index 27e44300f0e..87a32c03803 100644
--- a/sys/dev/ld.c
+++ b/sys/dev/ld.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld.c,v 1.41 2006/10/12 01:30:51 christos Exp $ */
+/* $NetBSD: ld.c,v 1.42 2006/11/16 01:32:45 christos Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld.c,v 1.41 2006/10/12 01:30:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld.c,v 1.42 2006/11/16 01:32:45 christos Exp $");
#include "rnd.h"
@@ -256,7 +256,7 @@ ldenddetach(struct ld_softc *sc)
/* ARGSUSED */
static void
-ldshutdown(void *cookie __unused)
+ldshutdown(void *cookie)
{
struct ld_softc *sc;
int i;
@@ -272,7 +272,7 @@ ldshutdown(void *cookie __unused)
/* ARGSUSED */
static int
-ldopen(dev_t dev, int flags __unused, int fmt, struct lwp *l __unused)
+ldopen(dev_t dev, int flags, int fmt, struct lwp *l)
{
struct ld_softc *sc;
int error, unit, part;
@@ -322,7 +322,7 @@ ldopen(dev_t dev, int flags __unused, int fmt, struct lwp *l __unused)
/* ARGSUSED */
static int
-ldclose(dev_t dev, int flags __unused, int fmt, struct lwp *l __unused)
+ldclose(dev_t dev, int flags, int fmt, struct lwp *l)
{
struct ld_softc *sc;
int error, part, unit;
@@ -359,7 +359,7 @@ ldclose(dev_t dev, int flags __unused, int fmt, struct lwp *l __unused)
/* ARGSUSED */
static int
-ldread(dev_t dev, struct uio *uio, int ioflag __unused)
+ldread(dev_t dev, struct uio *uio, int ioflag)
{
return (physio(ldstrategy, NULL, dev, B_READ, ldminphys, uio));
@@ -367,7 +367,7 @@ ldread(dev_t dev, struct uio *uio, int ioflag __unused)
/* ARGSUSED */
static int
-ldwrite(dev_t dev, struct uio *uio, int ioflag __unused)
+ldwrite(dev_t dev, struct uio *uio, int ioflag)
{
return (physio(ldstrategy, NULL, dev, B_WRITE, ldminphys, uio));
diff --git a/sys/dev/lockstat.c b/sys/dev/lockstat.c
index c8024ea8cb4..ad9b67a0461 100644
--- a/sys/dev/lockstat.c
+++ b/sys/dev/lockstat.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lockstat.c,v 1.3 2006/10/12 06:56:47 xtraeme Exp $ */
+/* $NetBSD: lockstat.c,v 1.4 2006/11/16 01:32:45 christos Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lockstat.c,v 1.3 2006/10/12 06:56:47 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lockstat.c,v 1.4 2006/11/16 01:32:45 christos Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -431,8 +431,8 @@ lockstat_event(uintptr_t lock, uintptr_t callsite, u_int flags, u_int count,
* Accept an open() on /dev/lockstat.
*/
int
-lockstat_open(dev_t dev __unused, int flag __unused, int mode __unused,
- struct lwp *l __unused)
+lockstat_open(dev_t dev, int flag, int mode,
+ struct lwp *l)
{
int error;
@@ -455,8 +455,8 @@ lockstat_open(dev_t dev __unused, int flag __unused, int mode __unused,
* Accept the last close() on /dev/lockstat.
*/
int
-lockstat_close(dev_t dev __unused, int flag __unused, int mode __unused,
- struct lwp *l __unused)
+lockstat_close(dev_t dev, int flag, int mode,
+ struct lwp *l)
{
int error;
@@ -475,8 +475,8 @@ lockstat_close(dev_t dev __unused, int flag __unused, int mode __unused,
* Handle control operations.
*/
int
-lockstat_ioctl(dev_t dev __unused, u_long cmd, caddr_t data,
- int flag __unused, struct lwp *l __unused)
+lockstat_ioctl(dev_t dev, u_long cmd, caddr_t data,
+ int flag, struct lwp *l)
{
lsenable_t *le;
int error;
@@ -550,7 +550,7 @@ lockstat_ioctl(dev_t dev __unused, u_long cmd, caddr_t data,
* Copy buffers out to user-space.
*/
int
-lockstat_read(dev_t dev __unused, struct uio *uio, int flag __unused)
+lockstat_read(dev_t dev, struct uio *uio, int flag)
{
int error;
diff --git a/sys/dev/mca/aha_mca.c b/sys/dev/mca/aha_mca.c
index 46732db0fe4..72a68120e23 100644
--- a/sys/dev/mca/aha_mca.c
+++ b/sys/dev/mca/aha_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aha_mca.c,v 1.15 2006/10/12 01:31:24 christos Exp $ */
+/* $NetBSD: aha_mca.c,v 1.16 2006/11/16 01:33:05 christos Exp $ */
/*
* Copyright (c) 2000-2002 The NetBSD Foundation, Inc.
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aha_mca.c,v 1.15 2006/10/12 01:31:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aha_mca.c,v 1.16 2006/11/16 01:33:05 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -84,7 +84,7 @@ CFATTACH_DECL(aha_mca, sizeof(struct aha_softc),
aha_mca_probe, aha_mca_attach, NULL, NULL);
int
-aha_mca_probe(struct device *parent __unused, struct cfdata *match __unused,
+aha_mca_probe(struct device *parent, struct cfdata *match,
void *aux)
{
register struct mca_attach_args *ma = aux;
@@ -97,7 +97,7 @@ aha_mca_probe(struct device *parent __unused, struct cfdata *match __unused,
void
-aha_mca_attach(struct device *parent __unused, struct device *self, void *aux)
+aha_mca_attach(struct device *parent, struct device *self, void *aux)
{
struct mca_attach_args *ma = aux;
struct aha_softc *sc = device_private(self);
diff --git a/sys/dev/mca/com_mca.c b/sys/dev/mca/com_mca.c
index c30bed7e2dd..f5155906f19 100644
--- a/sys/dev/mca/com_mca.c
+++ b/sys/dev/mca/com_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com_mca.c,v 1.16 2006/10/12 01:31:24 christos Exp $ */
+/* $NetBSD: com_mca.c,v 1.17 2006/11/16 01:33:05 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_mca.c,v 1.16 2006/10/12 01:31:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_mca.c,v 1.17 2006/11/16 01:33:05 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -143,7 +143,7 @@ com_mca_lookup(ma_id)
}
int
-com_mca_probe(struct device *parent __unused, struct cfdata *match __unused,
+com_mca_probe(struct device *parent, struct cfdata *match,
void *aux)
{
struct mca_attach_args *ma = aux;
@@ -155,7 +155,7 @@ com_mca_probe(struct device *parent __unused, struct cfdata *match __unused,
}
void
-com_mca_attach(struct device *parent __unused, struct device *self,
+com_mca_attach(struct device *parent, struct device *self,
void *aux)
{
struct com_mca_softc *isc = device_private(self);
diff --git a/sys/dev/mca/ed_mca.c b/sys/dev/mca/ed_mca.c
index a5f81a903d3..f1f44d52dfa 100644
--- a/sys/dev/mca/ed_mca.c
+++ b/sys/dev/mca/ed_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ed_mca.c,v 1.33 2006/10/12 01:31:24 christos Exp $ */
+/* $NetBSD: ed_mca.c,v 1.34 2006/11/16 01:33:05 christos Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ed_mca.c,v 1.33 2006/10/12 01:31:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ed_mca.c,v 1.34 2006/11/16 01:33:05 christos Exp $");
#include "rnd.h"
@@ -119,7 +119,7 @@ static struct dkdriver eddkdriver = { edmcastrategy, minphys };
* Just check if it's possible to identify the disk.
*/
static int
-ed_mca_probe(struct device *parent, struct cfdata *cf __unused,
+ed_mca_probe(struct device *parent, struct cfdata *cf,
void *aux)
{
u_int16_t cmd_args[2];
@@ -271,21 +271,21 @@ done:
}
int
-edmcaread(dev_t dev, struct uio *uio, int flags __unused)
+edmcaread(dev_t dev, struct uio *uio, int flags)
{
ATADEBUG_PRINT(("edread\n"), DEBUG_XFERS);
return (physio(edmcastrategy, NULL, dev, B_READ, minphys, uio));
}
int
-edmcawrite(dev_t dev, struct uio *uio, int flags __unused)
+edmcawrite(dev_t dev, struct uio *uio, int flags)
{
ATADEBUG_PRINT(("edwrite\n"), DEBUG_XFERS);
return (physio(edmcastrategy, NULL, dev, B_WRITE, minphys, uio));
}
int
-edmcaopen(dev_t dev, int flag __unused, int fmt, struct lwp *l __unused)
+edmcaopen(dev_t dev, int flag, int fmt, struct lwp *l)
{
struct ed_softc *wd;
int part, error;
@@ -363,7 +363,7 @@ edmcaopen(dev_t dev, int flag __unused, int fmt, struct lwp *l __unused)
}
int
-edmcaclose(dev_t dev, int flag __unused, int fmt, struct lwp *l __unused)
+edmcaclose(dev_t dev, int flag, int fmt, struct lwp *l)
{
struct ed_softc *wd = device_lookup(&ed_cd, DISKUNIT(dev));
int part = DISKPART(dev);
diff --git a/sys/dev/mca/edc_mca.c b/sys/dev/mca/edc_mca.c
index 8723659a980..73a88e73b61 100644
--- a/sys/dev/mca/edc_mca.c
+++ b/sys/dev/mca/edc_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: edc_mca.c,v 1.34 2006/10/12 01:31:25 christos Exp $ */
+/* $NetBSD: edc_mca.c,v 1.35 2006/11/16 01:33:05 christos Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: edc_mca.c,v 1.34 2006/10/12 01:31:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: edc_mca.c,v 1.35 2006/11/16 01:33:05 christos Exp $");
#include "rnd.h"
@@ -135,7 +135,7 @@ static void edcworker(void *);
static void edc_spawn_worker(void *);
int
-edc_mca_probe(struct device *parent __unused, struct cfdata *match __unused,
+edc_mca_probe(struct device *parent, struct cfdata *match,
void *aux)
{
struct mca_attach_args *ma = aux;
@@ -150,7 +150,7 @@ edc_mca_probe(struct device *parent __unused, struct cfdata *match __unused,
}
void
-edc_mca_attach(struct device *parent __unused, struct device *self, void *aux)
+edc_mca_attach(struct device *parent, struct device *self, void *aux)
{
struct edc_mca_softc *sc = device_private(self);
struct mca_attach_args *ma = aux;
diff --git a/sys/dev/mca/esp_mca.c b/sys/dev/mca/esp_mca.c
index 1f0dcc9bc65..7e2229fd15e 100644
--- a/sys/dev/mca/esp_mca.c
+++ b/sys/dev/mca/esp_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: esp_mca.c,v 1.13 2006/10/13 16:53:36 dogcow Exp $ */
+/* $NetBSD: esp_mca.c,v 1.14 2006/11/16 01:33:05 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esp_mca.c,v 1.13 2006/10/13 16:53:36 dogcow Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esp_mca.c,v 1.14 2006/11/16 01:33:05 christos Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -127,10 +127,11 @@ static struct ncr53c9x_glue esp_glue = {
};
static int
-esp_mca_match(parent, cf, aux)
- struct device *parent __unused;
- struct cfdata *cf __unused;
- void *aux;
+esp_mca_match(
+ struct device *parent,
+ struct cfdata *cf,
+ void *aux
+)
{
struct mca_attach_args *ma = aux;
@@ -143,10 +144,11 @@ esp_mca_match(parent, cf, aux)
}
static void
-esp_mca_attach(parent, self, aux)
- struct device *parent __unused;
- struct device *self;
- void *aux;
+esp_mca_attach(
+ struct device *parent,
+ struct device *self,
+ void *aux
+)
{
struct mca_attach_args *ma = aux;
struct esp_softc *esc = device_private(self);
@@ -370,12 +372,13 @@ esp_dma_intr(sc)
* Setup DMA transfer.
*/
static int
-esp_dma_setup(sc, addr, len, datain, dmasize)
- struct ncr53c9x_softc *sc;
- caddr_t *addr;
- size_t *len;
- int datain;
- size_t *dmasize __unused;
+esp_dma_setup(
+ struct ncr53c9x_softc *sc,
+ caddr_t *addr,
+ size_t *len,
+ int datain,
+ size_t *dmasize
+)
{
struct esp_softc *esc = (struct esp_softc *) sc;
int error;
diff --git a/sys/dev/mca/if_ate_mca.c b/sys/dev/mca/if_ate_mca.c
index fdaca13c151..e75c7c8bcab 100644
--- a/sys/dev/mca/if_ate_mca.c
+++ b/sys/dev/mca/if_ate_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ate_mca.c,v 1.16 2006/10/12 01:31:25 christos Exp $ */
+/* $NetBSD: if_ate_mca.c,v 1.17 2006/11/16 01:33:05 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ate_mca.c,v 1.16 2006/10/12 01:31:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ate_mca.c,v 1.17 2006/11/16 01:33:05 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -107,7 +107,7 @@ ate_mca_lookup(id)
}
int
-ate_mca_match(struct device *parent __unused, struct cfdata *match __unused,
+ate_mca_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct mca_attach_args *ma = (struct mca_attach_args *) aux;
@@ -127,7 +127,7 @@ static const int ats_irq[] = {
};
void
-ate_mca_attach(struct device *parent __unused, struct device *self,
+ate_mca_attach(struct device *parent, struct device *self,
void *aux)
{
struct ate_softc *isc = device_private(self);
diff --git a/sys/dev/mca/if_elmc_mca.c b/sys/dev/mca/if_elmc_mca.c
index 2c3ecd08b49..bfeddb0d59d 100644
--- a/sys/dev/mca/if_elmc_mca.c
+++ b/sys/dev/mca/if_elmc_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_elmc_mca.c,v 1.21 2006/10/12 01:31:25 christos Exp $ */
+/* $NetBSD: if_elmc_mca.c,v 1.22 2006/11/16 01:33:05 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_elmc_mca.c,v 1.21 2006/10/12 01:31:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_elmc_mca.c,v 1.22 2006/11/16 01:33:05 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -92,7 +92,7 @@ static void elmc_mca_hwreset(struct ie_softc *, int);
static int elmc_mca_intrhook(struct ie_softc *, int);
int
-elmc_mca_match(struct device *parent __unused, struct cfdata *cf __unused,
+elmc_mca_match(struct device *parent, struct cfdata *cf,
void *aux)
{
struct mca_attach_args *ma = aux;
@@ -106,7 +106,7 @@ elmc_mca_match(struct device *parent __unused, struct cfdata *cf __unused,
}
void
-elmc_mca_attach(struct device *parent __unused, struct device *self, void *aux)
+elmc_mca_attach(struct device *parent, struct device *self, void *aux)
{
struct elmc_mca_softc *asc = device_private(self);
struct ie_softc *sc = &asc->sc_ie;
diff --git a/sys/dev/mca/if_ep_mca.c b/sys/dev/mca/if_ep_mca.c
index 745f859d5b0..2ebe65bf4e1 100644
--- a/sys/dev/mca/if_ep_mca.c
+++ b/sys/dev/mca/if_ep_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ep_mca.c,v 1.16 2006/10/12 01:31:25 christos Exp $ */
+/* $NetBSD: if_ep_mca.c,v 1.17 2006/11/16 01:33:05 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ep_mca.c,v 1.16 2006/10/12 01:31:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ep_mca.c,v 1.17 2006/11/16 01:33:05 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -142,7 +142,7 @@ ep_mca_lookup(ma)
}
int
-ep_mca_match(struct device *parent __unused, struct cfdata *match __unused,
+ep_mca_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct mca_attach_args *ma = (struct mca_attach_args *) aux;
@@ -154,7 +154,7 @@ ep_mca_match(struct device *parent __unused, struct cfdata *match __unused,
}
void
-ep_mca_attach(struct device *parent __unused, struct device *self, void *aux)
+ep_mca_attach(struct device *parent, struct device *self, void *aux)
{
struct ep_softc *sc = device_private(self);
struct mca_attach_args *ma = aux;
diff --git a/sys/dev/mca/if_le_mca.c b/sys/dev/mca/if_le_mca.c
index cd87740f9a5..62029501e4c 100644
--- a/sys/dev/mca/if_le_mca.c
+++ b/sys/dev/mca/if_le_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le_mca.c,v 1.14 2006/10/12 01:31:25 christos Exp $ */
+/* $NetBSD: if_le_mca.c,v 1.15 2006/11/16 01:33:05 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le_mca.c,v 1.14 2006/10/12 01:31:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_mca.c,v 1.15 2006/11/16 01:33:05 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -121,7 +121,7 @@ static const u_int8_t sknet_mcp_media[] = {
};
int
-le_mca_match(struct device *parent __unused, struct cfdata *cf __unused,
+le_mca_match(struct device *parent, struct cfdata *cf,
void *aux)
{
struct mca_attach_args *ma = aux;
@@ -136,7 +136,7 @@ le_mca_match(struct device *parent __unused, struct cfdata *cf __unused,
}
void
-le_mca_attach(struct device *parent __unused, struct device *self, void *aux)
+le_mca_attach(struct device *parent, struct device *self, void *aux)
{
struct le_mca_softc *lesc = device_private(self);
struct lance_softc *sc = &lesc->sc_am7990.lsc;
diff --git a/sys/dev/mca/if_ne_mca.c b/sys/dev/mca/if_ne_mca.c
index 67b6a16e15c..c89d6ea3bd9 100644
--- a/sys/dev/mca/if_ne_mca.c
+++ b/sys/dev/mca/if_ne_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ne_mca.c,v 1.11 2006/10/12 01:31:25 christos Exp $ */
+/* $NetBSD: if_ne_mca.c,v 1.12 2006/11/16 01:33:05 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ne_mca.c,v 1.11 2006/10/12 01:31:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ne_mca.c,v 1.12 2006/11/16 01:33:05 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -114,7 +114,7 @@ ne_mca_lookup(int id)
}
int
-ne_mca_match(struct device *parent __unused, struct cfdata *cf __unused,
+ne_mca_match(struct device *parent, struct cfdata *cf,
void *aux)
{
struct mca_attach_args *ma = aux;
@@ -134,7 +134,7 @@ static const int ne_mca_iobase[] = {
};
void
-ne_mca_attach(struct device *parent __unused, struct device *self, void *aux)
+ne_mca_attach(struct device *parent, struct device *self, void *aux)
{
struct ne_mca_softc *psc = device_private(self);
struct ne2000_softc *nsc = &psc->sc_ne2000;
diff --git a/sys/dev/mca/if_tr_mca.c b/sys/dev/mca/if_tr_mca.c
index acd7b72419c..5e88d0a7e71 100644
--- a/sys/dev/mca/if_tr_mca.c
+++ b/sys/dev/mca/if_tr_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tr_mca.c,v 1.15 2006/10/12 01:31:25 christos Exp $ */
+/* $NetBSD: if_tr_mca.c,v 1.16 2006/11/16 01:33:05 christos Exp $ */
/*_
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tr_mca.c,v 1.15 2006/10/12 01:31:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tr_mca.c,v 1.16 2006/11/16 01:33:05 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -98,7 +98,7 @@ tr_mca_lookup(id)
}
int
-tr_mca_probe(struct device *parent __unused, struct cfdata *match __unused,
+tr_mca_probe(struct device *parent, struct cfdata *match,
void *aux)
{
struct mca_attach_args *ma = aux;
@@ -111,7 +111,7 @@ tr_mca_probe(struct device *parent __unused, struct cfdata *match __unused,
void
-tr_mca_attach(struct device *parent __unused, struct device *self, void *aux)
+tr_mca_attach(struct device *parent, struct device *self, void *aux)
{
struct tr_softc *sc = device_private(self);
struct mca_attach_args *ma = aux;
diff --git a/sys/dev/mca/if_tra_mca.c b/sys/dev/mca/if_tra_mca.c
index 7553c48e361..0efc82d2449 100644
--- a/sys/dev/mca/if_tra_mca.c
+++ b/sys/dev/mca/if_tra_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tra_mca.c,v 1.6 2006/10/12 01:31:25 christos Exp $ */
+/* $NetBSD: if_tra_mca.c,v 1.7 2006/11/16 01:33:05 christos Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tra_mca.c,v 1.6 2006/10/12 01:31:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tra_mca.c,v 1.7 2006/11/16 01:33:05 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -105,7 +105,7 @@ tiara_mca_lookup(id)
}
int
-tiara_mca_match(struct device *parent __unused, struct cfdata *match __unused,
+tiara_mca_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct mca_attach_args *ma = (struct mca_attach_args *) aux;
@@ -128,7 +128,7 @@ static const int smc_irq[] = {
};
void
-tiara_mca_attach(struct device *parent __unused, struct device *self, void *aux)
+tiara_mca_attach(struct device *parent, struct device *self, void *aux)
{
struct tiara_softc *isc = device_private(self);
struct mb86950_softc *sc = &isc->sc_mb86950;
diff --git a/sys/dev/mca/if_we_mca.c b/sys/dev/mca/if_we_mca.c
index 7aa2a95ea0b..287eaeec589 100644
--- a/sys/dev/mca/if_we_mca.c
+++ b/sys/dev/mca/if_we_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_we_mca.c,v 1.17 2006/10/12 01:31:25 christos Exp $ */
+/* $NetBSD: if_we_mca.c,v 1.18 2006/11/16 01:33:05 christos Exp $ */
/*-
* Copyright (c) 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_we_mca.c,v 1.17 2006/10/12 01:31:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_we_mca.c,v 1.18 2006/11/16 01:33:05 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -146,7 +146,7 @@ we_mca_lookup(id)
}
int
-we_mca_probe(struct device *parent __unused, struct cfdata *cf __unused,
+we_mca_probe(struct device *parent, struct cfdata *cf,
void *aux)
{
struct mca_attach_args *ma = aux;
@@ -155,7 +155,7 @@ we_mca_probe(struct device *parent __unused, struct cfdata *cf __unused,
}
void
-we_mca_attach(struct device *parent __unused, struct device *self, void *aux)
+we_mca_attach(struct device *parent, struct device *self, void *aux)
{
struct we_softc *wsc = device_private(self);
struct dp8390_softc *sc = &wsc->sc_dp8390;
diff --git a/sys/dev/mca/mca.c b/sys/dev/mca/mca.c
index 32d758a1511..d31bb99afd6 100644
--- a/sys/dev/mca/mca.c
+++ b/sys/dev/mca/mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mca.c,v 1.21 2006/10/12 01:31:25 christos Exp $ */
+/* $NetBSD: mca.c,v 1.22 2006/11/16 01:33:05 christos Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mca.c,v 1.21 2006/10/12 01:31:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mca.c,v 1.22 2006/11/16 01:33:05 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -65,7 +65,7 @@ CFATTACH_DECL(mca, sizeof(struct device),
int mca_print(void *, const char *);
int
-mca_match(struct device *parent __unused, struct cfdata *cf __unused, void *aux)
+mca_match(struct device *parent, struct cfdata *cf, void *aux)
{
struct mcabus_attach_args *mba = aux;
diff --git a/sys/dev/mca/mcabusprint.c b/sys/dev/mca/mcabusprint.c
index 8c236510b88..5b79972ab5e 100644
--- a/sys/dev/mca/mcabusprint.c
+++ b/sys/dev/mca/mcabusprint.c
@@ -1,6 +1,6 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mcabusprint.c,v 1.4 2006/10/12 01:31:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcabusprint.c,v 1.5 2006/11/16 01:33:05 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -8,7 +8,7 @@ __KERNEL_RCSID(0, "$NetBSD: mcabusprint.c,v 1.4 2006/10/12 01:31:25 christos Exp
#include <dev/mca/mcavar.h>
int
-mcabusprint(void *vma __unused, const char *pnp)
+mcabusprint(void *vma, const char *pnp)
{
#if 0
struct mcabus_attach_args *ma = vma;
diff --git a/sys/dev/md.c b/sys/dev/md.c
index 619e5f9b6bb..c51f455d0d4 100644
--- a/sys/dev/md.c
+++ b/sys/dev/md.c
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.46 2006/10/12 01:30:51 christos Exp $ */
+/* $NetBSD: md.c,v 1.47 2006/11/16 01:32:45 christos Exp $ */
/*
* Copyright (c) 1995 Gordon W. Ross, Leo Weppelman.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: md.c,v 1.46 2006/10/12 01:30:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: md.c,v 1.47 2006/11/16 01:32:45 christos Exp $");
#include "opt_md.h"
@@ -159,8 +159,8 @@ mdattach(int n)
}
static void
-md_attach(struct device *parent __unused, struct device *self,
- void *aux __unused)
+md_attach(struct device *parent, struct device *self,
+ void *aux)
{
struct md_softc *sc = (struct md_softc *)self;
@@ -218,7 +218,7 @@ mdsize(dev_t dev)
}
static int
-mdopen(dev_t dev, int flag __unused, int fmt __unused, struct lwp *l __unused)
+mdopen(dev_t dev, int flag, int fmt, struct lwp *l)
{
int unit;
struct md_softc *sc;
@@ -252,7 +252,7 @@ mdopen(dev_t dev, int flag __unused, int fmt __unused, struct lwp *l __unused)
}
static int
-mdclose(dev_t dev, int flag __unused, int fmt __unused, struct lwp *l __unused)
+mdclose(dev_t dev, int flag, int fmt, struct lwp *l)
{
int unit;
@@ -265,7 +265,7 @@ mdclose(dev_t dev, int flag __unused, int fmt __unused, struct lwp *l __unused)
}
static int
-mdread(dev_t dev, struct uio *uio, int flags __unused)
+mdread(dev_t dev, struct uio *uio, int flags)
{
int unit;
struct md_softc *sc;
@@ -284,7 +284,7 @@ mdread(dev_t dev, struct uio *uio, int flags __unused)
}
static int
-mdwrite(dev_t dev, struct uio *uio, int flags __unused)
+mdwrite(dev_t dev, struct uio *uio, int flags)
{
int unit;
struct md_softc *sc;
@@ -367,7 +367,7 @@ mdstrategy(struct buf *bp)
}
static int
-mdioctl(dev_t dev, u_long cmd, caddr_t data, int flag __unused, struct lwp *l)
+mdioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
int unit;
struct md_softc *sc;
@@ -411,7 +411,7 @@ mdioctl(dev_t dev, u_long cmd, caddr_t data, int flag __unused, struct lwp *l)
*/
static int
md_ioctl_kalloc(struct md_softc *sc, struct md_conf *umd,
- struct lwp *l __unused)
+ struct lwp *l)
{
vaddr_t addr;
vsize_t size;
@@ -437,7 +437,7 @@ md_ioctl_kalloc(struct md_softc *sc, struct md_conf *umd,
*/
static int
md_ioctl_server(struct md_softc *sc, struct md_conf *umd,
- struct lwp *l __unused)
+ struct lwp *l)
{
vaddr_t end;
int error;
diff --git a/sys/dev/md_root.c b/sys/dev/md_root.c
index f4672238334..289dd3da917 100644
--- a/sys/dev/md_root.c
+++ b/sys/dev/md_root.c
@@ -1,4 +1,4 @@
-/* $NetBSD: md_root.c,v 1.11 2006/10/13 10:42:19 hannken Exp $ */
+/* $NetBSD: md_root.c,v 1.12 2006/11/16 01:32:45 christos Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: md_root.c,v 1.11 2006/10/13 10:42:19 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: md_root.c,v 1.12 2006/11/16 01:32:45 christos Exp $");
#include "opt_md.h"
@@ -117,7 +117,7 @@ md_attach_hook(int unit, struct md_conf *md)
* This is called during open (i.e. mountroot)
*/
void
-md_open_hook(int unit, struct md_conf *md __unused)
+md_open_hook(int unit, struct md_conf *md)
{
if (unit == 0) {
diff --git a/sys/dev/microcode/aic7xxx/aic79xx_seq.h b/sys/dev/microcode/aic7xxx/aic79xx_seq.h
index 504e515121c..56fe0c9bcb3 100644
--- a/sys/dev/microcode/aic7xxx/aic79xx_seq.h
+++ b/sys/dev/microcode/aic7xxx/aic79xx_seq.h
@@ -973,7 +973,7 @@ ahd_patch1_func(struct ahd_softc *ahd)
static ahd_patch_func_t ahd_patch0_func;
static int
-ahd_patch0_func(struct ahd_softc *ahd __unused)
+ahd_patch0_func(struct ahd_softc *ahd)
{
return (0);
}
diff --git a/sys/dev/microcode/aic7xxx/aic7xxx_seq.h b/sys/dev/microcode/aic7xxx/aic7xxx_seq.h
index dd62a84b54f..493dbe1e67a 100644
--- a/sys/dev/microcode/aic7xxx/aic7xxx_seq.h
+++ b/sys/dev/microcode/aic7xxx/aic7xxx_seq.h
@@ -2,8 +2,8 @@
* DO NOT EDIT - This file is automatically generated
* from the following source files:
*
- * $NetBSD: aic7xxx_seq.h,v 1.10 2006/10/12 01:31:25 christos Exp $
- * $NetBSD: aic7xxx_seq.h,v 1.10 2006/10/12 01:31:25 christos Exp $
+ * $NetBSD: aic7xxx_seq.h,v 1.11 2006/11/16 01:33:06 christos Exp $
+ * $NetBSD: aic7xxx_seq.h,v 1.11 2006/11/16 01:33:06 christos Exp $
*/
static uint8_t seqprog[] = {
0xb2, 0x00, 0x00, 0x08,
@@ -1085,7 +1085,7 @@ ahc_patch1_func(struct ahc_softc *ahc)
static ahc_patch_func_t ahc_patch0_func;
static int
-ahc_patch0_func(struct ahc_softc *ahc __unused)
+ahc_patch0_func(struct ahc_softc *ahc)
{
return (0);
}
diff --git a/sys/dev/midi.c b/sys/dev/midi.c
index af097a9edab..04aaa0f9a9f 100644
--- a/sys/dev/midi.c
+++ b/sys/dev/midi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: midi.c,v 1.49 2006/10/12 04:32:34 thorpej Exp $ */
+/* $NetBSD: midi.c,v 1.50 2006/11/16 01:32:45 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: midi.c,v 1.49 2006/10/12 04:32:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: midi.c,v 1.50 2006/11/16 01:32:45 christos Exp $");
#include "midi.h"
#include "sequencer.h"
@@ -130,7 +130,7 @@ CFATTACH_DECL(midi, sizeof(struct midi_softc),
extern struct cfdriver midi_cd;
int
-midiprobe(struct device *parent __unused, struct cfdata *match __unused,
+midiprobe(struct device *parent, struct cfdata *match,
void *aux)
{
struct audio_attach_args *sa = aux;
@@ -183,7 +183,7 @@ midiactivate(struct device *self, enum devact act)
}
int
-mididetach(struct device *self, int flags __unused)
+mididetach(struct device *self, int flags)
{
struct midi_softc *sc = (struct midi_softc *)self;
int maj, mn;
@@ -762,7 +762,7 @@ midi_out(void *addr)
}
int
-midiopen(dev_t dev, int flags, int ifmt __unused, struct lwp *l __unused)
+midiopen(dev_t dev, int flags, int ifmt, struct lwp *l)
{
struct midi_softc *sc;
const struct midi_hw_if *hw;
@@ -827,8 +827,8 @@ midiopen(dev_t dev, int flags, int ifmt __unused, struct lwp *l __unused)
}
int
-midiclose(dev_t dev, int flags __unused, int ifmt __unused,
- struct lwp *l __unused)
+midiclose(dev_t dev, int flags, int ifmt,
+ struct lwp *l)
{
int unit = MIDIUNIT(dev);
struct midi_softc *sc = midi_cd.cd_devs[unit];
@@ -1652,7 +1652,7 @@ filt_midirdetach(struct knote *kn)
}
static int
-filt_midiread(struct knote *kn, long hint __unused)
+filt_midiread(struct knote *kn, long hint)
{
struct midi_softc *sc = kn->kn_hook;
int s;
@@ -1682,7 +1682,7 @@ filt_midiwdetach(struct knote *kn)
}
static int
-filt_midiwrite(struct knote *kn, long hint __unused)
+filt_midiwrite(struct knote *kn, long hint)
{
struct midi_softc *sc = kn->kn_hook;
int s;
@@ -1752,7 +1752,7 @@ midi_getinfo(dev_t dev, struct midi_info *mi)
#elif NMIDIBUS > 0 /* but NMIDI == 0 */
-void midi_register_hw_if_ext(struct midi_hw_if_ext *exthw __unused) { /* stub */
+void midi_register_hw_if_ext(struct midi_hw_if_ext *exthw) { /* stub */
}
#endif /* NMIDI > 0 */
diff --git a/sys/dev/midictl.c b/sys/dev/midictl.c
index 764707be65e..59197629e1d 100644
--- a/sys/dev/midictl.c
+++ b/sys/dev/midictl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: midictl.c,v 1.3 2006/10/12 01:30:51 christos Exp $ */
+/* $NetBSD: midictl.c,v 1.4 2006/11/16 01:32:45 christos Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: midictl.c,v 1.3 2006/10/12 01:30:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: midictl.c,v 1.4 2006/11/16 01:32:45 christos Exp $");
/*
* See midictl.h for an overview of the purpose and use of this module.
@@ -475,8 +475,8 @@ classify(uint_fast16_t *key, _Bool *islsb) {
}
static void
-notify_no_one(void *cookie __unused, midictl_evt evt __unused,
- uint_fast8_t chan __unused, uint_fast16_t k __unused)
+notify_no_one(void *cookie, midictl_evt evt,
+ uint_fast8_t chan, uint_fast16_t k)
{
}
@@ -591,7 +591,7 @@ store_locate(midictl_store *s, class c, uint_fast8_t chan, uint_fast16_t key)
static uint16_t
store_extract(midictl_store *s, class c, uint_fast8_t chan,
- uint_fast16_t key __unused)
+ uint_fast16_t key)
{
chan %= packing[c];
switch ( c ) {
@@ -609,7 +609,7 @@ store_extract(midictl_store *s, class c, uint_fast8_t chan,
static void
store_update(midictl_store *s, class c, uint_fast8_t chan,
- uint_fast16_t key __unused, uint16_t value)
+ uint_fast16_t key, uint16_t value)
{
uint64_t orig;
diff --git a/sys/dev/midisyn.c b/sys/dev/midisyn.c
index 2b02bf4454c..38287ff9deb 100644
--- a/sys/dev/midisyn.c
+++ b/sys/dev/midisyn.c
@@ -1,4 +1,4 @@
-/* $NetBSD: midisyn.c,v 1.19 2006/10/12 01:30:51 christos Exp $ */
+/* $NetBSD: midisyn.c,v 1.20 2006/11/16 01:32:45 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: midisyn.c,v 1.19 2006/10/12 01:30:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: midisyn.c,v 1.20 2006/11/16 01:32:45 christos Exp $");
#include <sys/param.h>
#include <sys/ioctl.h>
@@ -131,8 +131,8 @@ struct channelstate { /* dyamically allocated in open() on account of size */
};
int
-midisyn_open(void *addr, int flags, void (*iintr)(void *, int) __unused,
- void (*ointr)(void *) __unused, void *arg __unused)
+midisyn_open(void *addr, int flags, void (*iintr)(void *, int),
+ void (*ointr)(void *), void *arg)
{
midisyn *ms = addr;
int rslt;
@@ -306,13 +306,13 @@ midisyn_attackv_vel(midisyn *ms, uint_fast16_t voice, midipitch_t mp,
}
int
-midisyn_sysrt(void *addr __unused, int b __unused)
+midisyn_sysrt(void *addr, int b)
{
return 0;
}
int midisyn_channelmsg(void *addr, int status, int chan, u_char *buf,
- int len __unused)
+ int len)
{
midisyn *ms = addr;
int voice = 0; /* initialize to keep gcc quiet */
@@ -400,13 +400,13 @@ int midisyn_channelmsg(void *addr, int status, int chan, u_char *buf,
return 0;
}
-int midisyn_commonmsg(void *addr __unused, int status __unused,
- u_char *buf __unused, int len __unused)
+int midisyn_commonmsg(void *addr, int status,
+ u_char *buf, int len)
{
return 0;
}
-int midisyn_sysex(void *addr __unused, u_char *buf __unused, int len __unused)
+int midisyn_sysex(void *addr, u_char *buf, int len)
{
/*
* unimplemented by existing drivers. it is surely more sensible
diff --git a/sys/dev/mii/acphy.c b/sys/dev/mii/acphy.c
index 92b2715df86..4aeccc32ed8 100644
--- a/sys/dev/mii/acphy.c
+++ b/sys/dev/mii/acphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: acphy.c,v 1.17 2006/10/12 01:31:25 christos Exp $ */
+/* $NetBSD: acphy.c,v 1.18 2006/11/16 01:33:06 christos Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acphy.c,v 1.17 2006/10/12 01:31:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acphy.c,v 1.18 2006/11/16 01:33:06 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -90,7 +90,7 @@ static const struct mii_phydesc acphys[] = {
};
static int
-acphymatch(struct device *parent __unused, struct cfdata *match __unused,
+acphymatch(struct device *parent, struct cfdata *match,
void *aux)
{
struct mii_attach_args *ma = aux;
@@ -102,7 +102,7 @@ acphymatch(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-acphyattach(struct device *parent __unused, struct device *self, void *aux)
+acphyattach(struct device *parent, struct device *self, void *aux)
{
struct mii_softc *sc = device_private(self);
struct mii_attach_args *ma = aux;
diff --git a/sys/dev/mii/amhphy.c b/sys/dev/mii/amhphy.c
index 6c417cea92a..79efaa37294 100644
--- a/sys/dev/mii/amhphy.c
+++ b/sys/dev/mii/amhphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: amhphy.c,v 1.13 2006/10/12 01:31:25 christos Exp $ */
+/* $NetBSD: amhphy.c,v 1.14 2006/11/16 01:33:06 christos Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amhphy.c,v 1.13 2006/10/12 01:31:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amhphy.c,v 1.14 2006/11/16 01:33:06 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -80,7 +80,7 @@ static const struct mii_phydesc amhphys[] = {
};
static int
-amhphymatch(struct device *parent __unused, struct cfdata *match __unused,
+amhphymatch(struct device *parent, struct cfdata *match,
void *aux)
{
struct mii_attach_args *ma = aux;
@@ -92,7 +92,7 @@ amhphymatch(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-amhphyattach(struct device *parent __unused, struct device *self, void *aux)
+amhphyattach(struct device *parent, struct device *self, void *aux)
{
struct mii_softc *sc = device_private(self);
struct mii_attach_args *ma = aux;
diff --git a/sys/dev/mii/bmtphy.c b/sys/dev/mii/bmtphy.c
index 76df7b8e02a..7e48da60891 100644
--- a/sys/dev/mii/bmtphy.c
+++ b/sys/dev/mii/bmtphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bmtphy.c,v 1.20 2006/10/12 01:31:25 christos Exp $ */
+/* $NetBSD: bmtphy.c,v 1.21 2006/11/16 01:33:06 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bmtphy.c,v 1.20 2006/10/12 01:31:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bmtphy.c,v 1.21 2006/11/16 01:33:06 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -125,7 +125,7 @@ static const struct mii_phydesc bmtphys[] = {
};
static int
-bmtphymatch(struct device *parent __unused, struct cfdata *match __unused,
+bmtphymatch(struct device *parent, struct cfdata *match,
void *aux)
{
struct mii_attach_args *ma = aux;
@@ -137,7 +137,7 @@ bmtphymatch(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-bmtphyattach(struct device *parent __unused, struct device *self, void *aux)
+bmtphyattach(struct device *parent, struct device *self, void *aux)
{
struct mii_softc *sc = device_private(self);
struct mii_attach_args *ma = aux;
diff --git a/sys/dev/mii/brgphy.c b/sys/dev/mii/brgphy.c
index 5132f1ada54..4dec2f86095 100644
--- a/sys/dev/mii/brgphy.c
+++ b/sys/dev/mii/brgphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: brgphy.c,v 1.28 2006/10/12 01:31:25 christos Exp $ */
+/* $NetBSD: brgphy.c,v 1.29 2006/11/16 01:33:06 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: brgphy.c,v 1.28 2006/10/12 01:31:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: brgphy.c,v 1.29 2006/11/16 01:33:06 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -182,7 +182,7 @@ static void bcm5704_load_dspcode(struct mii_softc *);
static void bcm5750_load_dspcode(struct mii_softc *);
static int
-brgphymatch(struct device *parent __unused, struct cfdata *match __unused,
+brgphymatch(struct device *parent, struct cfdata *match,
void *aux)
{
struct mii_attach_args *ma = aux;
@@ -194,7 +194,7 @@ brgphymatch(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-brgphyattach(struct device *parent __unused, struct device *self, void *aux)
+brgphyattach(struct device *parent, struct device *self, void *aux)
{
struct mii_softc *sc = device_private(self);
struct mii_attach_args *ma = aux;
@@ -470,7 +470,7 @@ brgphy_5704_reset(struct mii_softc *sc)
*/
static void
-brgphy_5705_reset(struct mii_softc *sc __unused)
+brgphy_5705_reset(struct mii_softc *sc)
{
}
diff --git a/sys/dev/mii/ciphy.c b/sys/dev/mii/ciphy.c
index 20b3b509fb5..a2f813a271b 100644
--- a/sys/dev/mii/ciphy.c
+++ b/sys/dev/mii/ciphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ciphy.c,v 1.8 2006/10/12 01:31:25 christos Exp $ */
+/* $NetBSD: ciphy.c,v 1.9 2006/11/16 01:33:06 christos Exp $ */
/*-
* Copyright (c) 2004
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ciphy.c,v 1.8 2006/10/12 01:31:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ciphy.c,v 1.9 2006/11/16 01:33:06 christos Exp $");
/*
* Driver for the Cicada CS8201 10/100/1000 copper PHY.
@@ -96,7 +96,7 @@ static const struct mii_phydesc ciphys[] = {
};
static int
-ciphymatch(struct device *parent __unused, struct cfdata *match __unused,
+ciphymatch(struct device *parent, struct cfdata *match,
void *aux)
{
struct mii_attach_args *ma = aux;
@@ -108,7 +108,7 @@ ciphymatch(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-ciphyattach(struct device *parent __unused, struct device *self, void *aux)
+ciphyattach(struct device *parent, struct device *self, void *aux)
{
struct mii_softc *sc = device_private(self);
struct mii_attach_args *ma = aux;
diff --git a/sys/dev/mii/dmphy.c b/sys/dev/mii/dmphy.c
index 42740e3f51c..52d756ca030 100644
--- a/sys/dev/mii/dmphy.c
+++ b/sys/dev/mii/dmphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dmphy.c,v 1.25 2006/10/12 01:31:25 christos Exp $ */
+/* $NetBSD: dmphy.c,v 1.26 2006/11/16 01:33:06 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dmphy.c,v 1.25 2006/10/12 01:31:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dmphy.c,v 1.26 2006/11/16 01:33:06 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -118,7 +118,7 @@ static const struct mii_phydesc dmphys[] = {
};
static int
-dmphymatch(struct device *parent __unused, struct cfdata *match __unused,
+dmphymatch(struct device *parent, struct cfdata *match,
void *aux)
{
struct mii_attach_args *ma = aux;
@@ -130,7 +130,7 @@ dmphymatch(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-dmphyattach(struct device *parent __unused, struct device *self, void *aux)
+dmphyattach(struct device *parent, struct device *self, void *aux)
{
struct mii_softc *sc = device_private(self);
struct mii_attach_args *ma = aux;
diff --git a/sys/dev/mii/exphy.c b/sys/dev/mii/exphy.c
index 270cc618f56..7e84ddaabb5 100644
--- a/sys/dev/mii/exphy.c
+++ b/sys/dev/mii/exphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: exphy.c,v 1.42 2006/10/12 01:31:25 christos Exp $ */
+/* $NetBSD: exphy.c,v 1.43 2006/11/16 01:33:06 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exphy.c,v 1.42 2006/10/12 01:31:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exphy.c,v 1.43 2006/11/16 01:33:06 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -100,7 +100,7 @@ static const struct mii_phy_funcs exphy_funcs = {
};
static int
-exphymatch(struct device *parent, struct cfdata *match __unused, void *aux)
+exphymatch(struct device *parent, struct cfdata *match, void *aux)
{
struct mii_attach_args *ma = aux;
@@ -121,7 +121,7 @@ exphymatch(struct device *parent, struct cfdata *match __unused, void *aux)
}
static void
-exphyattach(struct device *parent __unused, struct device *self, void *aux)
+exphyattach(struct device *parent, struct device *self, void *aux)
{
struct mii_softc *sc = device_private(self);
struct mii_attach_args *ma = aux;
diff --git a/sys/dev/mii/gentbi.c b/sys/dev/mii/gentbi.c
index 4fa18f9783d..c2a75460ef3 100644
--- a/sys/dev/mii/gentbi.c
+++ b/sys/dev/mii/gentbi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: gentbi.c,v 1.16 2006/10/12 01:31:25 christos Exp $ */
+/* $NetBSD: gentbi.c,v 1.17 2006/11/16 01:33:06 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gentbi.c,v 1.16 2006/10/12 01:31:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gentbi.c,v 1.17 2006/11/16 01:33:06 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -104,7 +104,7 @@ static const struct mii_phy_funcs gentbi_funcs = {
};
static int
-gentbimatch(struct device *parent, struct cfdata *match __unused, void *aux)
+gentbimatch(struct device *parent, struct cfdata *match, void *aux)
{
struct mii_attach_args *ma = aux;
struct mii_data *mii = ma->mii_data;
@@ -137,7 +137,7 @@ gentbimatch(struct device *parent, struct cfdata *match __unused, void *aux)
}
static void
-gentbiattach(struct device *parent __unused, struct device *self, void *aux)
+gentbiattach(struct device *parent, struct device *self, void *aux)
{
struct mii_softc *sc = device_private(self);
struct mii_attach_args *ma = aux;
diff --git a/sys/dev/mii/glxtphy.c b/sys/dev/mii/glxtphy.c
index 2a225a562f6..8e293e7abe7 100644
--- a/sys/dev/mii/glxtphy.c
+++ b/sys/dev/mii/glxtphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: glxtphy.c,v 1.15 2006/10/12 01:31:25 christos Exp $ */
+/* $NetBSD: glxtphy.c,v 1.16 2006/11/16 01:33:06 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: glxtphy.c,v 1.15 2006/10/12 01:31:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: glxtphy.c,v 1.16 2006/11/16 01:33:06 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -114,7 +114,7 @@ static const struct mii_phydesc glxtphys[] = {
};
static int
-glxtphymatch(struct device *parent __unused, struct cfdata *match __unused,
+glxtphymatch(struct device *parent, struct cfdata *match,
void *aux)
{
struct mii_attach_args *ma = aux;
@@ -126,7 +126,7 @@ glxtphymatch(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-glxtphyattach(struct device *parent __unused, struct device *self, void *aux)
+glxtphyattach(struct device *parent, struct device *self, void *aux)
{
struct mii_softc *sc = device_private(self);
struct mii_attach_args *ma = aux;
diff --git a/sys/dev/mii/gphyter.c b/sys/dev/mii/gphyter.c
index 1bcba077997..abc81fb8608 100644
--- a/sys/dev/mii/gphyter.c
+++ b/sys/dev/mii/gphyter.c
@@ -1,4 +1,4 @@
-/* $NetBSD: gphyter.c,v 1.17 2006/10/12 01:31:25 christos Exp $ */
+/* $NetBSD: gphyter.c,v 1.18 2006/11/16 01:33:06 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gphyter.c,v 1.17 2006/10/12 01:31:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gphyter.c,v 1.18 2006/11/16 01:33:06 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -118,7 +118,7 @@ static const struct mii_phydesc gphyters[] = {
};
static int
-gphytermatch(struct device *parent __unused, struct cfdata *match __unused,
+gphytermatch(struct device *parent, struct cfdata *match,
void *aux)
{
struct mii_attach_args *ma = aux;
@@ -130,7 +130,7 @@ gphytermatch(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-gphyterattach(struct device *parent __unused, struct device *self, void *aux)
+gphyterattach(struct device *parent, struct device *self, void *aux)
{
struct mii_softc *sc = (struct mii_softc *)self;
struct mii_attach_args *ma = aux;
diff --git a/sys/dev/mii/icsphy.c b/sys/dev/mii/icsphy.c
index f4176f45ef0..ed0bf6221fc 100644
--- a/sys/dev/mii/icsphy.c
+++ b/sys/dev/mii/icsphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: icsphy.c,v 1.39 2006/10/12 01:31:25 christos Exp $ */
+/* $NetBSD: icsphy.c,v 1.40 2006/11/16 01:33:06 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: icsphy.c,v 1.39 2006/10/12 01:31:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icsphy.c,v 1.40 2006/11/16 01:33:06 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -121,7 +121,7 @@ static const struct mii_phydesc icsphys[] = {
};
static int
-icsphymatch(struct device *parent __unused, struct cfdata *match __unused,
+icsphymatch(struct device *parent, struct cfdata *match,
void *aux)
{
struct mii_attach_args *ma = aux;
@@ -133,7 +133,7 @@ icsphymatch(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-icsphyattach(struct device *parent __unused, struct device *self, void *aux)
+icsphyattach(struct device *parent, struct device *self, void *aux)
{
struct mii_softc *sc = device_private(self);
struct mii_attach_args *ma = aux;
diff --git a/sys/dev/mii/igphy.c b/sys/dev/mii/igphy.c
index 0de1d83fcc6..74948bd1ca2 100644
--- a/sys/dev/mii/igphy.c
+++ b/sys/dev/mii/igphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: igphy.c,v 1.8 2006/10/12 01:31:25 christos Exp $ */
+/* $NetBSD: igphy.c,v 1.9 2006/11/16 01:33:06 christos Exp $ */
/*
* The Intel copyright applies to the analog register setup, and the
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: igphy.c,v 1.8 2006/10/12 01:31:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: igphy.c,v 1.9 2006/11/16 01:33:06 christos Exp $");
#include "opt_mii.h"
@@ -128,7 +128,7 @@ static const struct mii_phydesc igphys[] = {
};
static int
-igphymatch(struct device *parent __unused, struct cfdata *match __unused,
+igphymatch(struct device *parent, struct cfdata *match,
void *aux)
{
struct mii_attach_args *ma = aux;
@@ -140,7 +140,7 @@ igphymatch(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-igphyattach(struct device *parent __unused, struct device *self, void *aux)
+igphyattach(struct device *parent, struct device *self, void *aux)
{
struct mii_softc *sc = device_private(self);
struct mii_attach_args *ma = aux;
diff --git a/sys/dev/mii/ikphy.c b/sys/dev/mii/ikphy.c
index 61644167eb9..ab591a74e4b 100644
--- a/sys/dev/mii/ikphy.c
+++ b/sys/dev/mii/ikphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ikphy.c,v 1.1 2006/10/21 14:10:33 bouyer Exp $ */
+/* $NetBSD: ikphy.c,v 1.2 2006/11/16 01:33:06 christos Exp $ */
/*******************************************************************************
Copyright (c) 2001-2005, Intel Corporation
@@ -64,7 +64,7 @@ POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ikphy.c,v 1.1 2006/10/21 14:10:33 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ikphy.c,v 1.2 2006/11/16 01:33:06 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -105,7 +105,7 @@ static const struct mii_phydesc ikphys[] = {
};
static int
-ikphymatch(struct device *parent __unused, struct cfdata *match __unused,
+ikphymatch(struct device *parent, struct cfdata *match,
void *aux)
{
struct mii_attach_args *ma = aux;
@@ -117,7 +117,7 @@ ikphymatch(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-ikphyattach(struct device *parent __unused, struct device *self, void *aux)
+ikphyattach(struct device *parent, struct device *self, void *aux)
{
struct mii_softc *sc = device_private(self);
struct mii_attach_args *ma = aux;
diff --git a/sys/dev/mii/inphy.c b/sys/dev/mii/inphy.c
index 7be6aeff7f6..3a3a75f3b3d 100644
--- a/sys/dev/mii/inphy.c
+++ b/sys/dev/mii/inphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: inphy.c,v 1.41 2006/10/12 01:31:25 christos Exp $ */
+/* $NetBSD: inphy.c,v 1.42 2006/11/16 01:33:06 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: inphy.c,v 1.41 2006/10/12 01:31:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: inphy.c,v 1.42 2006/11/16 01:33:06 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -124,7 +124,7 @@ static const struct mii_phydesc inphys[] = {
};
static int
-inphymatch(struct device *parent __unused, struct cfdata *match __unused,
+inphymatch(struct device *parent, struct cfdata *match,
void *aux)
{
struct mii_attach_args *ma = aux;
@@ -136,7 +136,7 @@ inphymatch(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-inphyattach(struct device *parent __unused, struct device *self, void *aux)
+inphyattach(struct device *parent, struct device *self, void *aux)
{
struct mii_softc *sc = device_private(self);
struct mii_attach_args *ma = aux;
diff --git a/sys/dev/mii/iophy.c b/sys/dev/mii/iophy.c
index 3834f0f4c29..10fcae82bba 100644
--- a/sys/dev/mii/iophy.c
+++ b/sys/dev/mii/iophy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: iophy.c,v 1.26 2006/10/12 01:31:25 christos Exp $ */
+/* $NetBSD: iophy.c,v 1.27 2006/11/16 01:33:06 christos Exp $ */
/*
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iophy.c,v 1.26 2006/10/12 01:31:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iophy.c,v 1.27 2006/11/16 01:33:06 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -113,7 +113,7 @@ static const struct mii_phydesc iophys[] = {
};
static int
-iophymatch(struct device *parent __unused, struct cfdata *match __unused,
+iophymatch(struct device *parent, struct cfdata *match,
void *aux)
{
struct mii_attach_args *ma = aux;
@@ -125,7 +125,7 @@ iophymatch(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-iophyattach(struct device *parent __unused, struct device *self, void *aux)
+iophyattach(struct device *parent, struct device *self, void *aux)
{
struct mii_softc *sc = device_private(self);
struct mii_attach_args *ma = aux;
diff --git a/sys/dev/mii/lxtphy.c b/sys/dev/mii/lxtphy.c
index f8686804222..530c2b7eeab 100644
--- a/sys/dev/mii/lxtphy.c
+++ b/sys/dev/mii/lxtphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lxtphy.c,v 1.39 2006/10/12 01:31:25 christos Exp $ */
+/* $NetBSD: lxtphy.c,v 1.40 2006/11/16 01:33:06 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lxtphy.c,v 1.39 2006/10/12 01:31:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lxtphy.c,v 1.40 2006/11/16 01:33:06 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -123,7 +123,7 @@ static const struct mii_phydesc lxtphys[] = {
};
static int
-lxtphymatch(struct device *parent __unused, struct cfdata *match __unused,
+lxtphymatch(struct device *parent, struct cfdata *match,
void *aux)
{
struct mii_attach_args *ma = aux;
@@ -135,7 +135,7 @@ lxtphymatch(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-lxtphyattach(struct device *parent __unused, struct device *self, void *aux)
+lxtphyattach(struct device *parent, struct device *self, void *aux)
{
struct mii_softc *sc = device_private(self);
struct mii_attach_args *ma = aux;
diff --git a/sys/dev/mii/makphy.c b/sys/dev/mii/makphy.c
index 2e7276eb460..8725e123d1d 100644
--- a/sys/dev/mii/makphy.c
+++ b/sys/dev/mii/makphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: makphy.c,v 1.20 2006/10/21 13:55:30 bouyer Exp $ */
+/* $NetBSD: makphy.c,v 1.21 2006/11/16 01:33:06 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: makphy.c,v 1.20 2006/10/21 13:55:30 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: makphy.c,v 1.21 2006/11/16 01:33:06 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -120,7 +120,7 @@ static const struct mii_phydesc makphys[] = {
};
static int
-makphymatch(struct device *parent __unused, struct cfdata *match __unused,
+makphymatch(struct device *parent, struct cfdata *match,
void *aux)
{
struct mii_attach_args *ma = aux;
@@ -132,7 +132,7 @@ makphymatch(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-makphyattach(struct device *parent __unused, struct device *self, void *aux)
+makphyattach(struct device *parent, struct device *self, void *aux)
{
struct mii_softc *sc = device_private(self);
struct mii_attach_args *ma = aux;
diff --git a/sys/dev/mii/mii_physubr.c b/sys/dev/mii/mii_physubr.c
index f87a7aa0fa0..2d2db25a97b 100644
--- a/sys/dev/mii/mii_physubr.c
+++ b/sys/dev/mii/mii_physubr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mii_physubr.c,v 1.51 2006/10/12 01:31:25 christos Exp $ */
+/* $NetBSD: mii_physubr.c,v 1.52 2006/11/16 01:33:06 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mii_physubr.c,v 1.51 2006/10/12 01:31:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mii_physubr.c,v 1.52 2006/11/16 01:33:06 christos Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -545,7 +545,7 @@ mii_phy_delete_media(struct mii_softc *sc)
}
int
-mii_phy_activate(struct device *self __unused, enum devact act)
+mii_phy_activate(struct device *self, enum devact act)
{
int rv = 0;
@@ -564,7 +564,7 @@ mii_phy_activate(struct device *self __unused, enum devact act)
/* ARGSUSED1 */
int
-mii_phy_detach(struct device *self, int flags __unused)
+mii_phy_detach(struct device *self, int flags)
{
struct mii_softc *sc = device_private(self);
diff --git a/sys/dev/mii/nsphy.c b/sys/dev/mii/nsphy.c
index ebbedcf3022..a70bccb31b1 100644
--- a/sys/dev/mii/nsphy.c
+++ b/sys/dev/mii/nsphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nsphy.c,v 1.47 2006/10/12 01:31:25 christos Exp $ */
+/* $NetBSD: nsphy.c,v 1.48 2006/11/16 01:33:06 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nsphy.c,v 1.47 2006/10/12 01:31:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nsphy.c,v 1.48 2006/11/16 01:33:06 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -113,7 +113,7 @@ static const struct mii_phydesc nsphys[] = {
};
static int
-nsphymatch(struct device *parent __unused, struct cfdata *match __unused,
+nsphymatch(struct device *parent, struct cfdata *match,
void *aux)
{
struct mii_attach_args *ma = aux;
@@ -125,7 +125,7 @@ nsphymatch(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-nsphyattach(struct device *parent __unused, struct device *self, void *aux)
+nsphyattach(struct device *parent, struct device *self, void *aux)
{
struct mii_softc *sc = device_private(self);
struct mii_attach_args *ma = aux;
diff --git a/sys/dev/mii/nsphyter.c b/sys/dev/mii/nsphyter.c
index 472543310d5..62f7adf8136 100644
--- a/sys/dev/mii/nsphyter.c
+++ b/sys/dev/mii/nsphyter.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nsphyter.c,v 1.24 2006/10/12 01:31:25 christos Exp $ */
+/* $NetBSD: nsphyter.c,v 1.25 2006/11/16 01:33:06 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nsphyter.c,v 1.24 2006/10/12 01:31:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nsphyter.c,v 1.25 2006/11/16 01:33:06 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -121,7 +121,7 @@ static const struct mii_phydesc nsphyters[] = {
};
static int
-nsphytermatch(struct device *parent __unused, struct cfdata *match __unused,
+nsphytermatch(struct device *parent, struct cfdata *match,
void *aux)
{
struct mii_attach_args *ma = aux;
@@ -133,7 +133,7 @@ nsphytermatch(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-nsphyterattach(struct device *parent __unused, struct device *self, void *aux)
+nsphyterattach(struct device *parent, struct device *self, void *aux)
{
struct mii_softc *sc = (struct mii_softc *)self;
struct mii_attach_args *ma = aux;
diff --git a/sys/dev/mii/pnaphy.c b/sys/dev/mii/pnaphy.c
index e921799de05..1b033ad5a58 100644
--- a/sys/dev/mii/pnaphy.c
+++ b/sys/dev/mii/pnaphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pnaphy.c,v 1.14 2006/10/12 01:31:25 christos Exp $ */
+/* $NetBSD: pnaphy.c,v 1.15 2006/11/16 01:33:06 christos Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pnaphy.c,v 1.14 2006/10/12 01:31:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pnaphy.c,v 1.15 2006/11/16 01:33:06 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -85,7 +85,7 @@ static const struct mii_phydesc pnaphys[] = {
};
static int
-pnaphymatch(struct device *parent __unused, struct cfdata *match __unused,
+pnaphymatch(struct device *parent, struct cfdata *match,
void *aux)
{
struct mii_attach_args *ma = aux;
@@ -102,7 +102,7 @@ pnaphymatch(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-pnaphyattach(struct device *parent __unused, struct device *self, void *aux)
+pnaphyattach(struct device *parent, struct device *self, void *aux)
{
struct mii_softc *sc = device_private(self);
struct mii_attach_args *ma = aux;
diff --git a/sys/dev/mii/qsphy.c b/sys/dev/mii/qsphy.c
index e5844c4c8bb..35817e3f2f6 100644
--- a/sys/dev/mii/qsphy.c
+++ b/sys/dev/mii/qsphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: qsphy.c,v 1.38 2006/10/12 01:31:25 christos Exp $ */
+/* $NetBSD: qsphy.c,v 1.39 2006/11/16 01:33:06 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: qsphy.c,v 1.38 2006/10/12 01:31:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: qsphy.c,v 1.39 2006/11/16 01:33:06 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -112,7 +112,7 @@ static const struct mii_phydesc qsphys[] = {
};
static int
-qsphymatch(struct device *parent __unused, struct cfdata *match __unused,
+qsphymatch(struct device *parent, struct cfdata *match,
void *aux)
{
struct mii_attach_args *ma = aux;
@@ -124,7 +124,7 @@ qsphymatch(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-qsphyattach(struct device *parent __unused, struct device *self, void *aux)
+qsphyattach(struct device *parent, struct device *self, void *aux)
{
struct mii_softc *sc = device_private(self);
struct mii_attach_args *ma = aux;
diff --git a/sys/dev/mii/rgephy.c b/sys/dev/mii/rgephy.c
index 75942dae6b1..f98e808ff7c 100644
--- a/sys/dev/mii/rgephy.c
+++ b/sys/dev/mii/rgephy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rgephy.c,v 1.10 2006/11/09 14:43:10 tsutsui Exp $ */
+/* $NetBSD: rgephy.c,v 1.11 2006/11/16 01:33:06 christos Exp $ */
/*
* Copyright (c) 2003
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rgephy.c,v 1.10 2006/11/09 14:43:10 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rgephy.c,v 1.11 2006/11/16 01:33:06 christos Exp $");
/*
@@ -89,7 +89,7 @@ static const struct mii_phydesc rgephys[] = {
};
static int
-rgephy_match(struct device *parent __unused, struct cfdata *match __unused,
+rgephy_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct mii_attach_args *ma = aux;
@@ -101,7 +101,7 @@ rgephy_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-rgephy_attach(struct device *parent __unused, struct device *self, void *aux)
+rgephy_attach(struct device *parent, struct device *self, void *aux)
{
struct mii_softc *sc = device_private(self);
struct mii_attach_args *ma = aux;
diff --git a/sys/dev/mii/rlphy.c b/sys/dev/mii/rlphy.c
index 158d39ad845..217e1330ddb 100644
--- a/sys/dev/mii/rlphy.c
+++ b/sys/dev/mii/rlphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rlphy.c,v 1.11 2006/11/03 17:05:16 tsutsui Exp $ */
+/* $NetBSD: rlphy.c,v 1.12 2006/11/16 01:33:06 christos Exp $ */
/* $OpenBSD: rlphy.c,v 1.20 2005/07/31 05:27:30 pvalchev Exp $ */
/*
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rlphy.c,v 1.11 2006/11/03 17:05:16 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rlphy.c,v 1.12 2006/11/16 01:33:06 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -80,7 +80,7 @@ static const struct mii_phydesc rlphys[] = {
};
int
-rlphymatch(struct device *parent, struct cfdata *match __unused, void *aux)
+rlphymatch(struct device *parent, struct cfdata *match, void *aux)
{
struct mii_attach_args *ma = aux;
@@ -102,7 +102,7 @@ rlphymatch(struct device *parent, struct cfdata *match __unused, void *aux)
}
void
-rlphyattach(struct device *parent __unused, struct device *self, void *aux)
+rlphyattach(struct device *parent, struct device *self, void *aux)
{
struct mii_softc *sc = device_private(self);
struct mii_attach_args *ma = aux;
diff --git a/sys/dev/mii/sqphy.c b/sys/dev/mii/sqphy.c
index 1bde19e87af..dea649730e5 100644
--- a/sys/dev/mii/sqphy.c
+++ b/sys/dev/mii/sqphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sqphy.c,v 1.40 2006/10/12 01:31:25 christos Exp $ */
+/* $NetBSD: sqphy.c,v 1.41 2006/11/16 01:33:06 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sqphy.c,v 1.40 2006/10/12 01:31:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sqphy.c,v 1.41 2006/11/16 01:33:06 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -123,7 +123,7 @@ static const struct mii_phydesc sqphys[] = {
};
static int
-sqphymatch(struct device *parent __unused, struct cfdata *match __unused,
+sqphymatch(struct device *parent, struct cfdata *match,
void *aux)
{
struct mii_attach_args *ma = aux;
@@ -135,7 +135,7 @@ sqphymatch(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-sqphyattach(struct device *parent __unused, struct device *self, void *aux)
+sqphyattach(struct device *parent, struct device *self, void *aux)
{
struct mii_softc *sc = device_private(self);
struct mii_attach_args *ma = aux;
diff --git a/sys/dev/mii/tlphy.c b/sys/dev/mii/tlphy.c
index 6097845b31f..83eb611ba06 100644
--- a/sys/dev/mii/tlphy.c
+++ b/sys/dev/mii/tlphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tlphy.c,v 1.48 2006/10/12 01:31:25 christos Exp $ */
+/* $NetBSD: tlphy.c,v 1.49 2006/11/16 01:33:06 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tlphy.c,v 1.48 2006/10/12 01:31:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tlphy.c,v 1.49 2006/11/16 01:33:06 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -127,7 +127,7 @@ static const struct mii_phydesc tlphys[] = {
};
static int
-tlphymatch(struct device *parent __unused, struct cfdata *match __unused,
+tlphymatch(struct device *parent, struct cfdata *match,
void *aux)
{
struct mii_attach_args *ma = aux;
@@ -139,7 +139,7 @@ tlphymatch(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-tlphyattach(struct device *parent __unused, struct device *self, void *aux)
+tlphyattach(struct device *parent, struct device *self, void *aux)
{
struct tlphy_softc *sc = device_private(self);
struct tl_softc *tlsc = device_private(device_parent(self));
diff --git a/sys/dev/mii/tqphy.c b/sys/dev/mii/tqphy.c
index 0fc8e79c954..53e5d76260e 100644
--- a/sys/dev/mii/tqphy.c
+++ b/sys/dev/mii/tqphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tqphy.c,v 1.29 2006/10/12 01:31:25 christos Exp $ */
+/* $NetBSD: tqphy.c,v 1.30 2006/11/16 01:33:06 christos Exp $ */
/*
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tqphy.c,v 1.29 2006/10/12 01:31:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tqphy.c,v 1.30 2006/11/16 01:33:06 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -115,7 +115,7 @@ static const struct mii_phydesc tqphys[] = {
};
static int
-tqphymatch(struct device *parent __unused, struct cfdata *match __unused,
+tqphymatch(struct device *parent, struct cfdata *match,
void *aux)
{
struct mii_attach_args *ma = aux;
@@ -132,7 +132,7 @@ tqphymatch(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-tqphyattach(struct device *parent __unused, struct device *self, void *aux)
+tqphyattach(struct device *parent, struct device *self, void *aux)
{
struct mii_softc *sc = device_private(self);
struct mii_attach_args *ma = aux;
diff --git a/sys/dev/mii/ukphy.c b/sys/dev/mii/ukphy.c
index 7b507e0295f..1e211bd0405 100644
--- a/sys/dev/mii/ukphy.c
+++ b/sys/dev/mii/ukphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ukphy.c,v 1.28 2006/10/12 01:31:25 christos Exp $ */
+/* $NetBSD: ukphy.c,v 1.29 2006/11/16 01:33:06 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ukphy.c,v 1.28 2006/10/12 01:31:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ukphy.c,v 1.29 2006/11/16 01:33:06 christos Exp $");
#include "opt_mii.h"
@@ -111,8 +111,8 @@ static const struct mii_phy_funcs ukphy_funcs = {
};
static int
-ukphymatch(struct device *parent __unused, struct cfdata *match __unused,
- void *aux __unused)
+ukphymatch(struct device *parent, struct cfdata *match,
+ void *aux)
{
/*
@@ -122,7 +122,7 @@ ukphymatch(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-ukphyattach(struct device *parent __unused, struct device *self, void *aux)
+ukphyattach(struct device *parent, struct device *self, void *aux)
{
struct mii_softc *sc = device_private(self);
struct mii_attach_args *ma = aux;
diff --git a/sys/dev/mii/urlphy.c b/sys/dev/mii/urlphy.c
index 523b70b899e..596b07254d5 100644
--- a/sys/dev/mii/urlphy.c
+++ b/sys/dev/mii/urlphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: urlphy.c,v 1.16 2006/10/12 01:31:25 christos Exp $ */
+/* $NetBSD: urlphy.c,v 1.17 2006/11/16 01:33:06 christos Exp $ */
/*
* Copyright (c) 2001, 2002
* Shingo WATANABE <nabe@nabechan.org>. All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: urlphy.c,v 1.16 2006/10/12 01:31:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: urlphy.c,v 1.17 2006/11/16 01:33:06 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -73,7 +73,7 @@ static const struct mii_phy_funcs urlphy_funcs = {
};
static int
-urlphy_match(struct device *parent, struct cfdata *match __unused, void *aux)
+urlphy_match(struct device *parent, struct cfdata *match, void *aux)
{
struct mii_attach_args *ma = aux;
@@ -94,7 +94,7 @@ urlphy_match(struct device *parent, struct cfdata *match __unused, void *aux)
}
static void
-urlphy_attach(struct device *parent __unused, struct device *self, void *aux)
+urlphy_attach(struct device *parent, struct device *self, void *aux)
{
struct mii_softc *sc = device_private(self);
struct mii_attach_args *ma = aux;
diff --git a/sys/dev/mm.c b/sys/dev/mm.c
index a66d5538cb1..7bd42f32bd8 100644
--- a/sys/dev/mm.c
+++ b/sys/dev/mm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mm.c,v 1.8 2006/10/12 01:30:51 christos Exp $ */
+/* $NetBSD: mm.c,v 1.9 2006/11/16 01:32:45 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mm.c,v 1.8 2006/10/12 01:30:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mm.c,v 1.9 2006/11/16 01:32:45 christos Exp $");
/*
* Memory special file
@@ -56,8 +56,8 @@ __KERNEL_RCSID(0, "$NetBSD: mm.c,v 1.8 2006/10/12 01:30:51 christos Exp $");
dev_type_ioctl(mmioctl);
int
-mmioctl(dev_t dev, u_long cmd, caddr_t data, int flag __unused,
- struct lwp *l __unused)
+mmioctl(dev_t dev, u_long cmd, caddr_t data, int flag,
+ struct lwp *l)
{
switch (minor(dev)) {
default:
diff --git a/sys/dev/mulaw.c b/sys/dev/mulaw.c
index 84288b20388..ddbdc45f632 100644
--- a/sys/dev/mulaw.c
+++ b/sys/dev/mulaw.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mulaw.c,v 1.25 2006/10/12 01:30:51 christos Exp $ */
+/* $NetBSD: mulaw.c,v 1.26 2006/11/16 01:32:45 christos Exp $ */
/*
* Copyright (c) 1991-1993 Regents of the University of California.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mulaw.c,v 1.25 2006/10/12 01:30:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mulaw.c,v 1.26 2006/11/16 01:32:45 christos Exp $");
#include <sys/types.h>
#include <sys/systm.h>
@@ -262,8 +262,8 @@ static const uint8_t lintoalaw[256] = {
static int \
name##_fetch_to(stream_fetcher_t *, audio_stream_t *, int); \
stream_filter_t * \
-name(struct audio_softc *sc __unused, const audio_params_t *from __unused, \
- const audio_params_t *to __unused) \
+name(struct audio_softc *sc, const audio_params_t *from, \
+ const audio_params_t *to) \
{ \
DPRINTF(("Construct '%s' filter.\n", __func__)); \
return auconv_nocontext_filter_factory(name##_fetch_to); \
diff --git a/sys/dev/onewire/onewire.c b/sys/dev/onewire/onewire.c
index f59db7937d7..a3adea47f0c 100644
--- a/sys/dev/onewire/onewire.c
+++ b/sys/dev/onewire/onewire.c
@@ -1,4 +1,4 @@
-/* $NetBSD: onewire.c,v 1.3 2006/10/12 01:31:27 christos Exp $ */
+/* $NetBSD: onewire.c,v 1.4 2006/11/16 01:33:08 christos Exp $ */
/* $OpenBSD: onewire.c,v 1.1 2006/03/04 16:27:03 grange Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: onewire.c,v 1.3 2006/10/12 01:31:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: onewire.c,v 1.4 2006/11/16 01:33:08 christos Exp $");
/*
* 1-Wire bus driver.
@@ -87,14 +87,14 @@ const struct cdevsw onewire_cdevsw = {
extern struct cfdriver onewire_cd;
int
-onewire_match(struct device *parent __unused, struct cfdata *cf __unused,
- void *aux __unused)
+onewire_match(struct device *parent, struct cfdata *cf,
+ void *aux)
{
return 1;
}
void
-onewire_attach(struct device *parent __unused, struct device *self, void *aux)
+onewire_attach(struct device *parent, struct device *self, void *aux)
{
struct onewire_softc *sc = device_private(self);
struct onewirebus_attach_args *oba = aux;
@@ -109,7 +109,7 @@ onewire_attach(struct device *parent __unused, struct device *self, void *aux)
}
int
-onewire_detach(struct device *self, int flags __unused)
+onewire_detach(struct device *self, int flags)
{
struct onewire_softc *sc = device_private(self);
int rv;
@@ -170,7 +170,7 @@ onewire_print(void *aux, const char *pnp)
}
int
-onewirebus_print(void *aux __unused, const char *pnp)
+onewirebus_print(void *aux, const char *pnp)
{
if (pnp != NULL)
printf("onewire at %s", pnp);
diff --git a/sys/dev/onewire/onewire_subr.c b/sys/dev/onewire/onewire_subr.c
index 639b678cbe4..82ab9a2bb40 100644
--- a/sys/dev/onewire/onewire_subr.c
+++ b/sys/dev/onewire/onewire_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: onewire_subr.c,v 1.4 2006/10/12 01:31:27 christos Exp $ */
+/* $NetBSD: onewire_subr.c,v 1.5 2006/11/16 01:33:08 christos Exp $ */
/* $OpenBSD: onewire_subr.c,v 1.1 2006/03/04 16:27:03 grange Exp $ */
/*
@@ -85,7 +85,7 @@ onewire_crc(const void *buf, int len)
}
const char *
-onewire_famname(int type __unused)
+onewire_famname(int type)
{
#ifdef ONEWIREVERBOSE
const struct onewire_family *of;
diff --git a/sys/dev/onewire/owtemp.c b/sys/dev/onewire/owtemp.c
index 94ea21927bc..e37e1625bb5 100644
--- a/sys/dev/onewire/owtemp.c
+++ b/sys/dev/onewire/owtemp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: owtemp.c,v 1.5 2006/10/12 01:31:27 christos Exp $ */
+/* $NetBSD: owtemp.c,v 1.6 2006/11/16 01:33:08 christos Exp $ */
/* $OpenBSD: owtemp.c,v 1.1 2006/03/04 16:27:03 grange Exp $ */
/*
@@ -22,7 +22,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: owtemp.c,v 1.5 2006/10/12 01:31:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: owtemp.c,v 1.6 2006/11/16 01:33:08 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -87,7 +87,7 @@ static uint32_t owtemp_decode_ds18b20(const uint8_t *);
static uint32_t owtemp_decode_ds1920(const uint8_t *);
int
-owtemp_match(struct device *parent __unused, struct cfdata *cf __unused,
+owtemp_match(struct device *parent, struct cfdata *cf,
void *aux)
{
return (onewire_matchbyfam(aux, owtemp_fams,
@@ -95,7 +95,7 @@ owtemp_match(struct device *parent __unused, struct cfdata *cf __unused,
}
void
-owtemp_attach(struct device *parent __unused, struct device *self, void *aux)
+owtemp_attach(struct device *parent, struct device *self, void *aux)
{
struct owtemp_softc *sc = device_private(self);
struct onewire_attach_args *oa = aux;
@@ -163,7 +163,7 @@ owtemp_attach(struct device *parent __unused, struct device *self, void *aux)
}
int
-owtemp_detach(struct device *self, int flags __unused)
+owtemp_detach(struct device *self, int flags)
{
struct owtemp_softc *sc = device_private(self);
diff --git a/sys/dev/pci/aac_pci.c b/sys/dev/pci/aac_pci.c
index d31af3d45fd..17964d85e1f 100644
--- a/sys/dev/pci/aac_pci.c
+++ b/sys/dev/pci/aac_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aac_pci.c,v 1.18 2006/10/12 01:31:27 christos Exp $ */
+/* $NetBSD: aac_pci.c,v 1.19 2006/11/16 01:33:08 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aac_pci.c,v 1.18 2006/10/12 01:31:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aac_pci.c,v 1.19 2006/11/16 01:33:08 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -375,7 +375,7 @@ aac_find_ident(struct pci_attach_args *pa)
}
static int
-aac_pci_match(struct device *parent __unused, struct cfdata *match __unused,
+aac_pci_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa;
@@ -389,7 +389,7 @@ aac_pci_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-aac_pci_attach(struct device *parent __unused, struct device *self, void *aux)
+aac_pci_attach(struct device *parent, struct device *self, void *aux)
{
struct pci_attach_args *pa;
pci_chipset_tag_t pc;
diff --git a/sys/dev/pci/acardide.c b/sys/dev/pci/acardide.c
index 7b2fb3b85f6..92b4897cde6 100644
--- a/sys/dev/pci/acardide.c
+++ b/sys/dev/pci/acardide.c
@@ -1,4 +1,4 @@
-/* $NetBSD: acardide.c,v 1.19 2006/10/12 01:31:27 christos Exp $ */
+/* $NetBSD: acardide.c,v 1.20 2006/11/16 01:33:08 christos Exp $ */
/*
* Copyright (c) 2001 Izumi Tsutsui.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acardide.c,v 1.19 2006/10/12 01:31:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acardide.c,v 1.20 2006/11/16 01:33:08 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -84,7 +84,7 @@ static const struct pciide_product_desc pciide_acard_products[] = {
};
static int
-acardide_match(struct device *parent __unused, struct cfdata *match __unused,
+acardide_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -97,7 +97,7 @@ acardide_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-acardide_attach(struct device *parent __unused, struct device *self, void *aux)
+acardide_attach(struct device *parent, struct device *self, void *aux)
{
struct pci_attach_args *pa = aux;
struct pciide_softc *sc = (struct pciide_softc *)self;
diff --git a/sys/dev/pci/aceride.c b/sys/dev/pci/aceride.c
index 6940de7eced..404f89f2b47 100644
--- a/sys/dev/pci/aceride.c
+++ b/sys/dev/pci/aceride.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aceride.c,v 1.20 2006/10/12 01:31:27 christos Exp $ */
+/* $NetBSD: aceride.c,v 1.21 2006/11/16 01:33:08 christos Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Manuel Bouyer.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aceride.c,v 1.20 2006/10/12 01:31:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aceride.c,v 1.21 2006/11/16 01:33:08 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -72,7 +72,7 @@ static const struct pciide_product_desc pciide_acer_products[] = {
};
static int
-aceride_match(struct device *parent __unused, struct cfdata *match __unused,
+aceride_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -87,7 +87,7 @@ aceride_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-aceride_attach(struct device *parent __unused, struct device *self, void *aux)
+aceride_attach(struct device *parent, struct device *self, void *aux)
{
struct pci_attach_args *pa = aux;
struct pciide_softc *sc = (struct pciide_softc *)self;
diff --git a/sys/dev/pci/adv_pci.c b/sys/dev/pci/adv_pci.c
index 3bf778f52ea..426a03befbd 100644
--- a/sys/dev/pci/adv_pci.c
+++ b/sys/dev/pci/adv_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: adv_pci.c,v 1.19 2006/10/12 01:31:27 christos Exp $ */
+/* $NetBSD: adv_pci.c,v 1.20 2006/11/16 01:33:08 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved.
@@ -63,7 +63,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adv_pci.c,v 1.19 2006/10/12 01:31:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adv_pci.c,v 1.20 2006/11/16 01:33:08 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -97,7 +97,7 @@ __KERNEL_RCSID(0, "$NetBSD: adv_pci.c,v 1.19 2006/10/12 01:31:27 christos Exp $"
* the actual probe routine to check it out.
*/
static int
-adv_pci_match(struct device *parent __unused, struct cfdata *match __unused,
+adv_pci_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -114,7 +114,7 @@ adv_pci_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-adv_pci_attach(struct device *parent __unused, struct device *self, void *aux)
+adv_pci_attach(struct device *parent, struct device *self, void *aux)
{
struct pci_attach_args *pa = aux;
ASC_SOFTC *sc = (void *) self;
diff --git a/sys/dev/pci/adw_pci.c b/sys/dev/pci/adw_pci.c
index e06e6740de3..4b80ab6a2dd 100644
--- a/sys/dev/pci/adw_pci.c
+++ b/sys/dev/pci/adw_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: adw_pci.c,v 1.18 2006/10/12 01:31:27 christos Exp $ */
+/* $NetBSD: adw_pci.c,v 1.19 2006/11/16 01:33:08 christos Exp $ */
/*
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adw_pci.c,v 1.18 2006/10/12 01:31:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adw_pci.c,v 1.19 2006/11/16 01:33:08 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -83,7 +83,7 @@ __KERNEL_RCSID(0, "$NetBSD: adw_pci.c,v 1.18 2006/10/12 01:31:27 christos Exp $"
* the actual probe routine to check it out.
*/
static int
-adw_pci_match(struct device *parent __unused, struct cfdata *match __unused,
+adw_pci_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -101,7 +101,7 @@ adw_pci_match(struct device *parent __unused, struct cfdata *match __unused,
static void
-adw_pci_attach(struct device *parent __unused, struct device *self, void *aux)
+adw_pci_attach(struct device *parent, struct device *self, void *aux)
{
struct pci_attach_args *pa = aux;
ADW_SOFTC *sc = (void *) self;
diff --git a/sys/dev/pci/agp.c b/sys/dev/pci/agp.c
index 7765f3bc8b6..7f076355696 100644
--- a/sys/dev/pci/agp.c
+++ b/sys/dev/pci/agp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: agp.c,v 1.42 2006/10/12 01:31:27 christos Exp $ */
+/* $NetBSD: agp.c,v 1.43 2006/11/16 01:33:08 christos Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
@@ -65,7 +65,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp.c,v 1.42 2006/10/12 01:31:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp.c,v 1.43 2006/11/16 01:33:08 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -215,7 +215,7 @@ agp_lookup(const struct pci_attach_args *pa)
}
static int
-agpmatch(struct device *parent __unused, struct cfdata *match __unused,
+agpmatch(struct device *parent, struct cfdata *match,
void *aux)
{
struct agpbus_attach_args *apa = aux;
@@ -792,8 +792,8 @@ agp_unbind_user(struct agp_softc *sc, agp_unbind *unbind)
}
static int
-agpopen(dev_t dev, int oflags __unused, int devtype __unused,
- struct lwp *l __unused)
+agpopen(dev_t dev, int oflags, int devtype,
+ struct lwp *l)
{
struct agp_softc *sc = device_lookup(&agp_cd, AGPUNIT(dev));
@@ -812,8 +812,8 @@ agpopen(dev_t dev, int oflags __unused, int devtype __unused,
}
static int
-agpclose(dev_t dev, int fflag __unused, int devtype __unused,
- struct lwp *l __unused)
+agpclose(dev_t dev, int fflag, int devtype,
+ struct lwp *l)
{
struct agp_softc *sc = device_lookup(&agp_cd, AGPUNIT(dev));
struct agp_memory *mem;
@@ -847,7 +847,7 @@ agpclose(dev_t dev, int fflag __unused, int devtype __unused,
}
static int
-agpioctl(dev_t dev, u_long cmd, caddr_t data, int fflag, struct lwp *l __unused)
+agpioctl(dev_t dev, u_long cmd, caddr_t data, int fflag, struct lwp *l)
{
struct agp_softc *sc = device_lookup(&agp_cd, AGPUNIT(dev));
@@ -982,7 +982,7 @@ int agp_unbind_memory(void *dev, void *handle)
return AGP_UNBIND_MEMORY(sc, mem);
}
-void agp_memory_info(void *dev __unused, void *handle,
+void agp_memory_info(void *dev, void *handle,
struct agp_memory_info *mi)
{
struct agp_memory *mem = (struct agp_memory *) handle;
diff --git a/sys/dev/pci/agp_ali.c b/sys/dev/pci/agp_ali.c
index fef0eced0a6..1adb78a4dde 100644
--- a/sys/dev/pci/agp_ali.c
+++ b/sys/dev/pci/agp_ali.c
@@ -1,4 +1,4 @@
-/* $NetBSD: agp_ali.c,v 1.10 2006/10/12 01:31:27 christos Exp $ */
+/* $NetBSD: agp_ali.c,v 1.11 2006/11/16 01:33:08 christos Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp_ali.c,v 1.10 2006/10/12 01:31:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_ali.c,v 1.11 2006/11/16 01:33:08 christos Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -77,7 +77,7 @@ static struct agp_methods agp_ali_methods = {
};
int
-agp_ali_attach(struct device *parent __unused, struct device *self, void *aux)
+agp_ali_attach(struct device *parent, struct device *self, void *aux)
{
struct agp_softc *sc = (struct agp_softc *)self;
struct agp_ali_softc *asc;
diff --git a/sys/dev/pci/agp_amd.c b/sys/dev/pci/agp_amd.c
index 5f1b13deadc..cf499a4d48b 100644
--- a/sys/dev/pci/agp_amd.c
+++ b/sys/dev/pci/agp_amd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: agp_amd.c,v 1.16 2006/10/12 01:31:27 christos Exp $ */
+/* $NetBSD: agp_amd.c,v 1.17 2006/11/16 01:33:08 christos Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp_amd.c,v 1.16 2006/10/12 01:31:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_amd.c,v 1.17 2006/11/16 01:33:08 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -169,7 +169,7 @@ agp_amd_match(const struct pci_attach_args *pa)
}
int
-agp_amd_attach(struct device *parent __unused, struct device *self, void *aux)
+agp_amd_attach(struct device *parent, struct device *self, void *aux)
{
struct agp_softc *sc = (void *)self;
struct agp_amd_softc *asc;
diff --git a/sys/dev/pci/agp_i810.c b/sys/dev/pci/agp_i810.c
index 0bdbc31bff0..e7fdbbeaa22 100644
--- a/sys/dev/pci/agp_i810.c
+++ b/sys/dev/pci/agp_i810.c
@@ -1,4 +1,4 @@
-/* $NetBSD: agp_i810.c,v 1.34 2006/10/12 01:31:27 christos Exp $ */
+/* $NetBSD: agp_i810.c,v 1.35 2006/11/16 01:33:08 christos Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp_i810.c,v 1.34 2006/10/12 01:31:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_i810.c,v 1.35 2006/11/16 01:33:08 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -598,12 +598,12 @@ agp_i810_unbind_page(struct agp_softc *sc, off_t offset)
* Writing via memory mapped registers already flushes all TLBs.
*/
static void
-agp_i810_flush_tlb(struct agp_softc *sc __unused)
+agp_i810_flush_tlb(struct agp_softc *sc)
{
}
static int
-agp_i810_enable(struct agp_softc *sc __unused, u_int32_t mode __unused)
+agp_i810_enable(struct agp_softc *sc, u_int32_t mode)
{
return 0;
diff --git a/sys/dev/pci/agp_intel.c b/sys/dev/pci/agp_intel.c
index 9b293584716..058f4bdf623 100644
--- a/sys/dev/pci/agp_intel.c
+++ b/sys/dev/pci/agp_intel.c
@@ -1,4 +1,4 @@
-/* $NetBSD: agp_intel.c,v 1.20 2006/10/12 01:31:27 christos Exp $ */
+/* $NetBSD: agp_intel.c,v 1.21 2006/11/16 01:33:08 christos Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp_intel.c,v 1.20 2006/10/12 01:31:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_intel.c,v 1.21 2006/11/16 01:33:08 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -109,7 +109,7 @@ agp_intel_vgamatch(struct pci_attach_args *pa)
}
int
-agp_intel_attach(struct device *parent __unused, struct device *self, void *aux)
+agp_intel_attach(struct device *parent, struct device *self, void *aux)
{
struct agp_softc *sc = (struct agp_softc *)self;
struct pci_attach_args *pa= aux;
diff --git a/sys/dev/pci/agp_sis.c b/sys/dev/pci/agp_sis.c
index c4507a9ed42..8b6b957a396 100644
--- a/sys/dev/pci/agp_sis.c
+++ b/sys/dev/pci/agp_sis.c
@@ -1,4 +1,4 @@
-/* $NetBSD: agp_sis.c,v 1.9 2006/10/12 01:31:28 christos Exp $ */
+/* $NetBSD: agp_sis.c,v 1.10 2006/11/16 01:33:08 christos Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp_sis.c,v 1.9 2006/10/12 01:31:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_sis.c,v 1.10 2006/11/16 01:33:08 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -75,7 +75,7 @@ static struct agp_methods agp_sis_methods = {
};
int
-agp_sis_attach(struct device *parent __unused, struct device *self, void *aux)
+agp_sis_attach(struct device *parent, struct device *self, void *aux)
{
struct agp_softc *sc = (struct agp_softc *)self;
struct pci_attach_args *pa = aux;
diff --git a/sys/dev/pci/agp_via.c b/sys/dev/pci/agp_via.c
index b9556da0d74..046530ea53f 100644
--- a/sys/dev/pci/agp_via.c
+++ b/sys/dev/pci/agp_via.c
@@ -1,4 +1,4 @@
-/* $NetBSD: agp_via.c,v 1.10 2006/10/12 01:31:28 christos Exp $ */
+/* $NetBSD: agp_via.c,v 1.11 2006/11/16 01:33:08 christos Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp_via.c,v 1.10 2006/10/12 01:31:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_via.c,v 1.11 2006/11/16 01:33:08 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -75,7 +75,7 @@ struct agp_via_softc {
};
int
-agp_via_attach(struct device *parent __unused, struct device *self, void *aux)
+agp_via_attach(struct device *parent, struct device *self, void *aux)
{
struct pci_attach_args *pa = aux;
struct agp_softc *sc = (void *)self;
diff --git a/sys/dev/pci/agpbusprint.c b/sys/dev/pci/agpbusprint.c
index 3836e0fe712..f9cee3b94a4 100644
--- a/sys/dev/pci/agpbusprint.c
+++ b/sys/dev/pci/agpbusprint.c
@@ -1,6 +1,6 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agpbusprint.c,v 1.4 2006/10/12 01:31:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agpbusprint.c,v 1.5 2006/11/16 01:33:08 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -9,7 +9,7 @@ __KERNEL_RCSID(0, "$NetBSD: agpbusprint.c,v 1.4 2006/10/12 01:31:28 christos Exp
#include <dev/pci/agpvar.h>
int
-agpbusprint(void *vaa __unused, const char *pnp)
+agpbusprint(void *vaa, const char *pnp)
{
#if 0
struct agpbus_attach_args *aa = vaa;
diff --git a/sys/dev/pci/ahc_pci.c b/sys/dev/pci/ahc_pci.c
index d2f3cc9a82f..75d7b6d37f0 100644
--- a/sys/dev/pci/ahc_pci.c
+++ b/sys/dev/pci/ahc_pci.c
@@ -39,7 +39,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGES.
*
- * $Id: ahc_pci.c,v 1.57 2006/10/12 01:31:28 christos Exp $
+ * $Id: ahc_pci.c,v 1.58 2006/11/16 01:33:08 christos Exp $
*
* //depot/aic7xxx/aic7xxx/aic7xxx_pci.c#57 $
*
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahc_pci.c,v 1.57 2006/10/12 01:31:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahc_pci.c,v 1.58 2006/11/16 01:33:08 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -741,7 +741,7 @@ ahc_find_pci_device(pcireg_t id, pcireg_t subid, u_int func)
}
static int
-ahc_pci_probe(struct device *parent __unused, struct cfdata *match __unused,
+ahc_pci_probe(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -754,7 +754,7 @@ ahc_pci_probe(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-ahc_pci_attach(struct device *parent __unused, struct device *self, void *aux)
+ahc_pci_attach(struct device *parent, struct device *self, void *aux)
{
struct pci_attach_args *pa = aux;
const struct ahc_pci_identity *entry;
diff --git a/sys/dev/pci/ahd_pci.c b/sys/dev/pci/ahd_pci.c
index 945a935a7c5..d24db52dbae 100644
--- a/sys/dev/pci/ahd_pci.c
+++ b/sys/dev/pci/ahd_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ahd_pci.c,v 1.24 2006/10/12 01:31:28 christos Exp $ */
+/* $NetBSD: ahd_pci.c,v 1.25 2006/11/16 01:33:08 christos Exp $ */
/*
* Product specific probe and attach routines for:
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahd_pci.c,v 1.24 2006/10/12 01:31:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahd_pci.c,v 1.25 2006/11/16 01:33:08 christos Exp $");
#define AHD_PCI_IOADDR PCI_MAPREG_START /* I/O Address */
#define AHD_PCI_MEMADDR (PCI_MAPREG_START + 4) /* Mem I/O Address */
@@ -286,7 +286,7 @@ ahd_find_pci_device(pcireg_t id, pcireg_t subid)
}
static int
-ahd_pci_probe(struct device *parent __unused, struct cfdata *match __unused,
+ahd_pci_probe(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -299,7 +299,7 @@ ahd_pci_probe(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-ahd_pci_attach(struct device *parent __unused, struct device *self, void *aux)
+ahd_pci_attach(struct device *parent, struct device *self, void *aux)
{
struct pci_attach_args *pa = aux;
struct ahd_softc *ahd = (void *)self;
@@ -1011,7 +1011,7 @@ ahd_pci_intr(struct ahd_softc *ahd)
}
static void
-ahd_pci_split_intr(struct ahd_softc *ahd, u_int intstat __unused)
+ahd_pci_split_intr(struct ahd_softc *ahd, u_int intstat)
{
uint8_t split_status[4];
uint8_t split_status1[4];
diff --git a/sys/dev/pci/amdpm.c b/sys/dev/pci/amdpm.c
index 8f3773e3e99..5f442615998 100644
--- a/sys/dev/pci/amdpm.c
+++ b/sys/dev/pci/amdpm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: amdpm.c,v 1.20 2006/10/12 01:31:28 christos Exp $ */
+/* $NetBSD: amdpm.c,v 1.21 2006/11/16 01:33:08 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdpm.c,v 1.20 2006/10/12 01:31:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdpm.c,v 1.21 2006/11/16 01:33:08 christos Exp $");
#include "opt_amdpm.h"
@@ -70,7 +70,7 @@ static void amdpm_rnd_callout(void *);
#endif
static int
-amdpm_match(struct device *parent __unused, struct cfdata *match __unused,
+amdpm_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -88,7 +88,7 @@ amdpm_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-amdpm_attach(struct device *parent __unused, struct device *self, void *aux)
+amdpm_attach(struct device *parent, struct device *self, void *aux)
{
struct amdpm_softc *sc = (struct amdpm_softc *) self;
struct pci_attach_args *pa = aux;
diff --git a/sys/dev/pci/amdpm_smbus.c b/sys/dev/pci/amdpm_smbus.c
index 8540e7df6ef..eb99248eb74 100644
--- a/sys/dev/pci/amdpm_smbus.c
+++ b/sys/dev/pci/amdpm_smbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: amdpm_smbus.c,v 1.6 2006/10/12 01:31:28 christos Exp $ */
+/* $NetBSD: amdpm_smbus.c,v 1.7 2006/11/16 01:33:08 christos Exp $ */
/*
* Copyright (c) 2005 Anil Gopinath (anil_public@yahoo.com)
@@ -32,7 +32,7 @@
* AMD-8111 HyperTransport I/O Hub
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdpm_smbus.c,v 1.6 2006/10/12 01:31:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdpm_smbus.c,v 1.7 2006/11/16 01:33:08 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -88,7 +88,7 @@ amdpm_smbus_attach(struct amdpm_softc *sc)
}
static int
-amdpm_smbus_acquire_bus(void *cookie, int flags __unused)
+amdpm_smbus_acquire_bus(void *cookie, int flags)
{
struct amdpm_softc *sc = cookie;
int err;
@@ -99,7 +99,7 @@ amdpm_smbus_acquire_bus(void *cookie, int flags __unused)
}
static void
-amdpm_smbus_release_bus(void *cookie, int flags __unused)
+amdpm_smbus_release_bus(void *cookie, int flags)
{
struct amdpm_softc *sc = cookie;
@@ -110,7 +110,7 @@ amdpm_smbus_release_bus(void *cookie, int flags __unused)
static int
amdpm_smbus_exec(void *cookie, i2c_op_t op, i2c_addr_t addr, const void *cmd,
- size_t cmdlen, void *vbuf, size_t buflen, int flags __unused)
+ size_t cmdlen, void *vbuf, size_t buflen, int flags)
{
struct amdpm_softc *sc = (struct amdpm_softc *) cookie;
sc->sc_smbus_slaveaddr = addr;
diff --git a/sys/dev/pci/amr.c b/sys/dev/pci/amr.c
index a963d746eb3..051f76407a8 100644
--- a/sys/dev/pci/amr.c
+++ b/sys/dev/pci/amr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: amr.c,v 1.40 2006/11/08 00:17:09 elad Exp $ */
+/* $NetBSD: amr.c,v 1.41 2006/11/16 01:33:08 christos Exp $ */
/*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amr.c,v 1.40 2006/11/08 00:17:09 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amr.c,v 1.41 2006/11/16 01:33:08 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -229,7 +229,7 @@ amr_outl(struct amr_softc *amr, int off, u_int32_t val)
* Match a supported device.
*/
static int
-amr_match(struct device *parent __unused, struct cfdata *match __unused,
+amr_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa;
@@ -264,7 +264,7 @@ amr_match(struct device *parent __unused, struct cfdata *match __unused,
* Attach a supported device.
*/
static void
-amr_attach(struct device *parent __unused, struct device *self, void *aux)
+amr_attach(struct device *parent, struct device *self, void *aux)
{
struct pci_attach_args *pa;
struct amr_attach_args amra;
@@ -732,7 +732,7 @@ amr_init(struct amr_softc *amr, const char *intrstr,
* shutdown time.
*/
static void
-amr_shutdown(void *cookie __unused)
+amr_shutdown(void *cookie)
{
extern struct cfdriver amr_cd;
struct amr_softc *amr;
@@ -1332,7 +1332,7 @@ amr_ccb_dump(struct amr_softc *amr, struct amr_ccb *ac)
}
static int
-amropen(dev_t dev, int flag __unused, int mode __unused, struct lwp *l __unused)
+amropen(dev_t dev, int flag, int mode, struct lwp *l)
{
struct amr_softc *amr;
@@ -1346,7 +1346,7 @@ amropen(dev_t dev, int flag __unused, int mode __unused, struct lwp *l __unused)
}
static int
-amrclose(dev_t dev, int flag __unused, int mode __unused, struct lwp *l __unused)
+amrclose(dev_t dev, int flag, int mode, struct lwp *l)
{
struct amr_softc *amr;
@@ -1356,7 +1356,7 @@ amrclose(dev_t dev, int flag __unused, int mode __unused, struct lwp *l __unused
}
static int
-amrioctl(dev_t dev, u_long cmd, caddr_t data, int flag __unused,
+amrioctl(dev_t dev, u_long cmd, caddr_t data, int flag,
struct lwp *l)
{
struct amr_softc *amr;
diff --git a/sys/dev/pci/artsata.c b/sys/dev/pci/artsata.c
index a2240219593..2128e36ff4f 100644
--- a/sys/dev/pci/artsata.c
+++ b/sys/dev/pci/artsata.c
@@ -1,4 +1,4 @@
-/* $NetBSD: artsata.c,v 1.13 2006/10/25 17:34:49 bouyer Exp $ */
+/* $NetBSD: artsata.c,v 1.14 2006/11/16 01:33:08 christos Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
#include "opt_pciide.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: artsata.c,v 1.13 2006/10/25 17:34:49 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: artsata.c,v 1.14 2006/11/16 01:33:08 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -100,7 +100,7 @@ CFATTACH_DECL(artsata, sizeof(struct pciide_softc),
artsata_match, artsata_attach, NULL, NULL);
static int
-artsata_match(struct device *parent __unused, struct cfdata *match __unused,
+artsata_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -113,7 +113,7 @@ artsata_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-artsata_attach(struct device *parent __unused, struct device *self, void *aux)
+artsata_attach(struct device *parent, struct device *self, void *aux)
{
struct pci_attach_args *pa = aux;
struct pciide_softc *sc = (struct pciide_softc *)self;
@@ -125,7 +125,7 @@ artsata_attach(struct device *parent __unused, struct device *self, void *aux)
static void
artisea_mapregs(struct pci_attach_args *pa, struct pciide_channel *cp,
- bus_size_t *cmdsizep __unused, bus_size_t *ctlsizep __unused,
+ bus_size_t *cmdsizep, bus_size_t *ctlsizep,
int (*pci_intr)(void *))
{
struct pciide_softc *sc = CHAN_TO_PCIIDE(&cp->ata_channel);
@@ -234,7 +234,7 @@ bad:
static int
artisea_chansetup(struct pciide_softc *sc, int channel,
- pcireg_t interface __unused)
+ pcireg_t interface)
{
struct pciide_channel *cp = &sc->pciide_channels[channel];
sc->wdc_chanarray[channel] = &cp->ata_channel;
diff --git a/sys/dev/pci/auacer.c b/sys/dev/pci/auacer.c
index 35fbe8281ca..d9e8607036b 100644
--- a/sys/dev/pci/auacer.c
+++ b/sys/dev/pci/auacer.c
@@ -1,4 +1,4 @@
-/* $NetBSD: auacer.c,v 1.14 2006/10/12 01:31:28 christos Exp $ */
+/* $NetBSD: auacer.c,v 1.15 2006/11/16 01:33:08 christos Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -51,7 +51,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auacer.c,v 1.14 2006/10/12 01:31:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auacer.c,v 1.15 2006/11/16 01:33:08 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -247,7 +247,7 @@ static int auacer_write_codec(void *, uint8_t, uint16_t);
static int auacer_reset_codec(void *);
static int
-auacer_match(struct device *parent __unused, struct cfdata *match __unused,
+auacer_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa;
@@ -260,7 +260,7 @@ auacer_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-auacer_attach(struct device *parent __unused, struct device *self, void *aux)
+auacer_attach(struct device *parent, struct device *self, void *aux)
{
struct auacer_softc *sc;
struct pci_attach_args *pa;
@@ -534,7 +534,7 @@ auacer_set_rate(struct auacer_softc *sc, int mode, u_int srate)
}
static int
-auacer_set_params(void *v, int setmode, int usemode __unused,
+auacer_set_params(void *v, int setmode, int usemode,
audio_params_t *play, audio_params_t *rec, stream_filter_list_t *pfil,
stream_filter_list_t *rfil)
{
@@ -592,8 +592,8 @@ auacer_set_params(void *v, int setmode, int usemode __unused,
}
static int
-auacer_round_blocksize(void *v __unused, int blk, int mode __unused,
- const audio_params_t *param __unused)
+auacer_round_blocksize(void *v, int blk, int mode,
+ const audio_params_t *param)
{
return blk & ~0x3f; /* keep good alignment */
@@ -639,7 +639,7 @@ auacer_halt_output(void *v)
}
static int
-auacer_halt_input(void *v __unused)
+auacer_halt_input(void *v)
{
DPRINTF(ALI_DEBUG_DMA, ("auacer_halt_input\n"));
@@ -688,7 +688,7 @@ auacer_query_devinfo(void *v, mixer_devinfo_t *dp)
}
static void *
-auacer_allocm(void *v, int direction __unused, size_t size,
+auacer_allocm(void *v, int direction, size_t size,
struct malloc_type *pool, int flags)
{
struct auacer_softc *sc;
@@ -732,7 +732,7 @@ auacer_freem(void *v, void *ptr, struct malloc_type *pool)
}
static size_t
-auacer_round_buffersize(void *v __unused, int direction __unused, size_t size)
+auacer_round_buffersize(void *v, int direction, size_t size)
{
if (size > (ALI_DMALIST_MAX * ALI_DMASEG_MAX))
@@ -893,7 +893,7 @@ auacer_setup_chan(struct auacer_softc *sc, struct auacer_chan *chan,
static int
auacer_trigger_output(void *v, void *start, void *end, int blksize,
- void (*intr)(void *), void *arg, const audio_params_t *param __unused)
+ void (*intr)(void *), void *arg, const audio_params_t *param)
{
struct auacer_softc *sc;
struct auacer_dma *p;
@@ -918,9 +918,9 @@ auacer_trigger_output(void *v, void *start, void *end, int blksize,
}
static int
-auacer_trigger_input(void *v __unused, void *start __unused, void *end __unused,
- int blksize __unused, void (*intr)(void *) __unused, void *arg __unused,
- const audio_params_t *param __unused)
+auacer_trigger_input(void *v, void *start, void *end,
+ int blksize, void (*intr)(void *), void *arg,
+ const audio_params_t *param)
{
return EINVAL;
}
diff --git a/sys/dev/pci/auich.c b/sys/dev/pci/auich.c
index e2dac0bae01..02fb1589e25 100644
--- a/sys/dev/pci/auich.c
+++ b/sys/dev/pci/auich.c
@@ -1,4 +1,4 @@
-/* $NetBSD: auich.c,v 1.114 2006/10/12 01:31:28 christos Exp $ */
+/* $NetBSD: auich.c,v 1.115 2006/11/16 01:33:08 christos Exp $ */
/*-
* Copyright (c) 2000, 2004, 2005 The NetBSD Foundation, Inc.
@@ -118,7 +118,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auich.c,v 1.114 2006/10/12 01:31:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auich.c,v 1.115 2006/11/16 01:33:08 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -436,7 +436,7 @@ auich_lookup(struct pci_attach_args *pa, const struct auich_devtype *auich_devic
}
static int
-auich_match(struct device *parent __unused, struct cfdata *match __unused,
+auich_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa;
@@ -451,7 +451,7 @@ auich_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-auich_attach(struct device *parent __unused, struct device *self, void *aux)
+auich_attach(struct device *parent, struct device *self, void *aux)
{
struct auich_softc *sc;
struct pci_attach_args *pa;
@@ -920,7 +920,7 @@ auich_spdif_event(void *addr, boolean_t flag)
}
static int
-auich_open(void *addr, int flags __unused)
+auich_open(void *addr, int flags)
{
struct auich_softc *sc;
@@ -975,7 +975,7 @@ auich_set_rate(struct auich_softc *sc, int mode, u_long srate)
}
static int
-auich_set_params(void *v, int setmode, int usemode __unused,
+auich_set_params(void *v, int setmode, int usemode,
audio_params_t *play, audio_params_t *rec, stream_filter_list_t *pfil,
stream_filter_list_t *rfil)
{
@@ -1049,8 +1049,8 @@ auich_set_params(void *v, int setmode, int usemode __unused,
}
static int
-auich_round_blocksize(void *v __unused, int blk, int mode __unused,
- const audio_params_t *param __unused)
+auich_round_blocksize(void *v, int blk, int mode,
+ const audio_params_t *param)
{
return blk & ~0x3f; /* keep good alignment */
@@ -1143,7 +1143,7 @@ auich_query_devinfo(void *v, mixer_devinfo_t *dp)
}
static void *
-auich_allocm(void *v, int direction __unused, size_t size,
+auich_allocm(void *v, int direction, size_t size,
struct malloc_type *pool, int flags)
{
struct auich_softc *sc;
@@ -1188,7 +1188,7 @@ auich_freem(void *v, void *ptr, struct malloc_type *pool)
}
static size_t
-auich_round_buffersize(void *v __unused, int direction __unused, size_t size)
+auich_round_buffersize(void *v, int direction, size_t size)
{
if (size > (ICH_DMALIST_MAX * ICH_DMASEG_MAX))
@@ -1404,7 +1404,7 @@ auich_intr_pipe(struct auich_softc *sc, int pipe, struct auich_ring *ring)
static int
auich_trigger_output(void *v, void *start, void *end, int blksize,
- void (*intr)(void *), void *arg, const audio_params_t *param __unused)
+ void (*intr)(void *), void *arg, const audio_params_t *param)
{
struct auich_softc *sc;
struct auich_dma *p;
@@ -1440,7 +1440,7 @@ auich_trigger_output(void *v, void *start, void *end, int blksize,
static int
auich_trigger_input(void *v, void *start, void *end, int blksize,
- void (*intr)(void *), void *arg, const audio_params_t *param __unused)
+ void (*intr)(void *), void *arg, const audio_params_t *param)
{
struct auich_softc *sc;
struct auich_dma *p;
@@ -1475,7 +1475,7 @@ auich_trigger_input(void *v, void *start, void *end, int blksize,
}
static int
-auich_powerstate(void *v __unused, int state __unused)
+auich_powerstate(void *v, int state)
{
#if notyet
struct auich_softc *sc;
diff --git a/sys/dev/pci/auixp.c b/sys/dev/pci/auixp.c
index 7eb1900eed4..8843c23e7ea 100644
--- a/sys/dev/pci/auixp.c
+++ b/sys/dev/pci/auixp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: auixp.c,v 1.20 2006/10/12 01:31:28 christos Exp $ */
+/* $NetBSD: auixp.c,v 1.21 2006/11/16 01:33:08 christos Exp $ */
/*
* Copyright (c) 2004, 2005 Reinoud Zandijk <reinoud@netbsd.org>
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auixp.c,v 1.20 2006/10/12 01:31:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auixp.c,v 1.21 2006/11/16 01:33:08 christos Exp $");
#include <sys/types.h>
#include <sys/errno.h>
@@ -382,7 +382,7 @@ auixp_commit_settings(void *hdl)
/* set audio properties in desired setting */
static int
-auixp_set_params(void *hdl, int setmode, int usemode __unused,
+auixp_set_params(void *hdl, int setmode, int usemode,
audio_params_t *play, audio_params_t *rec, stream_filter_list_t *pfil,
stream_filter_list_t *rfil)
{
@@ -444,8 +444,8 @@ auixp_set_params(void *hdl, int setmode, int usemode __unused,
/* called to translate a requested blocksize to a hw-possible one */
static int
-auixp_round_blocksize(void *hdl __unused, int bs, int mode __unused,
- const audio_params_t *param __unused)
+auixp_round_blocksize(void *hdl, int bs, int mode,
+ const audio_params_t *param)
{
uint32_t new_bs;
@@ -466,7 +466,7 @@ auixp_round_blocksize(void *hdl __unused, int bs, int mode __unused,
* kernel virtual address we return here as a reference to the mapping.
*/
static void *
-auixp_malloc(void *hdl, int direction __unused, size_t size,
+auixp_malloc(void *hdl, int direction, size_t size,
struct malloc_type *type, int flags)
{
struct auixp_codec *co;
@@ -527,7 +527,7 @@ auixp_free(void *hdl, void *addr, struct malloc_type *type)
static int
-auixp_getdev(void *hdl __unused, struct audio_device *ret)
+auixp_getdev(void *hdl, struct audio_device *ret)
{
*ret = auixp_device;
@@ -568,7 +568,7 @@ auixp_query_devinfo(void *hdl, mixer_devinfo_t *di)
static size_t
-auixp_round_buffersize(void *hdl __unused, int direction __unused,
+auixp_round_buffersize(void *hdl, int direction,
size_t bufsize)
{
@@ -578,7 +578,7 @@ auixp_round_buffersize(void *hdl __unused, int direction __unused,
static int
-auixp_get_props(void *hdl __unused)
+auixp_get_props(void *hdl)
{
return AUDIO_PROP_MMAP | AUDIO_PROP_INDEPENDENT | AUDIO_PROP_FULLDUPLEX;
@@ -753,7 +753,7 @@ auixp_update_busbusy(struct auixp_softc *sc)
/* XXX allmost literaly a copy of trigger-input; could be factorised XXX */
static int
auixp_trigger_output(void *hdl, void *start, void *end, int blksize,
- void (*intr)(void *), void *intrarg, const audio_params_t *param __unused)
+ void (*intr)(void *), void *intrarg, const audio_params_t *param)
{
struct auixp_codec *co;
struct auixp_softc *sc;
@@ -828,7 +828,7 @@ auixp_halt_output(void *hdl)
/* XXX allmost literaly a copy of trigger-output; could be factorised XXX */
static int
auixp_trigger_input(void *hdl, void *start, void *end, int blksize,
- void (*intr)(void *), void *intrarg, const audio_params_t *param __unused)
+ void (*intr)(void *), void *intrarg, const audio_params_t *param)
{
struct auixp_codec *co;
struct auixp_softc *sc;
@@ -1074,7 +1074,7 @@ auixp_mappage(void *hdl, void *mem, off_t off, int prot)
/* Is it my hardware? */
static int
-auixp_match(struct device *dev __unused, struct cfdata *match __unused,
+auixp_match(struct device *dev, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa;
@@ -1096,7 +1096,7 @@ auixp_match(struct device *dev __unused, struct cfdata *match __unused,
/* it is... now hook up and set up the resources we need */
static void
-auixp_attach(struct device *parent __unused, struct device *self, void *aux)
+auixp_attach(struct device *parent, struct device *self, void *aux)
{
struct auixp_softc *sc;
struct pci_attach_args *pa;
@@ -1503,7 +1503,7 @@ auixp_write_codec(void *aux, uint8_t reg, uint16_t data)
static int
-auixp_reset_codec(void *aux __unused)
+auixp_reset_codec(void *aux)
{
/* nothing to be done? */
diff --git a/sys/dev/pci/autri.c b/sys/dev/pci/autri.c
index ef57d5b5731..167707a5f63 100644
--- a/sys/dev/pci/autri.c
+++ b/sys/dev/pci/autri.c
@@ -1,4 +1,4 @@
-/* $NetBSD: autri.c,v 1.33 2006/10/12 01:31:28 christos Exp $ */
+/* $NetBSD: autri.c,v 1.34 2006/11/16 01:33:08 christos Exp $ */
/*
* Copyright (c) 2001 SOMEYA Yoshihiko and KUROSAWA Takahiro.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autri.c,v 1.33 2006/10/12 01:31:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autri.c,v 1.34 2006/11/16 01:33:08 christos Exp $");
#include "midi.h"
@@ -463,7 +463,7 @@ autri_reset_codec(void *sc_)
}
static enum ac97_host_flags
-autri_flags_codec(void *sc __unused)
+autri_flags_codec(void *sc)
{
return AC97_HOST_DONT_READ;
}
@@ -473,7 +473,7 @@ autri_flags_codec(void *sc __unused)
*/
static int
-autri_match(struct device *parent __unused, struct cfdata *match __unused,
+autri_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa;
@@ -512,7 +512,7 @@ autri_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-autri_attach(struct device *parent __unused, struct device *self, void *aux)
+autri_attach(struct device *parent, struct device *self, void *aux)
{
struct autri_softc *sc;
struct pci_attach_args *pa;
@@ -897,7 +897,7 @@ autri_freemem(struct autri_softc *sc, struct autri_dma *p)
}
static int
-autri_open(void *addr __unused, int flags __unused)
+autri_open(void *addr, int flags)
{
DPRINTF(("autri_open()\n"));
DPRINTFN(5,("MISCINT : 0x%08X\n",
@@ -908,7 +908,7 @@ autri_open(void *addr __unused, int flags __unused)
}
static int
-autri_query_encoding(void *addr __unused, struct audio_encoding *fp)
+autri_query_encoding(void *addr, struct audio_encoding *fp)
{
switch (fp->index) {
@@ -968,7 +968,7 @@ autri_query_encoding(void *addr __unused, struct audio_encoding *fp)
}
static int
-autri_set_params(void *addr __unused, int setmode, int usemode __unused,
+autri_set_params(void *addr, int setmode, int usemode,
audio_params_t *play, audio_params_t *rec, stream_filter_list_t *pfil,
stream_filter_list_t *rfil)
{
@@ -986,8 +986,8 @@ autri_set_params(void *addr __unused, int setmode, int usemode __unused,
}
static int
-autri_round_blocksize(void *addr __unused, int block,
- int mode __unused, const audio_params_t *param __unused)
+autri_round_blocksize(void *addr, int block,
+ int mode, const audio_params_t *param)
{
return block & -4;
}
@@ -1082,7 +1082,7 @@ autri_query_devinfo(void *addr, mixer_devinfo_t *dip)
}
static void *
-autri_malloc(void *addr, int direction __unused, size_t size,
+autri_malloc(void *addr, int direction, size_t size,
struct malloc_type *pool, int flags)
{
struct autri_softc *sc;
@@ -1136,7 +1136,7 @@ autri_find_dma(struct autri_softc *sc, void *addr)
}
static size_t
-autri_round_buffersize(void *addr __unused, int direction __unused, size_t size)
+autri_round_buffersize(void *addr, int direction, size_t size)
{
return size;
@@ -1160,7 +1160,7 @@ autri_mappage(void *addr, void *mem, off_t off, int prot)
}
static int
-autri_get_props(void *addr __unused)
+autri_get_props(void *addr)
{
return AUDIO_PROP_MMAP | AUDIO_PROP_INDEPENDENT |
AUDIO_PROP_FULLDUPLEX;
@@ -1489,7 +1489,7 @@ autri_midi_close(void *addr)
}
static int
-autri_midi_output(void *addr __unused, int d)
+autri_midi_output(void *addr, int d)
{
struct autri_softc *sc;
int x;
@@ -1506,7 +1506,7 @@ autri_midi_output(void *addr __unused, int d)
}
static void
-autri_midi_getinfo(void *addr __unused, struct midi_info *mi)
+autri_midi_getinfo(void *addr, struct midi_info *mi)
{
mi->name = "4DWAVE MIDI UART";
diff --git a/sys/dev/pci/auvia.c b/sys/dev/pci/auvia.c
index 1748b50af88..9b4b8284ca5 100644
--- a/sys/dev/pci/auvia.c
+++ b/sys/dev/pci/auvia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: auvia.c,v 1.57 2006/10/12 01:31:28 christos Exp $ */
+/* $NetBSD: auvia.c,v 1.58 2006/11/16 01:33:08 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auvia.c,v 1.57 2006/10/12 01:31:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auvia.c,v 1.58 2006/11/16 01:33:08 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -270,7 +270,7 @@ static const struct audio_format auvia_spdif_formats[AUVIA_SPDIF_NFORMATS] = {
static int
-auvia_match(struct device *parent __unused, struct cfdata *match __unused,
+auvia_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa;
@@ -290,7 +290,7 @@ auvia_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-auvia_attach(struct device *parent __unused, struct device *self, void *aux)
+auvia_attach(struct device *parent, struct device *self, void *aux)
{
struct pci_attach_args *pa;
struct auvia_softc *sc;
@@ -584,7 +584,7 @@ auvia_spdif_event(void *addr, boolean_t flag)
}
static int
-auvia_open(void *addr, int flags __unused)
+auvia_open(void *addr, int flags)
{
struct auvia_softc *sc;
@@ -653,7 +653,7 @@ auvia_set_params_sub(struct auvia_softc *sc, struct auvia_softc_chan *ch,
}
static int
-auvia_set_params(void *addr, int setmode, int usemode __unused,
+auvia_set_params(void *addr, int setmode, int usemode,
audio_params_t *play, audio_params_t *rec, stream_filter_list_t *pfil,
stream_filter_list_t *rfil)
{
@@ -720,7 +720,7 @@ auvia_set_params(void *addr, int setmode, int usemode __unused,
static int
auvia_round_blocksize(void *addr, int blk,
- int mode __unused, const audio_params_t *param __unused)
+ int mode, const audio_params_t *param)
{
struct auvia_softc *sc;
@@ -807,7 +807,7 @@ auvia_query_devinfo(void *addr, mixer_devinfo_t *dip)
}
static void *
-auvia_malloc(void *addr, int direction __unused, size_t size,
+auvia_malloc(void *addr, int direction, size_t size,
struct malloc_type * pool, int flags)
{
struct auvia_softc *sc;
@@ -888,7 +888,7 @@ auvia_free(void *addr, void *ptr, struct malloc_type *pool)
}
static size_t
-auvia_round_buffersize(void *addr __unused, int direction __unused, size_t size)
+auvia_round_buffersize(void *addr, int direction, size_t size)
{
return size;
@@ -995,7 +995,7 @@ auvia_build_dma_ops(struct auvia_softc *sc, struct auvia_softc_chan *ch,
static int
auvia_trigger_output(void *addr, void *start, void *end, int blksize,
- void (*intr)(void *), void *arg, const audio_params_t *param __unused)
+ void (*intr)(void *), void *arg, const audio_params_t *param)
{
struct auvia_softc *sc;
struct auvia_softc_chan *ch;
@@ -1038,7 +1038,7 @@ auvia_trigger_output(void *addr, void *start, void *end, int blksize,
static int
auvia_trigger_input(void *addr, void *start, void *end, int blksize,
- void (*intr)(void *), void *arg, const audio_params_t *param __unused)
+ void (*intr)(void *), void *arg, const audio_params_t *param)
{
struct auvia_softc *sc;
struct auvia_softc_chan *ch;
diff --git a/sys/dev/pci/azalia.c b/sys/dev/pci/azalia.c
index 87151eece30..18dc399f3e2 100644
--- a/sys/dev/pci/azalia.c
+++ b/sys/dev/pci/azalia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: azalia.c,v 1.41 2006/10/12 01:31:28 christos Exp $ */
+/* $NetBSD: azalia.c,v 1.42 2006/11/16 01:33:08 christos Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: azalia.c,v 1.41 2006/10/12 01:31:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: azalia.c,v 1.42 2006/11/16 01:33:08 christos Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -276,7 +276,7 @@ static const char *pin_devices[16] = {
#define PCIID_VT8237A PCI_ID_CODE0(VIATECH, VT8237A_HDA)
static int
-azalia_pci_match(struct device *parent __unused, struct cfdata *match __unused,
+azalia_pci_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa;
@@ -289,7 +289,7 @@ azalia_pci_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-azalia_pci_attach(struct device *parent __unused, struct device *self,
+azalia_pci_attach(struct device *parent, struct device *self,
void *aux)
{
azalia_t *sc;
@@ -1861,7 +1861,7 @@ azalia_stream_intr(stream_t *this, uint32_t intsts)
* ================================================================ */
static int
-azalia_open(void *v, int flags __unused)
+azalia_open(void *v, int flags)
{
azalia_t *az;
codec_t *codec;
@@ -1897,7 +1897,7 @@ azalia_query_encoding(void *v, audio_encoding_t *enc)
}
static int
-azalia_set_params(void *v, int smode, int umode __unused, audio_params_t *p,
+azalia_set_params(void *v, int smode, int umode, audio_params_t *p,
audio_params_t *r, stream_filter_list_t *pfil, stream_filter_list_t *rfil)
{
azalia_t *az;
@@ -1923,7 +1923,7 @@ azalia_set_params(void *v, int smode, int umode __unused, audio_params_t *p,
static int
azalia_round_blocksize(void *v, int blk, int mode,
- const audio_params_t *param __unused)
+ const audio_params_t *param)
{
azalia_t *az;
size_t size;
@@ -2019,8 +2019,8 @@ azalia_query_devinfo(void *v, mixer_devinfo_t *mdev)
}
static void *
-azalia_allocm(void *v, int dir, size_t size, struct malloc_type *pool __unused,
- int flags __unused)
+azalia_allocm(void *v, int dir, size_t size, struct malloc_type *pool,
+ int flags)
{
azalia_t *az;
stream_t *stream;
@@ -2035,7 +2035,7 @@ azalia_allocm(void *v, int dir, size_t size, struct malloc_type *pool __unused,
}
static void
-azalia_freem(void *v, void *addr, struct malloc_type *pool __unused)
+azalia_freem(void *v, void *addr, struct malloc_type *pool)
{
azalia_t *az;
stream_t *stream;
@@ -2052,7 +2052,7 @@ azalia_freem(void *v, void *addr, struct malloc_type *pool __unused)
}
static size_t
-azalia_round_buffersize(void *v __unused, int dir __unused, size_t size)
+azalia_round_buffersize(void *v, int dir, size_t size)
{
size &= ~0x7f; /* must be multiple of 128 */
if (size <= 0)
@@ -2061,7 +2061,7 @@ azalia_round_buffersize(void *v __unused, int dir __unused, size_t size)
}
static int
-azalia_get_props(void *v __unused)
+azalia_get_props(void *v)
{
return AUDIO_PROP_INDEPENDENT | AUDIO_PROP_FULLDUPLEX;
}
diff --git a/sys/dev/pci/azalia_codec.c b/sys/dev/pci/azalia_codec.c
index b4882e0a369..0f833ac21eb 100644
--- a/sys/dev/pci/azalia_codec.c
+++ b/sys/dev/pci/azalia_codec.c
@@ -1,4 +1,4 @@
-/* $NetBSD: azalia_codec.c,v 1.26 2006/10/12 01:31:28 christos Exp $ */
+/* $NetBSD: azalia_codec.c,v 1.27 2006/11/16 01:33:08 christos Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: azalia_codec.c,v 1.26 2006/10/12 01:31:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: azalia_codec.c,v 1.27 2006/11/16 01:33:08 christos Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -1535,8 +1535,8 @@ generic_mixer_to_device_value(const codec_t *this, nid_t nid, int target,
}
static uint32_t
-generic_mixer_max(const codec_t *this __unused, nid_t nid __unused,
- int target __unused)
+generic_mixer_max(const codec_t *this, nid_t nid,
+ int target)
{
#ifdef MAX_VOLUME_255
return AUDIO_MAX_GAIN;
@@ -1554,8 +1554,8 @@ generic_mixer_max(const codec_t *this __unused, nid_t nid __unused,
}
static boolean_t
-generic_mixer_validate_value(const codec_t *this __unused, nid_t nid __unused,
- int target __unused, u_char uv __unused)
+generic_mixer_validate_value(const codec_t *this, nid_t nid,
+ int target, u_char uv)
{
#ifdef MAX_VOLUME_255
return TRUE;
@@ -2366,7 +2366,7 @@ alc882_get_port(codec_t *this, mixer_ctrl_t *mc)
#define AD1981HD_THINKPAD 0x201017aa
static int
-ad1981hd_init_widget(const codec_t *this __unused, widget_t *w, nid_t nid)
+ad1981hd_init_widget(const codec_t *this, widget_t *w, nid_t nid)
{
switch (nid) {
case 0x05:
diff --git a/sys/dev/pci/bha_pci.c b/sys/dev/pci/bha_pci.c
index e43f1bab9cc..0a97fe20c93 100644
--- a/sys/dev/pci/bha_pci.c
+++ b/sys/dev/pci/bha_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bha_pci.c,v 1.29 2006/10/12 01:31:28 christos Exp $ */
+/* $NetBSD: bha_pci.c,v 1.30 2006/11/16 01:33:08 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bha_pci.c,v 1.29 2006/10/12 01:31:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bha_pci.c,v 1.30 2006/11/16 01:33:08 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -63,7 +63,7 @@ __KERNEL_RCSID(0, "$NetBSD: bha_pci.c,v 1.29 2006/10/12 01:31:28 christos Exp $"
* the actual probe routine to check it out.
*/
static int
-bha_pci_match(struct device *parent __unused, struct cfdata *match __unused,
+bha_pci_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -94,7 +94,7 @@ bha_pci_match(struct device *parent __unused, struct cfdata *match __unused,
* Attach all the sub-devices we can find
*/
static void
-bha_pci_attach(struct device *parent __unused, struct device *self, void *aux)
+bha_pci_attach(struct device *parent, struct device *self, void *aux)
{
struct pci_attach_args *pa = aux;
struct bha_softc *sc = (void *)self;
diff --git a/sys/dev/pci/bktr/bktr_card.c b/sys/dev/pci/bktr/bktr_card.c
index 59e1852875c..2e20122667c 100644
--- a/sys/dev/pci/bktr/bktr_card.c
+++ b/sys/dev/pci/bktr/bktr_card.c
@@ -1,6 +1,6 @@
/* $SourceForge: bktr_card.c,v 1.3 2003/03/11 23:11:21 thomasklausner Exp $ */
-/* $NetBSD: bktr_card.c,v 1.22 2006/10/12 01:31:49 christos Exp $ */
+/* $NetBSD: bktr_card.c,v 1.23 2006/11/16 01:33:20 christos Exp $ */
/* $FreeBSD: src/sys/dev/bktr/bktr_card.c,v 1.16 2000/10/31 13:09:56 roger Exp$ */
/*
@@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bktr_card.c,v 1.22 2006/10/12 01:31:49 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bktr_card.c,v 1.23 2006/11/16 01:33:20 christos Exp $");
#include "opt_bktr.h" /* Include any kernel config options */
@@ -376,8 +376,8 @@ struct bt848_card_sig bt848_card_signature[1]= {
* implemented.
*/
int
-writeEEProm(bktr_ptr_t bktr __unused, int offset __unused, int count __unused,
- u_char *data __unused)
+writeEEProm(bktr_ptr_t bktr, int offset, int count,
+ u_char *data)
{
return(-1);
}
@@ -429,7 +429,7 @@ readEEProm(bktr_ptr_t bktr, int offset, int count, u_char *data)
* XXX FIXME: use offset & count args
*/
int
-signCard(bktr_ptr_t bktr, int offset __unused, int count, u_char* sig)
+signCard(bktr_ptr_t bktr, int offset, int count, u_char* sig)
{
int x;
@@ -567,7 +567,7 @@ static int locate_eeprom_address(bktr_ptr_t bktr) {
#define MODEL_TERRATVALUE_1134 0x1134
void
-probeCard(bktr_ptr_t bktr, int verbose, int unit __unused)
+probeCard(bktr_ptr_t bktr, int verbose, int unit)
{
int card, i,j, card_found;
int status;
diff --git a/sys/dev/pci/bktr/bktr_core.c b/sys/dev/pci/bktr/bktr_core.c
index f34c3c487f1..b21f65be09a 100644
--- a/sys/dev/pci/bktr/bktr_core.c
+++ b/sys/dev/pci/bktr/bktr_core.c
@@ -1,6 +1,6 @@
/* $SourceForge: bktr_core.c,v 1.6 2003/03/11 23:11:22 thomasklausner Exp $ */
-/* $NetBSD: bktr_core.c,v 1.39 2006/10/12 01:31:49 christos Exp $ */
+/* $NetBSD: bktr_core.c,v 1.40 2006/11/16 01:33:20 christos Exp $ */
/* $FreeBSD: src/sys/dev/bktr/bktr_core.c,v 1.114 2000/10/31 13:09:56 roger Exp$ */
/*
@@ -98,7 +98,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bktr_core.c,v 1.39 2006/10/12 01:31:49 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bktr_core.c,v 1.40 2006/11/16 01:33:20 christos Exp $");
#include "opt_bktr.h" /* Include any kernel config options */
@@ -1177,7 +1177,7 @@ vbi_close(bktr_ptr_t bktr)
*
*/
int
-video_read(bktr_ptr_t bktr, int unit __unused, dev_t dev __unused,
+video_read(bktr_ptr_t bktr, int unit, dev_t dev,
struct uio *uio)
{
int status;
@@ -1293,7 +1293,7 @@ int
video_ioctl(bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct thread* td)
#else
int
-video_ioctl(bktr_ptr_t bktr, int unit __unused, ioctl_cmd_t cmd, caddr_t arg,
+video_ioctl(bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg,
struct lwp* l)
#endif
{
@@ -1916,8 +1916,8 @@ int
tuner_ioctl(bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct thread* td)
#else
int
-tuner_ioctl(bktr_ptr_t bktr, int unit __unused, ioctl_cmd_t cmd, caddr_t arg,
- struct lwp* l __unused)
+tuner_ioctl(bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg,
+ struct lwp* l)
#endif
{
int tmp_int;
diff --git a/sys/dev/pci/bktr/bktr_os.c b/sys/dev/pci/bktr/bktr_os.c
index 6fc9b164f7d..a3ef444c875 100644
--- a/sys/dev/pci/bktr/bktr_os.c
+++ b/sys/dev/pci/bktr/bktr_os.c
@@ -1,6 +1,6 @@
/* $SourceForge: bktr_os.c,v 1.5 2003/03/11 23:11:25 thomasklausner Exp $ */
-/* $NetBSD: bktr_os.c,v 1.44 2006/10/12 01:31:49 christos Exp $ */
+/* $NetBSD: bktr_os.c,v 1.45 2006/11/16 01:33:20 christos Exp $ */
/* $FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.20 2000/10/20 08:16:53 roger Exp$ */
/*
@@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bktr_os.c,v 1.44 2006/10/12 01:31:49 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bktr_os.c,v 1.45 2006/11/16 01:33:20 christos Exp $");
#ifdef __FreeBSD__
#include "bktr.h"
@@ -1359,7 +1359,7 @@ static struct radio_hw_if bktr_hw_if = {
#endif
int
-bktr_probe(struct device *parent __unused, struct cfdata *match __unused,
+bktr_probe(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -1379,7 +1379,7 @@ bktr_probe(struct device *parent __unused, struct cfdata *match __unused,
* the attach routine.
*/
static void
-bktr_attach(struct device *parent __unused, struct device *self, void *aux)
+bktr_attach(struct device *parent, struct device *self, void *aux)
{
bktr_ptr_t bktr;
u_long latency;
@@ -1649,8 +1649,8 @@ free_bktr_mem(bktr, dmap, kva)
*
*/
int
-bktr_open(dev_t dev, int flags __unused, int fmt __unused,
- struct lwp *l __unused)
+bktr_open(dev_t dev, int flags, int fmt,
+ struct lwp *l)
{
bktr_ptr_t bktr;
int unit;
@@ -1683,8 +1683,8 @@ bktr_open(dev_t dev, int flags __unused, int fmt __unused,
*
*/
int
-bktr_close(dev_t dev, int flags __unused, int fmt __unused,
- struct lwp *l __unused)
+bktr_close(dev_t dev, int flags, int fmt,
+ struct lwp *l)
{
bktr_ptr_t bktr;
int unit;
@@ -1733,7 +1733,7 @@ bktr_read(dev_t dev, struct uio *uio, int ioflag)
*
*/
int
-bktr_write(dev_t dev __unused, struct uio *uio __unused, int ioflag __unused)
+bktr_write(dev_t dev, struct uio *uio, int ioflag)
{
/* operation not supported */
return(EOPNOTSUPP);
@@ -1743,7 +1743,7 @@ bktr_write(dev_t dev __unused, struct uio *uio __unused, int ioflag __unused)
*
*/
int
-bktr_ioctl(dev_t dev, ioctl_cmd_t cmd, caddr_t arg, int flag __unused,
+bktr_ioctl(dev_t dev, ioctl_cmd_t cmd, caddr_t arg, int flag,
struct lwp *l)
{
bktr_ptr_t bktr;
diff --git a/sys/dev/pci/cac_pci.c b/sys/dev/pci/cac_pci.c
index 786031d0234..003445dbb2f 100644
--- a/sys/dev/pci/cac_pci.c
+++ b/sys/dev/pci/cac_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cac_pci.c,v 1.22 2006/10/12 01:31:28 christos Exp $ */
+/* $NetBSD: cac_pci.c,v 1.23 2006/11/16 01:33:08 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cac_pci.c,v 1.22 2006/10/12 01:31:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cac_pci.c,v 1.23 2006/11/16 01:33:08 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -137,7 +137,7 @@ cac_pci_findtype(struct pci_attach_args *pa)
}
static int
-cac_pci_match(struct device *parent __unused, struct cfdata *match __unused,
+cac_pci_match(struct device *parent, struct cfdata *match,
void *aux)
{
@@ -145,7 +145,7 @@ cac_pci_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-cac_pci_attach(struct device *parent __unused, struct device *self, void *aux)
+cac_pci_attach(struct device *parent, struct device *self, void *aux)
{
struct pci_attach_args *pa;
const struct cac_pci_type *ct;
diff --git a/sys/dev/pci/ciss_pci.c b/sys/dev/pci/ciss_pci.c
index 4631cf2360f..bb55a7e9a09 100644
--- a/sys/dev/pci/ciss_pci.c
+++ b/sys/dev/pci/ciss_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ciss_pci.c,v 1.2 2006/10/12 01:31:28 christos Exp $ */
+/* $NetBSD: ciss_pci.c,v 1.3 2006/11/16 01:33:08 christos Exp $ */
/* $OpenBSD: ciss_pci.c,v 1.9 2005/12/13 15:56:01 brad Exp $ */
/*
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ciss_pci.c,v 1.2 2006/10/12 01:31:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ciss_pci.c,v 1.3 2006/11/16 01:33:08 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -225,7 +225,7 @@ const struct {
};
int
-ciss_pci_match(struct device *parent __unused, struct cfdata *match __unused,
+ciss_pci_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -245,7 +245,7 @@ ciss_pci_match(struct device *parent __unused, struct cfdata *match __unused,
}
void
-ciss_pci_attach(struct device *parent __unused, struct device *self, void *aux)
+ciss_pci_attach(struct device *parent, struct device *self, void *aux)
{
struct ciss_softc *sc = (struct ciss_softc *)self;
struct pci_attach_args *pa = aux;
diff --git a/sys/dev/pci/cmdide.c b/sys/dev/pci/cmdide.c
index d4172d27f8e..9e32ea9fd71 100644
--- a/sys/dev/pci/cmdide.c
+++ b/sys/dev/pci/cmdide.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cmdide.c,v 1.24 2006/10/12 01:31:28 christos Exp $ */
+/* $NetBSD: cmdide.c,v 1.25 2006/11/16 01:33:08 christos Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Manuel Bouyer.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cmdide.c,v 1.24 2006/10/12 01:31:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cmdide.c,v 1.25 2006/11/16 01:33:08 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -100,7 +100,7 @@ static const struct pciide_product_desc pciide_cmd_products[] = {
};
static int
-cmdide_match(struct device *parent __unused, struct cfdata *match __unused,
+cmdide_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -113,7 +113,7 @@ cmdide_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-cmdide_attach(struct device *parent __unused, struct device *self, void *aux)
+cmdide_attach(struct device *parent, struct device *self, void *aux)
{
struct pci_attach_args *pa = aux;
struct pciide_softc *sc = (struct pciide_softc *)self;
diff --git a/sys/dev/pci/cmpci.c b/sys/dev/pci/cmpci.c
index e09784647f4..c7fde5c7828 100644
--- a/sys/dev/pci/cmpci.c
+++ b/sys/dev/pci/cmpci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cmpci.c,v 1.33 2006/10/12 01:31:28 christos Exp $ */
+/* $NetBSD: cmpci.c,v 1.34 2006/11/16 01:33:08 christos Exp $ */
/*
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cmpci.c,v 1.33 2006/10/12 01:31:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cmpci.c,v 1.34 2006/11/16 01:33:08 christos Exp $");
#if defined(AUDIO_DEBUG) || defined(DEBUG)
#define DPRINTF(x) if (cmpcidebug) printf x
@@ -359,7 +359,7 @@ cmpci_index_to_divider(int index)
* interface to configure the device.
*/
static int
-cmpci_match(struct device *parent __unused, struct cfdata *match __unused,
+cmpci_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa;
@@ -376,7 +376,7 @@ cmpci_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-cmpci_attach(struct device *parent __unused, struct device *self, void *aux)
+cmpci_attach(struct device *parent, struct device *self, void *aux)
{
struct cmpci_softc *sc;
struct pci_attach_args *pa;
@@ -570,7 +570,7 @@ cmpci_intr(void *handle)
}
static int
-cmpci_query_encoding(void *handle __unused, struct audio_encoding *fp)
+cmpci_query_encoding(void *handle, struct audio_encoding *fp)
{
switch (fp->index) {
@@ -630,7 +630,7 @@ cmpci_query_encoding(void *handle __unused, struct audio_encoding *fp)
static int
-cmpci_set_params(void *handle, int setmode, int usemode __unused,
+cmpci_set_params(void *handle, int setmode, int usemode,
audio_params_t *play, audio_params_t *rec, stream_filter_list_t *pfil,
stream_filter_list_t *rfil)
{
@@ -710,8 +710,8 @@ cmpci_set_params(void *handle, int setmode, int usemode __unused,
/* ARGSUSED */
static int
-cmpci_round_blocksize(void *handle __unused, int block,
- int mode __unused, const audio_params_t *param __unused)
+cmpci_round_blocksize(void *handle, int block,
+ int mode, const audio_params_t *param)
{
return block & -4;
@@ -1110,7 +1110,7 @@ cmpci_print_dmamem(struct cmpci_dmanode *p)
#endif /* DEBUG */
static void *
-cmpci_allocm(void *handle, int direction __unused, size_t size,
+cmpci_allocm(void *handle, int direction, size_t size,
struct malloc_type *type, int flags)
{
caddr_t addr;
@@ -1637,7 +1637,7 @@ cmpci_get_port(void *handle, mixer_ctrl_t *cp)
/* ARGSUSED */
static size_t
-cmpci_round_buffersize(void *handle __unused, int direction __unused,
+cmpci_round_buffersize(void *handle, int direction,
size_t bufsize)
{
@@ -1662,7 +1662,7 @@ cmpci_mappage(void *handle, void *addr, off_t offset, int prot)
/* ARGSUSED */
static int
-cmpci_get_props(void *handle __unused)
+cmpci_get_props(void *handle)
{
return AUDIO_PROP_MMAP | AUDIO_PROP_INDEPENDENT | AUDIO_PROP_FULLDUPLEX;
diff --git a/sys/dev/pci/com_puc.c b/sys/dev/pci/com_puc.c
index d2fc3d81580..1bd30a07d8a 100644
--- a/sys/dev/pci/com_puc.c
+++ b/sys/dev/pci/com_puc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com_puc.c,v 1.15 2006/10/12 01:31:28 christos Exp $ */
+/* $NetBSD: com_puc.c,v 1.16 2006/11/16 01:33:08 christos Exp $ */
/*
* Copyright (c) 1998 Christopher G. Demetriou. All rights reserved.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_puc.c,v 1.15 2006/10/12 01:31:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_puc.c,v 1.16 2006/11/16 01:33:08 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -61,7 +61,7 @@ struct com_puc_softc {
};
static int
-com_puc_probe(struct device *parent __unused, struct cfdata *match __unused,
+com_puc_probe(struct device *parent, struct cfdata *match,
void *aux)
{
struct puc_attach_args *aa = aux;
@@ -76,7 +76,7 @@ com_puc_probe(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-com_puc_attach(struct device *parent __unused, struct device *self, void *aux)
+com_puc_attach(struct device *parent, struct device *self, void *aux)
{
struct com_puc_softc *psc = (void *)self;
struct com_softc *sc = &psc->sc_com;
diff --git a/sys/dev/pci/cs4280.c b/sys/dev/pci/cs4280.c
index 61ca8f844eb..b956e3ccac3 100644
--- a/sys/dev/pci/cs4280.c
+++ b/sys/dev/pci/cs4280.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cs4280.c,v 1.44 2006/10/12 01:31:28 christos Exp $ */
+/* $NetBSD: cs4280.c,v 1.45 2006/11/16 01:33:08 christos Exp $ */
/*
* Copyright (c) 1999, 2000 Tatoku Ogaito. All rights reserved.
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cs4280.c,v 1.44 2006/10/12 01:31:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs4280.c,v 1.45 2006/11/16 01:33:08 christos Exp $");
#include "midi.h"
@@ -218,7 +218,7 @@ static struct audio_device cs4280_device = {
static int
-cs4280_match(struct device *parent __unused, struct cfdata *match __unused,
+cs4280_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa;
@@ -236,7 +236,7 @@ cs4280_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-cs4280_attach(struct device *parent __unused, struct device *self, void *aux)
+cs4280_attach(struct device *parent, struct device *self, void *aux)
{
struct cs428x_softc *sc;
struct pci_attach_args *pa;
@@ -548,7 +548,7 @@ cs4280_intr(void *p)
}
static int
-cs4280_query_encoding(void *addr __unused, struct audio_encoding *fp)
+cs4280_query_encoding(void *addr, struct audio_encoding *fp)
{
switch (fp->index) {
case 0:
@@ -606,7 +606,7 @@ cs4280_query_encoding(void *addr __unused, struct audio_encoding *fp)
}
static int
-cs4280_set_params(void *addr, int setmode, int usemode __unused,
+cs4280_set_params(void *addr, int setmode, int usemode,
audio_params_t *play, audio_params_t *rec, stream_filter_list_t *pfil,
stream_filter_list_t *rfil)
{
@@ -740,7 +740,7 @@ cs4280_halt_input(void *addr)
}
static int
-cs4280_getdev(void *addr __unused, struct audio_device *retp)
+cs4280_getdev(void *addr, struct audio_device *retp)
{
*retp = cs4280_device;
@@ -1593,7 +1593,7 @@ cs4280_clear_fifos(struct cs428x_softc *sc)
#if NMIDI > 0
static int
-cs4280_midi_open(void *addr, int flags __unused, void (*iintr)(void *, int),
+cs4280_midi_open(void *addr, int flags, void (*iintr)(void *, int),
void (*ointr)(void *), void *arg)
{
struct cs428x_softc *sc;
@@ -1665,7 +1665,7 @@ cs4280_midi_output(void *addr, int d)
}
static void
-cs4280_midi_getinfo(void *addr __unused, struct midi_info *mi)
+cs4280_midi_getinfo(void *addr, struct midi_info *mi)
{
mi->name = "CS4280 MIDI UART";
diff --git a/sys/dev/pci/cs4281.c b/sys/dev/pci/cs4281.c
index 3b607bff39e..7b86f8a82e3 100644
--- a/sys/dev/pci/cs4281.c
+++ b/sys/dev/pci/cs4281.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cs4281.c,v 1.32 2006/10/12 01:31:28 christos Exp $ */
+/* $NetBSD: cs4281.c,v 1.33 2006/11/16 01:33:08 christos Exp $ */
/*
* Copyright (c) 2000 Tatoku Ogaito. All rights reserved.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cs4281.c,v 1.32 2006/10/12 01:31:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs4281.c,v 1.33 2006/11/16 01:33:08 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -167,7 +167,7 @@ static struct audio_device cs4281_device = {
static int
-cs4281_match(struct device *parent __unused, struct cfdata *match __unused,
+cs4281_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa;
@@ -181,7 +181,7 @@ cs4281_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-cs4281_attach(struct device *parent __unused, struct device *self, void *aux)
+cs4281_attach(struct device *parent, struct device *self, void *aux)
{
struct cs428x_softc *sc;
struct pci_attach_args *pa;
@@ -378,7 +378,7 @@ cs4281_intr(void *p)
}
static int
-cs4281_query_encoding(void *addr __unused, struct audio_encoding *fp)
+cs4281_query_encoding(void *addr, struct audio_encoding *fp)
{
switch (fp->index) {
@@ -437,7 +437,7 @@ cs4281_query_encoding(void *addr __unused, struct audio_encoding *fp)
}
static int
-cs4281_set_params(void *addr, int setmode, int usemode __unused,
+cs4281_set_params(void *addr, int setmode, int usemode,
audio_params_t *play, audio_params_t *rec, stream_filter_list_t *pfil,
stream_filter_list_t *rfil)
{
@@ -530,7 +530,7 @@ cs4281_halt_input(void *addr)
}
static int
-cs4281_getdev(void *addr __unused, struct audio_device *retp)
+cs4281_getdev(void *addr, struct audio_device *retp)
{
*retp = cs4281_device;
diff --git a/sys/dev/pci/cs428x.c b/sys/dev/pci/cs428x.c
index 996b0613d93..2b7a248bfba 100644
--- a/sys/dev/pci/cs428x.c
+++ b/sys/dev/pci/cs428x.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cs428x.c,v 1.12 2006/10/12 01:31:28 christos Exp $ */
+/* $NetBSD: cs428x.c,v 1.13 2006/11/16 01:33:08 christos Exp $ */
/*
* Copyright (c) 2000 Tatoku Ogaito. All rights reserved.
@@ -33,7 +33,7 @@
/* Common functions for CS4280 and CS4281 */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cs428x.c,v 1.12 2006/10/12 01:31:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs428x.c,v 1.13 2006/11/16 01:33:08 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -64,7 +64,7 @@ int cs428x_debug = 0;
int
cs428x_round_blocksize(void *addr, int blk,
- int mode __unused, const audio_params_t *param __unused)
+ int mode, const audio_params_t *param)
{
struct cs428x_softc *sc;
int retval;
@@ -113,7 +113,7 @@ cs428x_query_devinfo(void *addr, mixer_devinfo_t *dip)
}
void *
-cs428x_malloc(void *addr, int direction __unused, size_t size,
+cs428x_malloc(void *addr, int direction, size_t size,
struct malloc_type *pool, int flags)
{
struct cs428x_softc *sc;
@@ -160,7 +160,7 @@ cs428x_free(void *addr, void *ptr, struct malloc_type *pool)
}
size_t
-cs428x_round_buffersize(void *addr __unused, int direction __unused,
+cs428x_round_buffersize(void *addr, int direction,
size_t size)
{
/* The real DMA buffersize are 4KB for CS4280
@@ -196,7 +196,7 @@ cs428x_mappage(void *addr, void *mem, off_t off, int prot)
}
int
-cs428x_get_props(void *addr __unused)
+cs428x_get_props(void *addr)
{
int retval;
diff --git a/sys/dev/pci/cy_pci.c b/sys/dev/pci/cy_pci.c
index cb8d4093ecc..17dd4a62729 100644
--- a/sys/dev/pci/cy_pci.c
+++ b/sys/dev/pci/cy_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cy_pci.c,v 1.20 2006/10/12 01:31:28 christos Exp $ */
+/* $NetBSD: cy_pci.c,v 1.21 2006/11/16 01:33:08 christos Exp $ */
/*
* cy_pci.c
@@ -10,7 +10,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cy_pci.c,v 1.20 2006/10/12 01:31:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cy_pci.c,v 1.21 2006/11/16 01:33:08 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -76,7 +76,7 @@ cy_pci_lookup(const struct pci_attach_args *pa)
}
static int
-cy_pci_match(struct device *parent __unused, struct cfdata *match __unused,
+cy_pci_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -85,7 +85,7 @@ cy_pci_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-cy_pci_attach(struct device *parent __unused, struct device *self, void *aux)
+cy_pci_attach(struct device *parent, struct device *self, void *aux)
{
struct cy_pci_softc *psc = (void *) self;
struct cy_softc *sc = (void *) &psc->sc_cy;
diff --git a/sys/dev/pci/cypide.c b/sys/dev/pci/cypide.c
index 6683ebe77d2..21da770caa2 100644
--- a/sys/dev/pci/cypide.c
+++ b/sys/dev/pci/cypide.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cypide.c,v 1.18 2006/10/12 01:31:28 christos Exp $ */
+/* $NetBSD: cypide.c,v 1.19 2006/11/16 01:33:08 christos Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Manuel Bouyer.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cypide.c,v 1.18 2006/10/12 01:31:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cypide.c,v 1.19 2006/11/16 01:33:08 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -67,7 +67,7 @@ static const struct pciide_product_desc pciide_cypress_products[] = {
};
static int
-cypide_match(struct device *parent __unused, struct cfdata *match __unused,
+cypide_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -82,7 +82,7 @@ cypide_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-cypide_attach(struct device *parent __unused, struct device *self, void *aux)
+cypide_attach(struct device *parent, struct device *self, void *aux)
{
struct pci_attach_args *pa = aux;
struct pciide_softc *sc = (struct pciide_softc *)self;
diff --git a/sys/dev/pci/cz.c b/sys/dev/pci/cz.c
index 88efe93865b..04a0d583469 100644
--- a/sys/dev/pci/cz.c
+++ b/sys/dev/pci/cz.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cz.c,v 1.41 2006/10/12 01:31:28 christos Exp $ */
+/* $NetBSD: cz.c,v 1.42 2006/11/16 01:33:08 christos Exp $ */
/*-
* Copyright (c) 2000 Zembu Labs, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cz.c,v 1.41 2006/10/12 01:31:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cz.c,v 1.42 2006/11/16 01:33:08 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -261,8 +261,8 @@ do { \
* Determine if the given PCI device is a Cyclades-Z board.
*/
static int
-cz_match(struct device *parent __unused,
- struct cfdata *match __unused,
+cz_match(struct device *parent,
+ struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -283,7 +283,7 @@ cz_match(struct device *parent __unused,
* A Cyclades-Z board was found; attach it.
*/
static void
-cz_attach(struct device *parent __unused,
+cz_attach(struct device *parent,
struct device *self,
void *aux)
{
@@ -944,7 +944,7 @@ cztty_shutdown(struct cztty_softc *sc)
* Open a Cyclades-Z serial port.
*/
static int
-czttyopen(dev_t dev, int flags, int mode __unused, struct lwp *l)
+czttyopen(dev_t dev, int flags, int mode, struct lwp *l)
{
struct cztty_softc *sc = CZTTY_SOFTC(dev);
struct cz_softc *cz;
@@ -1062,7 +1062,7 @@ czttyopen(dev_t dev, int flags, int mode __unused, struct lwp *l)
* Close a Cyclades-Z serial port.
*/
static int
-czttyclose(dev_t dev, int flags, int mode __unused, struct lwp *l __unused)
+czttyclose(dev_t dev, int flags, int mode, struct lwp *l)
{
struct cztty_softc *sc = CZTTY_SOFTC(dev);
struct tty *tp = sc->sc_tty;
@@ -1497,7 +1497,7 @@ czttystart(struct tty *tp)
* Stop output, e.g., for ^S or output flush.
*/
static void
-czttystop(struct tty *tp __unused, int flag __unused)
+czttystop(struct tty *tp, int flag)
{
/*
diff --git a/sys/dev/pci/dpt_pci.c b/sys/dev/pci/dpt_pci.c
index 562486f2ab3..d1747ca6c84 100644
--- a/sys/dev/pci/dpt_pci.c
+++ b/sys/dev/pci/dpt_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dpt_pci.c,v 1.18 2006/10/12 01:31:28 christos Exp $ */
+/* $NetBSD: dpt_pci.c,v 1.19 2006/11/16 01:33:08 christos Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Andrew Doran <ad@NetBSD.org>
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dpt_pci.c,v 1.18 2006/10/12 01:31:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dpt_pci.c,v 1.19 2006/11/16 01:33:08 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -63,7 +63,7 @@ CFATTACH_DECL(dpt_pci, sizeof(struct dpt_softc),
dpt_pci_match, dpt_pci_attach, NULL, NULL);
static int
-dpt_pci_match(struct device *parent __unused, struct cfdata *match __unused,
+dpt_pci_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa;
@@ -78,7 +78,7 @@ dpt_pci_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-dpt_pci_attach(struct device *parent __unused, struct device *self, void *aux)
+dpt_pci_attach(struct device *parent, struct device *self, void *aux)
{
struct pci_attach_args *pa;
struct dpt_softc *sc;
diff --git a/sys/dev/pci/eap.c b/sys/dev/pci/eap.c
index ba71eaa80ff..4cfcb8ed792 100644
--- a/sys/dev/pci/eap.c
+++ b/sys/dev/pci/eap.c
@@ -1,4 +1,4 @@
-/* $NetBSD: eap.c,v 1.87 2006/10/12 01:31:28 christos Exp $ */
+/* $NetBSD: eap.c,v 1.88 2006/11/16 01:33:08 christos Exp $ */
/* $OpenBSD: eap.c,v 1.6 1999/10/05 19:24:42 csapuntz Exp $ */
/*
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: eap.c,v 1.87 2006/10/12 01:31:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eap.c,v 1.88 2006/11/16 01:33:08 christos Exp $");
#include "midi.h"
#include "joy_eap.h"
@@ -329,7 +329,7 @@ static const struct audio_format eap_formats[EAP_NFORMATS] = {
};
static int
-eap_match(struct device *parent __unused, struct cfdata *match __unused,
+eap_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa;
@@ -378,7 +378,7 @@ eap1370_write_codec(struct eap_softc *sc, int a, int d)
*/
static inline void
-eap1371_ready_codec(struct eap_softc *sc, uint8_t a __unused, uint32_t wd)
+eap1371_ready_codec(struct eap_softc *sc, uint8_t a, uint32_t wd)
{
int to, s;
uint32_t src, t;
@@ -599,7 +599,7 @@ eap1371_set_dac_rate(struct eap_instance *ei, int rate)
}
static void
-eap_attach(struct device *parent __unused, struct device *self, void *aux)
+eap_attach(struct device *parent, struct device *self, void *aux)
{
struct eap_softc *sc;
struct pci_attach_args *pa;
@@ -819,7 +819,7 @@ eap_attach(struct device *parent __unused, struct device *self, void *aux)
}
static int
-eap_detach(struct device *self, int flags __unused)
+eap_detach(struct device *self, int flags)
{
struct eap_softc *sc;
int res;
@@ -1032,7 +1032,7 @@ eap_open(void *addr, int flags)
}
static int
-eap_query_encoding(void *addr __unused, struct audio_encoding *fp)
+eap_query_encoding(void *addr, struct audio_encoding *fp)
{
switch (fp->index) {
@@ -1196,8 +1196,8 @@ eap_set_params(void *addr, int setmode, int usemode,
}
static int
-eap_round_blocksize(void *addr __unused, int blk, int mode __unused,
- const audio_params_t *param __unused)
+eap_round_blocksize(void *addr, int blk, int mode,
+ const audio_params_t *param)
{
return blk & -32; /* keep good alignment */
@@ -1412,7 +1412,7 @@ eap_halt_input(void *addr)
}
static int
-eap_getdev(void *addr __unused, struct audio_device *retp)
+eap_getdev(void *addr, struct audio_device *retp)
{
*retp = eap_device;
@@ -1650,7 +1650,7 @@ eap1370_mixer_get_port(void *addr, mixer_ctrl_t *cp)
}
static int
-eap1370_query_devinfo(void *addr __unused, mixer_devinfo_t *dip)
+eap1370_query_devinfo(void *addr, mixer_devinfo_t *dip)
{
switch (dip->index) {
@@ -1796,7 +1796,7 @@ eap1370_query_devinfo(void *addr __unused, mixer_devinfo_t *dip)
}
static void *
-eap_malloc(void *addr, int direction __unused, size_t size,
+eap_malloc(void *addr, int direction, size_t size,
struct malloc_type *pool, int flags)
{
struct eap_instance *ei;
@@ -1839,7 +1839,7 @@ eap_free(void *addr, void *ptr, struct malloc_type *pool)
}
static size_t
-eap_round_buffersize(void *addr __unused, int direction __unused, size_t size)
+eap_round_buffersize(void *addr, int direction, size_t size)
{
return size;
@@ -1865,7 +1865,7 @@ eap_mappage(void *addr, void *mem, off_t off, int prot)
}
static int
-eap_get_props(void *addr __unused)
+eap_get_props(void *addr)
{
return AUDIO_PROP_MMAP | AUDIO_PROP_INDEPENDENT |
@@ -1937,7 +1937,7 @@ eap_midi_output(void *addr, int d)
}
static void
-eap_midi_getinfo(void *addr __unused, struct midi_info *mi)
+eap_midi_getinfo(void *addr, struct midi_info *mi)
{
mi->name = "AudioPCI MIDI UART";
mi->props = MIDI_PROP_CAN_INPUT | MIDI_PROP_OUT_INTR;
diff --git a/sys/dev/pci/ehci_pci.c b/sys/dev/pci/ehci_pci.c
index fb9c465a641..7b8449dd37a 100644
--- a/sys/dev/pci/ehci_pci.c
+++ b/sys/dev/pci/ehci_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci_pci.c,v 1.25 2006/10/12 01:31:28 christos Exp $ */
+/* $NetBSD: ehci_pci.c,v 1.26 2006/11/16 01:33:08 christos Exp $ */
/*
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci_pci.c,v 1.25 2006/10/12 01:31:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci_pci.c,v 1.26 2006/11/16 01:33:08 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -84,7 +84,7 @@ struct ehci_pci_softc {
#define EHCI_MAX_BIOS_WAIT 1000 /* ms */
static int
-ehci_pci_match(struct device *parent __unused, struct cfdata *match __unused,
+ehci_pci_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = (struct pci_attach_args *) aux;
@@ -98,7 +98,7 @@ ehci_pci_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-ehci_pci_attach(struct device *parent __unused, struct device *self, void *aux)
+ehci_pci_attach(struct device *parent, struct device *self, void *aux)
{
struct ehci_pci_softc *sc = (struct ehci_pci_softc *)self;
struct pci_attach_args *pa = (struct pci_attach_args *)aux;
diff --git a/sys/dev/pci/emuxki.c b/sys/dev/pci/emuxki.c
index 0b34b8ef49d..c7c51b75c95 100644
--- a/sys/dev/pci/emuxki.c
+++ b/sys/dev/pci/emuxki.c
@@ -1,4 +1,4 @@
-/* $NetBSD: emuxki.c,v 1.48 2006/10/12 01:31:28 christos Exp $ */
+/* $NetBSD: emuxki.c,v 1.49 2006/11/16 01:33:08 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: emuxki.c,v 1.48 2006/10/12 01:31:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emuxki.c,v 1.49 2006/11/16 01:33:08 christos Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -387,7 +387,7 @@ emuxki_ac97_init(struct emuxki_softc *sc)
}
static int
-emuxki_match(struct device *parent __unused, struct cfdata *match __unused,
+emuxki_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa;
@@ -407,7 +407,7 @@ emuxki_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-emuxki_attach(struct device *parent __unused, struct device *self, void *aux)
+emuxki_attach(struct device *parent, struct device *self, void *aux)
{
struct emuxki_softc *sc;
struct pci_attach_args *pa;
@@ -490,7 +490,7 @@ emuxki_attach(struct device *parent __unused, struct device *self, void *aux)
}
static int
-emuxki_detach(struct device *self, int flags __unused)
+emuxki_detach(struct device *self, int flags)
{
struct emuxki_softc *sc;
@@ -2093,7 +2093,7 @@ emuxki_close(void *addr)
}
static int
-emuxki_query_encoding(void *addr __unused, struct audio_encoding *fp)
+emuxki_query_encoding(void *addr, struct audio_encoding *fp)
{
#ifdef EMUXKI_DEBUG
struct emuxki_softc *sc;
@@ -2327,8 +2327,8 @@ emuxki_freem(void *addr, void *ptr, struct malloc_type *type)
/* blocksize should be a divisor of allowable buffersize */
/* XXX probably this could be done better */
static int
-emuxki_round_blocksize(void *addr __unused, int blksize,
- int mode __unused, const audio_params_t* param __unused)
+emuxki_round_blocksize(void *addr, int blksize,
+ int mode, const audio_params_t* param)
{
#if 0
struct emuxki_softc *sc;
@@ -2357,7 +2357,7 @@ emuxki_round_blocksize(void *addr __unused, int blksize,
}
static size_t
-emuxki_round_buffersize(void *addr __unused, int direction, size_t bsize)
+emuxki_round_buffersize(void *addr, int direction, size_t bsize)
{
if (direction == AUMODE_PLAY) {
@@ -2409,7 +2409,7 @@ emuxki_mappage(void *addr, void *ptr, off_t off, int prot)
}
static int
-emuxki_get_props(void *addr __unused)
+emuxki_get_props(void *addr)
{
return AUDIO_PROP_MMAP | AUDIO_PROP_INDEPENDENT |
AUDIO_PROP_FULLDUPLEX;
@@ -2509,14 +2509,14 @@ emuxki_ac97_write(void *arg, uint8_t reg, uint16_t val)
}
static int
-emuxki_ac97_reset(void *arg __unused)
+emuxki_ac97_reset(void *arg)
{
return 0;
}
enum ac97_host_flags
-emuxki_ac97_flags(void *arg __unused)
+emuxki_ac97_flags(void *arg)
{
return AC97_HOST_SWAPPED_CHANNELS;
diff --git a/sys/dev/pci/esa.c b/sys/dev/pci/esa.c
index 353a85569a1..7346e945f4b 100644
--- a/sys/dev/pci/esa.c
+++ b/sys/dev/pci/esa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: esa.c,v 1.39 2006/10/12 01:31:28 christos Exp $ */
+/* $NetBSD: esa.c,v 1.40 2006/11/16 01:33:08 christos Exp $ */
/*
* Copyright (c) 2001, 2002, 2006 Jared D. McNeill <jmcneill@invisible.ca>
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esa.c,v 1.39 2006/10/12 01:31:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esa.c,v 1.40 2006/11/16 01:33:08 christos Exp $");
#include <sys/types.h>
#include <sys/errno.h>
@@ -235,7 +235,7 @@ CFATTACH_DECL(esa, sizeof(struct esa_softc), esa_match, esa_attach,
*/
static int
-esa_query_encoding(void *hdl __unused, struct audio_encoding *ae)
+esa_query_encoding(void *hdl, struct audio_encoding *ae)
{
if (ae->index < 0 || ae->index >= ESA_NENCODINGS)
@@ -246,7 +246,7 @@ esa_query_encoding(void *hdl __unused, struct audio_encoding *ae)
}
static int
-esa_set_params(void *hdl, int setmode, int usemode __unused,
+esa_set_params(void *hdl, int setmode, int usemode,
audio_params_t *play, audio_params_t *rec, stream_filter_list_t *pfil,
stream_filter_list_t *rfil)
{
@@ -363,8 +363,8 @@ esa_commit_settings(void *hdl)
};
static int
-esa_round_blocksize(void *hdl __unused, int bs, int mode __unused,
- const audio_params_t *param __unused)
+esa_round_blocksize(void *hdl, int bs, int mode,
+ const audio_params_t *param)
{
return bs & ~0x20; /* Be conservative; align to 32 bytes */
@@ -456,7 +456,7 @@ esa_halt_input(void *hdl)
}
static void *
-esa_malloc(void *hdl, int direction __unused, size_t size,
+esa_malloc(void *hdl, int direction, size_t size,
struct malloc_type *type, int flags)
{
struct esa_voice *vc;
@@ -502,7 +502,7 @@ esa_free(void *hdl, void *addr, struct malloc_type *type)
}
static int
-esa_getdev(void *hdl __unused, struct audio_device *ret)
+esa_getdev(void *hdl, struct audio_device *ret)
{
*ret = esa_device;
@@ -543,14 +543,14 @@ esa_query_devinfo(void *hdl, mixer_devinfo_t *di)
}
static size_t
-esa_round_buffersize(void *hdl __unused, int direction __unused, size_t bufsize)
+esa_round_buffersize(void *hdl, int direction, size_t bufsize)
{
return bufsize;
}
static int
-esa_get_props(void *hdl __unused)
+esa_get_props(void *hdl)
{
return AUDIO_PROP_MMAP | AUDIO_PROP_INDEPENDENT | AUDIO_PROP_FULLDUPLEX;
@@ -558,7 +558,7 @@ esa_get_props(void *hdl __unused)
static int
esa_trigger_output(void *hdl, void *start, void *end, int blksize,
- void (*intr)(void *), void *intrarg, const audio_params_t *param __unused)
+ void (*intr)(void *), void *intrarg, const audio_params_t *param)
{
struct esa_voice *vc;
struct esa_softc *sc;
@@ -692,7 +692,7 @@ esa_trigger_output(void *hdl, void *start, void *end, int blksize,
static int
esa_trigger_input(void *hdl, void *start, void *end, int blksize,
- void (*intr)(void *), void *intrarg, const audio_params_t *param __unused)
+ void (*intr)(void *), void *intrarg, const audio_params_t *param)
{
struct esa_voice *vc;
struct esa_softc *sc;
@@ -971,7 +971,7 @@ esa_freemem(struct esa_softc *sc, struct esa_dma *p)
*/
static int
-esa_match(struct device *dev __unused, struct cfdata *match __unused, void *aux)
+esa_match(struct device *dev, struct cfdata *match, void *aux)
{
struct pci_attach_args *pa;
@@ -990,7 +990,7 @@ esa_match(struct device *dev __unused, struct cfdata *match __unused, void *aux)
}
static void
-esa_attach(struct device *parent __unused, struct device *self, void *aux)
+esa_attach(struct device *parent, struct device *self, void *aux)
{
struct esa_softc *sc;
struct pci_attach_args *pa;
@@ -1269,7 +1269,7 @@ esa_write_codec(void *aux, uint8_t reg, uint16_t data)
}
static int
-esa_reset_codec(void *aux __unused)
+esa_reset_codec(void *aux)
{
return 0;
diff --git a/sys/dev/pci/esiop_pci.c b/sys/dev/pci/esiop_pci.c
index 684547c30ec..41499445c2c 100644
--- a/sys/dev/pci/esiop_pci.c
+++ b/sys/dev/pci/esiop_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: esiop_pci.c,v 1.11 2006/10/12 01:31:29 christos Exp $ */
+/* $NetBSD: esiop_pci.c,v 1.12 2006/11/16 01:33:08 christos Exp $ */
/*
* Copyright (c) 2002 Manuel Bouyer.
@@ -32,7 +32,7 @@
/* SYM53c8xx PCI-SCSI I/O Processors driver: PCI front-end */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esiop_pci.c,v 1.11 2006/10/12 01:31:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esiop_pci.c,v 1.12 2006/11/16 01:33:08 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -57,7 +57,7 @@ struct esiop_pci_softc {
};
static int
-esiop_pci_match(struct device *parent __unused, struct cfdata *match __unused,
+esiop_pci_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -76,7 +76,7 @@ esiop_pci_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-esiop_pci_attach(struct device *parent __unused, struct device *self, void *aux)
+esiop_pci_attach(struct device *parent, struct device *self, void *aux)
{
struct pci_attach_args *pa = aux;
struct esiop_pci_softc *sc = (struct esiop_pci_softc *)self;
diff --git a/sys/dev/pci/esm.c b/sys/dev/pci/esm.c
index 25c74b03b49..b8cc74ab73b 100644
--- a/sys/dev/pci/esm.c
+++ b/sys/dev/pci/esm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: esm.c,v 1.40 2006/10/12 01:31:29 christos Exp $ */
+/* $NetBSD: esm.c,v 1.41 2006/11/16 01:33:08 christos Exp $ */
/*-
* Copyright (c) 2002, 2003 Matt Fredette
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esm.c,v 1.40 2006/10/12 01:31:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esm.c,v 1.41 2006/11/16 01:33:08 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -545,7 +545,7 @@ esm_attach_codec(void *sc, struct ac97_codec_if *codec_if)
}
int
-esm_reset_codec(void *sc __unused)
+esm_reset_codec(void *sc)
{
return 0;
@@ -678,7 +678,7 @@ esm_init(struct esm_softc *ess)
/* Channel controller. */
int
-esm_init_output (void *sc, void *start, int size __unused)
+esm_init_output (void *sc, void *start, int size)
{
struct esm_softc *ess;
struct esm_dma *p;
@@ -700,7 +700,7 @@ esm_init_output (void *sc, void *start, int size __unused)
}
int
-esm_init_input (void *sc, void *start, int size __unused)
+esm_init_input (void *sc, void *start, int size)
{
struct esm_softc *ess;
struct esm_dma *p;
@@ -730,7 +730,7 @@ esm_init_input (void *sc, void *start, int size __unused)
int
esm_trigger_output(void *sc, void *start, void *end, int blksize,
- void (*intr)(void *), void *arg, const audio_params_t *param __unused)
+ void (*intr)(void *), void *arg, const audio_params_t *param)
{
size_t size;
struct esm_softc *ess;
@@ -844,7 +844,7 @@ esm_trigger_output(void *sc, void *start, void *end, int blksize,
int
esm_trigger_input(void *sc, void *start, void *end, int blksize,
- void (*intr)(void *), void *arg, const audio_params_t *param __unused)
+ void (*intr)(void *), void *arg, const audio_params_t *param)
{
size_t size;
size_t mixsize;
@@ -1195,7 +1195,7 @@ esmch_combine_input(struct esm_softc *ess, struct esm_chinfo *ch)
*/
int
-esm_getdev (void *sc __unused, struct audio_device *adp)
+esm_getdev (void *sc, struct audio_device *adp)
{
*adp = esm_device;
@@ -1203,8 +1203,8 @@ esm_getdev (void *sc __unused, struct audio_device *adp)
}
int
-esm_round_blocksize(void *sc __unused, int blk, int mode __unused,
- const audio_params_t *param __unused)
+esm_round_blocksize(void *sc, int blk, int mode,
+ const audio_params_t *param)
{
DPRINTF(ESM_DEBUG_PARAM,
@@ -1218,7 +1218,7 @@ esm_round_blocksize(void *sc __unused, int blk, int mode __unused,
}
int
-esm_query_encoding(void *sc __unused, struct audio_encoding *fp)
+esm_query_encoding(void *sc, struct audio_encoding *fp)
{
DPRINTF(ESM_DEBUG_PARAM,
@@ -1232,7 +1232,7 @@ esm_query_encoding(void *sc __unused, struct audio_encoding *fp)
}
int
-esm_set_params(void *sc, int setmode, int usemode __unused,
+esm_set_params(void *sc, int setmode, int usemode,
audio_params_t *play, audio_params_t *rec,
stream_filter_list_t *pfil, stream_filter_list_t *rfil)
{
@@ -1310,8 +1310,8 @@ esm_query_devinfo(void *sc, mixer_devinfo_t *dip)
}
void *
-esm_malloc(void *sc, int direction, size_t size __unused,
- struct malloc_type *pool __unused, int flags __unused)
+esm_malloc(void *sc, int direction, size_t size,
+ struct malloc_type *pool, int flags)
{
struct esm_softc *ess;
int off;
@@ -1342,7 +1342,7 @@ esm_malloc(void *sc, int direction, size_t size __unused,
}
void
-esm_free(void *sc, void *ptr, struct malloc_type *pool __unused)
+esm_free(void *sc, void *ptr, struct malloc_type *pool)
{
struct esm_softc *ess;
@@ -1357,7 +1357,7 @@ esm_free(void *sc, void *ptr, struct malloc_type *pool __unused)
}
size_t
-esm_round_buffersize(void *sc __unused, int direction __unused, size_t size)
+esm_round_buffersize(void *sc, int direction, size_t size)
{
if (size > MAESTRO_PLAYBUF_SZ)
@@ -1390,7 +1390,7 @@ esm_mappage(void *sc, void *mem, off_t off, int prot)
}
int
-esm_get_props(void *sc __unused)
+esm_get_props(void *sc)
{
return AUDIO_PROP_MMAP | AUDIO_PROP_INDEPENDENT | AUDIO_PROP_FULLDUPLEX;
@@ -1534,7 +1534,7 @@ esm_allocmem(struct esm_softc *sc, size_t size, size_t align,
}
int
-esm_match(struct device *dev __unused, struct cfdata *match __unused, void *aux)
+esm_match(struct device *dev, struct cfdata *match, void *aux)
{
struct pci_attach_args *pa;
@@ -1558,7 +1558,7 @@ esm_match(struct device *dev __unused, struct cfdata *match __unused, void *aux)
}
void
-esm_attach(struct device *parent __unused, struct device *self, void *aux)
+esm_attach(struct device *parent, struct device *self, void *aux)
{
char devinfo[256];
struct esm_softc *ess;
diff --git a/sys/dev/pci/eso.c b/sys/dev/pci/eso.c
index 0d49feadcd9..a381b756849 100644
--- a/sys/dev/pci/eso.c
+++ b/sys/dev/pci/eso.c
@@ -1,4 +1,4 @@
-/* $NetBSD: eso.c,v 1.44 2006/10/12 01:31:29 christos Exp $ */
+/* $NetBSD: eso.c,v 1.45 2006/11/16 01:33:08 christos Exp $ */
/*
* Copyright (c) 1999, 2000, 2004 Klaus J. Klein
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: eso.c,v 1.44 2006/10/12 01:31:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eso.c,v 1.45 2006/11/16 01:33:08 christos Exp $");
#include "mpu.h"
@@ -208,7 +208,7 @@ static void eso_freemem(struct eso_dma *);
static int
-eso_match(struct device *parent __unused, struct cfdata *match __unused,
+eso_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa;
@@ -222,7 +222,7 @@ eso_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-eso_attach(struct device *parent __unused, struct device *self, void *aux)
+eso_attach(struct device *parent, struct device *self, void *aux)
{
struct eso_softc *sc;
struct pci_attach_args *pa;
@@ -463,7 +463,7 @@ eso_defer(struct device *self)
/* ARGSUSED */
static int
-eso_print(void *aux __unused, const char *pnp)
+eso_print(void *aux, const char *pnp)
{
/* Only joys can attach via this; easy. */
@@ -657,7 +657,7 @@ eso_reset(struct eso_softc *sc)
}
static int
-eso_query_encoding(void *hdl __unused, struct audio_encoding *fp)
+eso_query_encoding(void *hdl, struct audio_encoding *fp)
{
switch (fp->index) {
@@ -717,7 +717,7 @@ eso_query_encoding(void *hdl __unused, struct audio_encoding *fp)
}
static int
-eso_set_params(void *hdl, int setmode, int usemode __unused,
+eso_set_params(void *hdl, int setmode, int usemode,
audio_params_t *play, audio_params_t *rec, stream_filter_list_t *pfil,
stream_filter_list_t *rfil)
{
@@ -788,8 +788,8 @@ eso_set_params(void *hdl, int setmode, int usemode __unused,
}
static int
-eso_round_blocksize(void *hdl __unused, int blk, int mode __unused,
- const audio_params_t *param __unused)
+eso_round_blocksize(void *hdl, int blk, int mode,
+ const audio_params_t *param)
{
return blk & -32; /* keep good alignment; at least 16 req'd */
@@ -1170,7 +1170,7 @@ eso_get_port(void *hdl, mixer_ctrl_t *cp)
}
static int
-eso_query_devinfo(void *hdl __unused, mixer_devinfo_t *dip)
+eso_query_devinfo(void *hdl, mixer_devinfo_t *dip)
{
switch (dip->index) {
@@ -1458,7 +1458,7 @@ eso_query_devinfo(void *hdl __unused, mixer_devinfo_t *dip)
}
static int
-eso_allocmem(struct eso_softc *sc __unused, size_t size, size_t align,
+eso_allocmem(struct eso_softc *sc, size_t size, size_t align,
size_t boundary, int flags, int direction, struct eso_dma *ed)
{
int error, wait;
@@ -1585,7 +1585,7 @@ eso_freem(void *hdl, void *addr, struct malloc_type *type)
}
static size_t
-eso_round_buffersize(void *hdl __unused, int direction, size_t bufsize)
+eso_round_buffersize(void *hdl, int direction, size_t bufsize)
{
size_t maxsize;
@@ -1628,7 +1628,7 @@ eso_mappage(void *hdl, void *addr, off_t offs, int prot)
/* ARGSUSED */
static int
-eso_get_props(void *hdl __unused)
+eso_get_props(void *hdl)
{
return AUDIO_PROP_MMAP | AUDIO_PROP_INDEPENDENT |
diff --git a/sys/dev/pci/fms.c b/sys/dev/pci/fms.c
index e5f39e58155..a1b5cbdaef9 100644
--- a/sys/dev/pci/fms.c
+++ b/sys/dev/pci/fms.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fms.c,v 1.27 2006/10/12 01:31:29 christos Exp $ */
+/* $NetBSD: fms.c,v 1.28 2006/11/16 01:33:08 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fms.c,v 1.27 2006/10/12 01:31:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fms.c,v 1.28 2006/11/16 01:33:08 christos Exp $");
#include "mpu.h"
@@ -216,7 +216,7 @@ static int fms_reset_codec(void *);
static int
-fms_match(struct device *parent __unused, struct cfdata *match __unused,
+fms_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa;
@@ -231,7 +231,7 @@ fms_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-fms_attach(struct device *parent __unused, struct device *self, void *aux)
+fms_attach(struct device *parent, struct device *self, void *aux)
{
struct pci_attach_args *pa;
struct fms_softc *sc;
@@ -469,7 +469,7 @@ fms_intr(void *arg)
}
static int
-fms_query_encoding(void *addr __unused, struct audio_encoding *fp)
+fms_query_encoding(void *addr, struct audio_encoding *fp)
{
switch (fp->index) {
@@ -566,7 +566,7 @@ static const struct audio_format fms_formats[FMS_NFORMATS] = {
};
static int
-fms_set_params(void *addr, int setmode, int usemode __unused,
+fms_set_params(void *addr, int setmode, int usemode,
audio_params_t *play, audio_params_t *rec, stream_filter_list_t *pfil,
stream_filter_list_t *rfil)
{
@@ -610,8 +610,8 @@ fms_set_params(void *addr, int setmode, int usemode __unused,
}
static int
-fms_round_blocksize(void *addr __unused, int blk, int mode __unused,
- const audio_params_t *param __unused)
+fms_round_blocksize(void *addr, int blk, int mode,
+ const audio_params_t *param)
{
return blk & ~0xf;
@@ -648,7 +648,7 @@ fms_halt_input(void *addr)
}
static int
-fms_getdev(void *addr __unused, struct audio_device *retp)
+fms_getdev(void *addr, struct audio_device *retp)
{
*retp = fms_device;
@@ -674,7 +674,7 @@ fms_get_port(void *addr, mixer_ctrl_t *cp)
}
static void *
-fms_malloc(void *addr, int direction __unused, size_t size,
+fms_malloc(void *addr, int direction, size_t size,
struct malloc_type *pool, int flags)
{
struct fms_softc *sc;
@@ -756,7 +756,7 @@ fms_free(void *addr, void *ptr, struct malloc_type *pool)
}
static size_t
-fms_round_buffersize(void *addr __unused, int direction __unused, size_t size)
+fms_round_buffersize(void *addr, int direction, size_t size)
{
return size;
@@ -782,7 +782,7 @@ fms_mappage(void *addr, void *mem, off_t off, int prot)
}
static int
-fms_get_props(void *addr __unused)
+fms_get_props(void *addr)
{
return AUDIO_PROP_MMAP | AUDIO_PROP_INDEPENDENT |
AUDIO_PROP_FULLDUPLEX;
@@ -799,7 +799,7 @@ fms_query_devinfo(void *addr, mixer_devinfo_t *dip)
static int
fms_trigger_output(void *addr, void *start, void *end, int blksize,
- void (*intr)(void *), void *arg, const audio_params_t *param __unused)
+ void (*intr)(void *), void *arg, const audio_params_t *param)
{
struct fms_softc *sc;
struct fms_dma *p;
@@ -833,7 +833,7 @@ fms_trigger_output(void *addr, void *start, void *end, int blksize,
static int
fms_trigger_input(void *addr, void *start, void *end, int blksize,
- void (*intr)(void *), void *arg, const audio_params_t *param __unused)
+ void (*intr)(void *), void *arg, const audio_params_t *param)
{
struct fms_softc *sc;
struct fms_dma *p;
diff --git a/sys/dev/pci/fwohci_pci.c b/sys/dev/pci/fwohci_pci.c
index e2258694322..04e705d0d90 100644
--- a/sys/dev/pci/fwohci_pci.c
+++ b/sys/dev/pci/fwohci_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fwohci_pci.c,v 1.24 2006/10/12 01:31:29 christos Exp $ */
+/* $NetBSD: fwohci_pci.c,v 1.25 2006/11/16 01:33:08 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fwohci_pci.c,v 1.24 2006/10/12 01:31:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fwohci_pci.c,v 1.25 2006/11/16 01:33:08 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -70,7 +70,7 @@ CFATTACH_DECL(fwohci_pci, sizeof(struct fwohci_pci_softc),
fwohci_pci_match, fwohci_pci_attach, NULL, NULL);
static int
-fwohci_pci_match(struct device *parent __unused, struct cfdata *match __unused,
+fwohci_pci_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = (struct pci_attach_args *) aux;
@@ -84,7 +84,7 @@ fwohci_pci_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-fwohci_pci_attach(struct device *parent __unused, struct device *self,
+fwohci_pci_attach(struct device *parent, struct device *self,
void *aux)
{
struct pci_attach_args *pa = (struct pci_attach_args *) aux;
diff --git a/sys/dev/pci/geodeide.c b/sys/dev/pci/geodeide.c
index f6604cccec3..540f66477d6 100644
--- a/sys/dev/pci/geodeide.c
+++ b/sys/dev/pci/geodeide.c
@@ -1,4 +1,4 @@
-/* $NetBSD: geodeide.c,v 1.12 2006/10/12 01:31:29 christos Exp $ */
+/* $NetBSD: geodeide.c,v 1.13 2006/11/16 01:33:08 christos Exp $ */
/*
* Copyright (c) 2004 Manuel Bouyer.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: geodeide.c,v 1.12 2006/10/12 01:31:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: geodeide.c,v 1.13 2006/11/16 01:33:08 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -81,7 +81,7 @@ static const struct pciide_product_desc pciide_geode_products[] = {
};
static int
-geodeide_match(struct device *parent __unused, struct cfdata *match __unused,
+geodeide_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -96,7 +96,7 @@ geodeide_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-geodeide_attach(struct device *parent __unused, struct device *self, void *aux)
+geodeide_attach(struct device *parent, struct device *self, void *aux)
{
struct pci_attach_args *pa = aux;
struct pciide_softc *sc = (void *)self;
diff --git a/sys/dev/pci/gtp.c b/sys/dev/pci/gtp.c
index 607a9b35004..9da64d695fe 100644
--- a/sys/dev/pci/gtp.c
+++ b/sys/dev/pci/gtp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: gtp.c,v 1.12 2006/10/12 01:31:29 christos Exp $ */
+/* $NetBSD: gtp.c,v 1.13 2006/11/16 01:33:08 christos Exp $ */
/* $OpenBSD: gtp.c,v 1.1 2002/06/03 16:13:21 mickey Exp $ */
/*
@@ -29,7 +29,7 @@
/* Gemtek PCI Radio Card Device Driver */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gtp.c,v 1.12 2006/10/12 01:31:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gtp.c,v 1.13 2006/11/16 01:33:08 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -119,7 +119,7 @@ static uint32_t gtp_hardware_read(bus_space_tag_t, bus_space_handle_t,
bus_size_t);
static int
-gtp_match(struct device *parent __unused, struct cfdata *cf __unused, void *aux)
+gtp_match(struct device *parent, struct cfdata *cf, void *aux)
{
struct pci_attach_args *pa = aux;
/* FIXME:
@@ -139,7 +139,7 @@ gtp_match(struct device *parent __unused, struct cfdata *cf __unused, void *aux)
}
static void
-gtp_attach(struct device *parent __unused, struct device *self, void *aux)
+gtp_attach(struct device *parent, struct device *self, void *aux)
{
struct gtp_softc *sc = (struct gtp_softc *) self;
struct pci_attach_args *pa = aux;
@@ -256,21 +256,21 @@ gtp_write_bit(bus_space_tag_t iot, bus_space_handle_t ioh, bus_size_t off,
static void
gtp_init(bus_space_tag_t iot, bus_space_handle_t ioh, bus_size_t off,
- u_int32_t d __unused)
+ u_int32_t d)
{
bus_space_write_1(iot, ioh, off, GTP_WREN_ON | GTP_DATA_ON | GTP_CLCK_OFF);
}
static void
gtp_rset(bus_space_tag_t iot, bus_space_handle_t ioh, bus_size_t off,
- u_int32_t d __unused)
+ u_int32_t d)
{
bus_space_write_1(iot, ioh, off, GEMTEK_PCI_RSET);
}
static uint32_t
-gtp_hardware_read(bus_space_tag_t iot __unused, bus_space_handle_t ioh __unused,
- bus_size_t off __unused)
+gtp_hardware_read(bus_space_tag_t iot, bus_space_handle_t ioh,
+ bus_size_t off)
{
/* UNSUPPORTED */
return 0;
diff --git a/sys/dev/pci/hifn7751.c b/sys/dev/pci/hifn7751.c
index 13b1c737b87..4c95a0bfdb7 100644
--- a/sys/dev/pci/hifn7751.c
+++ b/sys/dev/pci/hifn7751.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hifn7751.c,v 1.32 2006/10/12 01:31:29 christos Exp $ */
+/* $NetBSD: hifn7751.c,v 1.33 2006/11/16 01:33:08 christos Exp $ */
/* $FreeBSD: hifn7751.c,v 1.5.2.7 2003/10/08 23:52:00 sam Exp $ */
/* $OpenBSD: hifn7751.c,v 1.140 2003/08/01 17:55:54 deraadt Exp $ */
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hifn7751.c,v 1.32 2006/10/12 01:31:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hifn7751.c,v 1.33 2006/11/16 01:33:08 christos Exp $");
#include "rnd.h"
@@ -227,7 +227,7 @@ hifn_lookup(const struct pci_attach_args *pa)
}
static int
-hifn_probe(struct device *parent __unused, struct cfdata *match __unused,
+hifn_probe(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = (struct pci_attach_args *) aux;
@@ -239,7 +239,7 @@ hifn_probe(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-hifn_attach(struct device *parent __unused, struct device *self, void *aux)
+hifn_attach(struct device *parent, struct device *self, void *aux)
{
struct hifn_softc *sc = (struct hifn_softc *)self;
struct pci_attach_args *pa = aux;
@@ -1607,7 +1607,7 @@ hifn_dmamap_load_src(struct hifn_softc *sc, struct hifn_command *cmd)
static int
hifn_crypto(struct hifn_softc *sc, struct hifn_command *cmd,
- struct cryptop *crp, int hint __unused)
+ struct cryptop *crp, int hint)
{
struct hifn_dma *dma = sc->sc_dma;
u_int32_t cmdlen;
diff --git a/sys/dev/pci/hptide.c b/sys/dev/pci/hptide.c
index 52f6bfba56c..1f06f1eeb11 100644
--- a/sys/dev/pci/hptide.c
+++ b/sys/dev/pci/hptide.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hptide.c,v 1.22 2006/10/12 01:31:29 christos Exp $ */
+/* $NetBSD: hptide.c,v 1.23 2006/11/16 01:33:08 christos Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Manuel Bouyer.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hptide.c,v 1.22 2006/10/12 01:31:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hptide.c,v 1.23 2006/11/16 01:33:08 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -85,7 +85,7 @@ static const struct pciide_product_desc pciide_triones_products[] = {
};
static int
-hptide_match(struct device *parent __unused, struct cfdata *match __unused,
+hptide_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -98,7 +98,7 @@ hptide_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-hptide_attach(struct device *parent __unused, struct device *self, void *aux)
+hptide_attach(struct device *parent, struct device *self, void *aux)
{
struct pci_attach_args *pa = aux;
struct pciide_softc *sc = (struct pciide_softc *)self;
diff --git a/sys/dev/pci/i82365_pci.c b/sys/dev/pci/i82365_pci.c
index 446010820bc..065e7e8ac20 100644
--- a/sys/dev/pci/i82365_pci.c
+++ b/sys/dev/pci/i82365_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: i82365_pci.c,v 1.23 2006/10/12 01:31:29 christos Exp $ */
+/* $NetBSD: i82365_pci.c,v 1.24 2006/11/16 01:33:08 christos Exp $ */
/*
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i82365_pci.c,v 1.23 2006/10/12 01:31:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i82365_pci.c,v 1.24 2006/11/16 01:33:08 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -88,7 +88,7 @@ static struct pcmcia_chip_functions pcic_pci_functions = {
static void pcic_pci_callback(struct device *);
int
-pcic_pci_match(struct device *parent __unused, struct cfdata *match __unused,
+pcic_pci_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = (struct pci_attach_args *) aux;
@@ -111,7 +111,7 @@ pcic_pci_match(struct device *parent __unused, struct cfdata *match __unused,
void pcic_isa_config_interrupts(struct device *);
void
-pcic_pci_attach(struct device *parent __unused, struct device *self, void *aux)
+pcic_pci_attach(struct device *parent, struct device *self, void *aux)
{
struct pcic_softc *sc = (void *) self;
struct pcic_pci_softc *psc = (void *) self;
diff --git a/sys/dev/pci/iavc_pci.c b/sys/dev/pci/iavc_pci.c
index fcf4ddc4296..8472d7bcb55 100644
--- a/sys/dev/pci/iavc_pci.c
+++ b/sys/dev/pci/iavc_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: iavc_pci.c,v 1.5 2006/10/16 13:00:36 pooka Exp $ */
+/* $NetBSD: iavc_pci.c,v 1.6 2006/11/16 01:33:08 christos Exp $ */
/*
* Copyright (c) 2001-2003 Cubical Solutions Ltd.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iavc_pci.c,v 1.5 2006/10/16 13:00:36 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iavc_pci.c,v 1.6 2006/11/16 01:33:08 christos Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -108,8 +108,8 @@ find_cardname(struct pci_attach_args * pa)
}
static int
-iavc_pci_probe(struct device * parent __unused,
- struct cfdata * match __unused, void *aux)
+iavc_pci_probe(struct device * parent,
+ struct cfdata * match, void *aux)
{
struct pci_attach_args *pa = aux;
@@ -120,7 +120,7 @@ iavc_pci_probe(struct device * parent __unused,
}
static void
-iavc_pci_attach(struct device * parent __unused,
+iavc_pci_attach(struct device * parent,
struct device * self, void *aux)
{
struct iavc_pci_softc *psc = (void *) self;
diff --git a/sys/dev/pci/icp_pci.c b/sys/dev/pci/icp_pci.c
index 4ddf81dba31..bd9be81ffe3 100644
--- a/sys/dev/pci/icp_pci.c
+++ b/sys/dev/pci/icp_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: icp_pci.c,v 1.12 2006/10/12 01:31:29 christos Exp $ */
+/* $NetBSD: icp_pci.c,v 1.13 2006/11/16 01:33:08 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: icp_pci.c,v 1.12 2006/10/12 01:31:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icp_pci.c,v 1.13 2006/11/16 01:33:08 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -229,7 +229,7 @@ icp_pci_find_class(struct pci_attach_args *pa)
}
int
-icp_pci_match(struct device *parent __unused, struct cfdata *match __unused,
+icp_pci_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa;
@@ -243,7 +243,7 @@ icp_pci_match(struct device *parent __unused, struct cfdata *match __unused,
}
void
-icp_pci_attach(struct device *parent __unused, struct device *self, void *aux)
+icp_pci_attach(struct device *parent, struct device *self, void *aux)
{
struct pci_attach_args *pa;
struct icp_softc *icp;
@@ -633,14 +633,14 @@ icp_pci_enable_intr(struct icp_softc *icp)
*/
void
-icp_pci_copy_cmd(struct icp_softc *icp __unused, struct icp_ccb *ccb __unused)
+icp_pci_copy_cmd(struct icp_softc *icp, struct icp_ccb *ccb)
{
/* XXX Not yet implemented */
}
u_int8_t
-icp_pci_get_status(struct icp_softc *icp __unused)
+icp_pci_get_status(struct icp_softc *icp)
{
/* XXX Not yet implemented */
@@ -648,15 +648,15 @@ icp_pci_get_status(struct icp_softc *icp __unused)
}
void
-icp_pci_intr(struct icp_softc *icp __unused, struct icp_intr_ctx *ctx __unused)
+icp_pci_intr(struct icp_softc *icp, struct icp_intr_ctx *ctx)
{
/* XXX Not yet implemented */
}
void
-icp_pci_release_event(struct icp_softc *icp __unused,
- struct icp_ccb *ccb __unused)
+icp_pci_release_event(struct icp_softc *icp,
+ struct icp_ccb *ccb)
{
/* XXX Not yet implemented */
@@ -670,7 +670,7 @@ icp_pci_set_sema0(struct icp_softc *icp)
}
int
-icp_pci_test_busy(struct icp_softc *icp __unused)
+icp_pci_test_busy(struct icp_softc *icp)
{
/* XXX Not yet implemented */
@@ -682,15 +682,15 @@ icp_pci_test_busy(struct icp_softc *icp __unused)
*/
void
-icp_pcinew_copy_cmd(struct icp_softc *icp __unused,
- struct icp_ccb *ccb __unused)
+icp_pcinew_copy_cmd(struct icp_softc *icp,
+ struct icp_ccb *ccb)
{
/* XXX Not yet implemented */
}
u_int8_t
-icp_pcinew_get_status(struct icp_softc *icp __unused)
+icp_pcinew_get_status(struct icp_softc *icp)
{
/* XXX Not yet implemented */
@@ -698,16 +698,16 @@ icp_pcinew_get_status(struct icp_softc *icp __unused)
}
void
-icp_pcinew_intr(struct icp_softc *icp __unused,
- struct icp_intr_ctx *ctx __unused)
+icp_pcinew_intr(struct icp_softc *icp,
+ struct icp_intr_ctx *ctx)
{
/* XXX Not yet implemented */
}
void
-icp_pcinew_release_event(struct icp_softc *icp __unused,
- struct icp_ccb *ccb __unused)
+icp_pcinew_release_event(struct icp_softc *icp,
+ struct icp_ccb *ccb)
{
/* XXX Not yet implemented */
@@ -721,7 +721,7 @@ icp_pcinew_set_sema0(struct icp_softc *icp)
}
int
-icp_pcinew_test_busy(struct icp_softc *icp __unused)
+icp_pcinew_test_busy(struct icp_softc *icp)
{
/* XXX Not yet implemented */
@@ -798,7 +798,7 @@ icp_mpr_intr(struct icp_softc *icp, struct icp_intr_ctx *ctx)
}
void
-icp_mpr_release_event(struct icp_softc *icp, struct icp_ccb *ic __unused)
+icp_mpr_release_event(struct icp_softc *icp, struct icp_ccb *ic)
{
bus_space_write_1(icp->icp_dpmemt, icp->icp_dpmemh, ICP_MPR_LDOOR, 1);
diff --git a/sys/dev/pci/if_an_pci.c b/sys/dev/pci/if_an_pci.c
index 7244e77d654..dc38d98a32b 100644
--- a/sys/dev/pci/if_an_pci.c
+++ b/sys/dev/pci/if_an_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_an_pci.c,v 1.20 2006/10/12 01:31:29 christos Exp $ */
+/* $NetBSD: if_an_pci.c,v 1.21 2006/11/16 01:33:08 christos Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_an_pci.c,v 1.20 2006/10/12 01:31:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_an_pci.c,v 1.21 2006/11/16 01:33:08 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -104,7 +104,7 @@ static const struct an_pci_product {
};
static int
-an_pci_match(struct device *parent __unused, struct cfdata *match __unused,
+an_pci_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -119,7 +119,7 @@ an_pci_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-an_pci_attach(struct device *parent __unused, struct device *self, void *aux)
+an_pci_attach(struct device *parent, struct device *self, void *aux)
{
struct pci_attach_args *pa = (struct pci_attach_args *)aux;
struct an_pci_softc *psc = (struct an_pci_softc *) self;
diff --git a/sys/dev/pci/if_ath_pci.c b/sys/dev/pci/if_ath_pci.c
index f53d492fdf3..d354a03c0f4 100644
--- a/sys/dev/pci/if_ath_pci.c
+++ b/sys/dev/pci/if_ath_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ath_pci.c,v 1.18 2006/10/12 01:31:29 christos Exp $ */
+/* $NetBSD: if_ath_pci.c,v 1.19 2006/11/16 01:33:08 christos Exp $ */
/*-
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -41,7 +41,7 @@
__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath_pci.c,v 1.11 2005/01/18 18:08:16 sam Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: if_ath_pci.c,v 1.18 2006/10/12 01:31:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ath_pci.c,v 1.19 2006/11/16 01:33:08 christos Exp $");
#endif
/*
@@ -117,7 +117,7 @@ CFATTACH_DECL(ath_pci,
NULL);
static int
-ath_pci_match(struct device *parent __unused, struct cfdata *match __unused,
+ath_pci_match(struct device *parent, struct cfdata *match,
void *aux)
{
const char* devname;
@@ -163,7 +163,7 @@ ath_pci_setup(struct pci_attach_args *pa)
}
static void
-ath_pci_attach(struct device *parent __unused, struct device *self, void *aux)
+ath_pci_attach(struct device *parent, struct device *self, void *aux)
{
struct ath_pci_softc *psc = (struct ath_pci_softc *)self;
struct ath_softc *sc = &psc->sc_sc;
@@ -248,7 +248,7 @@ bad:
}
static int
-ath_pci_detach(struct device *self, int flags __unused)
+ath_pci_detach(struct device *self, int flags)
{
struct ath_pci_softc *psc = (struct ath_pci_softc *)self;
diff --git a/sys/dev/pci/if_atw_pci.c b/sys/dev/pci/if_atw_pci.c
index 888b65cb45c..582ebea74de 100644
--- a/sys/dev/pci/if_atw_pci.c
+++ b/sys/dev/pci/if_atw_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_atw_pci.c,v 1.13 2006/10/12 01:31:29 christos Exp $ */
+/* $NetBSD: if_atw_pci.c,v 1.14 2006/11/16 01:33:08 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2002 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_atw_pci.c,v 1.13 2006/10/12 01:31:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_atw_pci.c,v 1.14 2006/11/16 01:33:08 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -128,7 +128,7 @@ atw_pci_lookup(const struct pci_attach_args *pa)
}
static int
-atw_pci_match(struct device *parent __unused, struct cfdata *match __unused,
+atw_pci_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -167,7 +167,7 @@ atw_pci_disable(struct atw_softc *sc)
}
static void
-atw_pci_attach(struct device *parent __unused, struct device *self, void *aux)
+atw_pci_attach(struct device *parent, struct device *self, void *aux)
{
struct atw_pci_softc *psc = (void *) self;
struct atw_softc *sc = &psc->psc_atw;
diff --git a/sys/dev/pci/if_bce.c b/sys/dev/pci/if_bce.c
index 2e3e578c262..4e2f3b21d8c 100644
--- a/sys/dev/pci/if_bce.c
+++ b/sys/dev/pci/if_bce.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bce.c,v 1.11 2006/10/12 01:31:29 christos Exp $ */
+/* $NetBSD: if_bce.c,v 1.12 2006/11/16 01:33:08 christos Exp $ */
/*
* Copyright (c) 2003 Clifford Wright. All rights reserved.
@@ -256,7 +256,7 @@ bce_lookup(const struct pci_attach_args * pa)
* against drivers product list, and return its name if a match is found.
*/
static int
-bce_probe(struct device *parent __unused, struct cfdata *match __unused,
+bce_probe(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = (struct pci_attach_args *) aux;
@@ -268,7 +268,7 @@ bce_probe(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-bce_attach(struct device *parent __unused, struct device *self, void *aux)
+bce_attach(struct device *parent, struct device *self, void *aux)
{
struct bce_softc *sc = (struct bce_softc *) self;
struct pci_attach_args *pa = aux;
diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c
index 57d4eef7f5c..6dbe127496a 100644
--- a/sys/dev/pci/if_bge.c
+++ b/sys/dev/pci/if_bge.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bge.c,v 1.115 2006/10/28 18:45:57 tsutsui Exp $ */
+/* $NetBSD: if_bge.c,v 1.116 2006/11/16 01:33:08 christos Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.115 2006/10/28 18:45:57 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.116 2006/11/16 01:33:08 christos Exp $");
#include "bpfilter.h"
#include "vlan.h"
@@ -669,7 +669,7 @@ bge_update_all_threshes(int lvl)
* Handle events that have triggered interrupts.
*/
static void
-bge_handle_events(struct bge_softc *sc __unused)
+bge_handle_events(struct bge_softc *sc)
{
return;
@@ -794,7 +794,7 @@ bge_jalloc(struct bge_softc *sc)
* Release a jumbo buffer.
*/
static void
-bge_jfree(struct mbuf *m, caddr_t buf, size_t size __unused, void *arg)
+bge_jfree(struct mbuf *m, caddr_t buf, size_t size, void *arg)
{
struct bge_jpool_entry *entry;
struct bge_softc *sc;
@@ -2229,7 +2229,7 @@ bge_lookup(const struct pci_attach_args *pa)
}
static int
-bge_setpowerstate(struct bge_softc *sc __unused, int powerlevel __unused)
+bge_setpowerstate(struct bge_softc *sc, int powerlevel)
{
#ifdef NOTYET
u_int32_t pm_ctl = 0;
@@ -2284,7 +2284,7 @@ bge_setpowerstate(struct bge_softc *sc __unused, int powerlevel __unused)
* we'll always announce the right product name.
*/
static int
-bge_probe(device_t parent __unused, cfdata_t match __unused, void *aux)
+bge_probe(device_t parent, cfdata_t match, void *aux)
{
struct pci_attach_args *pa = (struct pci_attach_args *)aux;
@@ -2295,7 +2295,7 @@ bge_probe(device_t parent __unused, cfdata_t match __unused, void *aux)
}
static void
-bge_attach(device_t parent __unused, device_t self, void *aux)
+bge_attach(device_t parent, device_t self, void *aux)
{
struct bge_softc *sc = (struct bge_softc *)self;
struct pci_attach_args *pa = aux;
diff --git a/sys/dev/pci/if_dge.c b/sys/dev/pci/if_dge.c
index 523d9344ce7..5d1d082c72b 100644
--- a/sys/dev/pci/if_dge.c
+++ b/sys/dev/pci/if_dge.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_dge.c,v 1.13 2006/10/12 01:31:29 christos Exp $ */
+/* $NetBSD: if_dge.c,v 1.14 2006/11/16 01:33:08 christos Exp $ */
/*
* Copyright (c) 2004, SUNET, Swedish University Computer Network.
@@ -80,7 +80,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_dge.c,v 1.13 2006/10/12 01:31:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_dge.c,v 1.14 2006/11/16 01:33:08 christos Exp $");
#include "bpfilter.h"
#include "rnd.h"
@@ -583,7 +583,7 @@ dge_getbuf(struct dge_softc *sc)
* Release a jumbo buffer.
*/
static void
-dge_freebuf(struct mbuf *m, caddr_t buf, size_t size __unused, void *arg)
+dge_freebuf(struct mbuf *m, caddr_t buf, size_t size, void *arg)
{
struct rxbugentry *entry;
struct dge_softc *sc;
@@ -655,7 +655,7 @@ static char (*dge_txseg_evcnt_names)[DGE_NTXSEGS][8 /* "txseg00" + \0 */];
#endif /* DGE_EVENT_COUNTERS */
static int
-dge_match(struct device *parent __unused, struct cfdata *cf __unused, void *aux)
+dge_match(struct device *parent, struct cfdata *cf, void *aux)
{
struct pci_attach_args *pa = aux;
@@ -667,7 +667,7 @@ dge_match(struct device *parent __unused, struct cfdata *cf __unused, void *aux)
}
static void
-dge_attach(struct device *parent __unused, struct device *self, void *aux)
+dge_attach(struct device *parent, struct device *self, void *aux)
{
struct dge_softc *sc = (void *) self;
struct pci_attach_args *pa = aux;
@@ -2419,7 +2419,7 @@ dge_xgmii_reset(struct dge_softc *sc)
}
static int
-dge_xgmii_mediachange(struct ifnet *ifp __unused)
+dge_xgmii_mediachange(struct ifnet *ifp)
{
return 0;
}
diff --git a/sys/dev/pci/if_en_pci.c b/sys/dev/pci/if_en_pci.c
index c9dd8c903fb..905c8bdb0f5 100644
--- a/sys/dev/pci/if_en_pci.c
+++ b/sys/dev/pci/if_en_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_en_pci.c,v 1.25 2006/10/12 01:31:29 christos Exp $ */
+/* $NetBSD: if_en_pci.c,v 1.26 2006/11/16 01:33:08 christos Exp $ */
/*
*
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_en_pci.c,v 1.25 2006/10/12 01:31:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_en_pci.c,v 1.26 2006/11/16 01:33:08 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -165,7 +165,7 @@ void *v;
*/
static int
-en_pci_match(struct device *parent __unused, struct cfdata *match __unused,
+en_pci_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = (struct pci_attach_args *) aux;
@@ -189,7 +189,7 @@ en_pci_match(struct device *parent __unused, struct cfdata *match __unused,
static void
-en_pci_attach(struct device *parent __unused, struct device *self, void *aux)
+en_pci_attach(struct device *parent, struct device *self, void *aux)
{
struct en_softc *sc = (void *)self;
struct en_pci_softc *scp = (void *)self;
@@ -293,7 +293,7 @@ en_pci_shutdown(
#endif
static void
-adp_get_macaddr(struct en_pci_softc *scp, struct pci_attach_args *pa __unused)
+adp_get_macaddr(struct en_pci_softc *scp, struct pci_attach_args *pa)
{
struct en_softc * sc = (struct en_softc *)scp;
int lcv;
diff --git a/sys/dev/pci/if_ep_pci.c b/sys/dev/pci/if_ep_pci.c
index 083685171d0..68371a9f72a 100644
--- a/sys/dev/pci/if_ep_pci.c
+++ b/sys/dev/pci/if_ep_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ep_pci.c,v 1.44 2006/10/12 01:31:29 christos Exp $ */
+/* $NetBSD: if_ep_pci.c,v 1.45 2006/11/16 01:33:08 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ep_pci.c,v 1.44 2006/10/12 01:31:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ep_pci.c,v 1.45 2006/11/16 01:33:08 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -169,7 +169,7 @@ ep_pci_lookup(const struct pci_attach_args *pa)
}
static int
-ep_pci_match(struct device *parent __unused, struct cfdata *match __unused,
+ep_pci_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = (struct pci_attach_args *) aux;
@@ -181,7 +181,7 @@ ep_pci_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-ep_pci_attach(struct device *parent __unused, struct device *self, void *aux)
+ep_pci_attach(struct device *parent, struct device *self, void *aux)
{
struct ep_softc *sc = (void *)self;
struct pci_attach_args *pa = aux;
diff --git a/sys/dev/pci/if_epic_pci.c b/sys/dev/pci/if_epic_pci.c
index 209c64841f6..9cc339dbc42 100644
--- a/sys/dev/pci/if_epic_pci.c
+++ b/sys/dev/pci/if_epic_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_epic_pci.c,v 1.31 2006/10/12 01:31:29 christos Exp $ */
+/* $NetBSD: if_epic_pci.c,v 1.32 2006/11/16 01:33:08 christos Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_epic_pci.c,v 1.31 2006/10/12 01:31:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_epic_pci.c,v 1.32 2006/11/16 01:33:08 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -146,7 +146,7 @@ epic_pci_subsys_lookup(const struct pci_attach_args *pa)
}
static int
-epic_pci_match(struct device *parent __unused, struct cfdata *match __unused,
+epic_pci_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -158,7 +158,7 @@ epic_pci_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-epic_pci_attach(struct device *parent __unused, struct device *self, void *aux)
+epic_pci_attach(struct device *parent, struct device *self, void *aux)
{
struct epic_pci_softc *psc = (struct epic_pci_softc *)self;
struct epic_softc *sc = &psc->sc_epic;
diff --git a/sys/dev/pci/if_esh_pci.c b/sys/dev/pci/if_esh_pci.c
index cefd0af9b4b..455d9e4745a 100644
--- a/sys/dev/pci/if_esh_pci.c
+++ b/sys/dev/pci/if_esh_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_esh_pci.c,v 1.20 2006/10/12 01:31:29 christos Exp $ */
+/* $NetBSD: if_esh_pci.c,v 1.21 2006/11/16 01:33:08 christos Exp $ */
/*
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_esh_pci.c,v 1.20 2006/10/12 01:31:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_esh_pci.c,v 1.21 2006/11/16 01:33:08 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -90,7 +90,7 @@ CFATTACH_DECL(esh_pci, sizeof(struct esh_softc),
esh_pci_match, esh_pci_attach, NULL, NULL);
static int
-esh_pci_match(struct device *parent __unused, struct cfdata *match __unused,
+esh_pci_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = (struct pci_attach_args *) aux;
@@ -109,7 +109,7 @@ esh_pci_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-esh_pci_attach(struct device *parent __unused, struct device *self, void *aux)
+esh_pci_attach(struct device *parent, struct device *self, void *aux)
{
struct esh_softc *sc = (void *)self;
struct pci_attach_args *pa = aux;
diff --git a/sys/dev/pci/if_ex_pci.c b/sys/dev/pci/if_ex_pci.c
index a7f8a60c55b..dbb2c2dd73e 100644
--- a/sys/dev/pci/if_ex_pci.c
+++ b/sys/dev/pci/if_ex_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ex_pci.c,v 1.42 2006/10/12 01:31:29 christos Exp $ */
+/* $NetBSD: if_ex_pci.c,v 1.43 2006/11/16 01:33:08 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ex_pci.c,v 1.42 2006/10/12 01:31:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ex_pci.c,v 1.43 2006/11/16 01:33:08 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -199,7 +199,7 @@ ex_pci_lookup(const struct pci_attach_args *pa)
}
static int
-ex_pci_match(struct device *parent __unused, struct cfdata *match __unused,
+ex_pci_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = (struct pci_attach_args *) aux;
@@ -211,7 +211,7 @@ ex_pci_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-ex_pci_attach(struct device *parent __unused, struct device *self, void *aux)
+ex_pci_attach(struct device *parent, struct device *self, void *aux)
{
struct ex_softc *sc = (void *)self;
struct ex_pci_softc *psc = (void *)self;
diff --git a/sys/dev/pci/if_fpa.c b/sys/dev/pci/if_fpa.c
index 6393f4632b7..56d2a0cdb29 100644
--- a/sys/dev/pci/if_fpa.c
+++ b/sys/dev/pci/if_fpa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fpa.c,v 1.46 2006/10/12 01:31:29 christos Exp $ */
+/* $NetBSD: if_fpa.c,v 1.47 2006/11/16 01:33:08 christos Exp $ */
/*-
* Copyright (c) 1995, 1996 Matt Thomas <matt@3am-software.com>
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fpa.c,v 1.46 2006/10/12 01:31:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fpa.c,v 1.47 2006/11/16 01:33:08 christos Exp $");
#ifdef __NetBSD__
#include "opt_inet.h"
@@ -392,8 +392,8 @@ struct cfdriver fpacd = {
static int
pdq_pci_match(
- struct device *parent __unused,
- struct cfdata *match __unused,
+ struct device *parent,
+ struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = (struct pci_attach_args *) aux;
@@ -408,7 +408,7 @@ pdq_pci_match(
static void
pdq_pci_attach(
- struct device * const parent __unused,
+ struct device * const parent,
struct device * const self,
void * const aux)
{
diff --git a/sys/dev/pci/if_fxp_pci.c b/sys/dev/pci/if_fxp_pci.c
index 17a1995680f..71d3bba3dc6 100644
--- a/sys/dev/pci/if_fxp_pci.c
+++ b/sys/dev/pci/if_fxp_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fxp_pci.c,v 1.50 2006/10/12 01:31:29 christos Exp $ */
+/* $NetBSD: if_fxp_pci.c,v 1.51 2006/11/16 01:33:08 christos Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fxp_pci.c,v 1.50 2006/10/12 01:31:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fxp_pci.c,v 1.51 2006/11/16 01:33:08 christos Exp $");
#include "rnd.h"
@@ -179,7 +179,7 @@ fxp_pci_lookup(const struct pci_attach_args *pa)
}
static int
-fxp_pci_match(struct device *parent __unused, struct cfdata *match __unused,
+fxp_pci_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -263,7 +263,7 @@ fxp_pci_powerhook(int why, void *arg)
}
static void
-fxp_pci_attach(struct device *parent __unused, struct device *self, void *aux)
+fxp_pci_attach(struct device *parent, struct device *self, void *aux)
{
struct fxp_pci_softc *psc = (struct fxp_pci_softc *)self;
struct fxp_softc *sc = (struct fxp_softc *)self;
diff --git a/sys/dev/pci/if_hme_pci.c b/sys/dev/pci/if_hme_pci.c
index e61a77d8859..2b8c6070dd5 100644
--- a/sys/dev/pci/if_hme_pci.c
+++ b/sys/dev/pci/if_hme_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_hme_pci.c,v 1.21 2006/10/12 01:31:30 christos Exp $ */
+/* $NetBSD: if_hme_pci.c,v 1.22 2006/11/16 01:33:08 christos Exp $ */
/*
* Copyright (c) 2000 Matthew R. Green
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_hme_pci.c,v 1.21 2006/10/12 01:31:30 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_hme_pci.c,v 1.22 2006/11/16 01:33:08 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -83,7 +83,7 @@ CFATTACH_DECL(hme_pci, sizeof(struct hme_pci_softc),
hmematch_pci, hmeattach_pci, NULL, NULL);
int
-hmematch_pci(struct device *parent __unused, struct cfdata *cf __unused,
+hmematch_pci(struct device *parent, struct cfdata *cf,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -124,7 +124,7 @@ hmevpdoff(bus_space_tag_t romt, bus_space_handle_t romh, int vpdoff, int dev)
#endif
void
-hmeattach_pci(struct device *parent __unused, struct device *self, void *aux)
+hmeattach_pci(struct device *parent, struct device *self, void *aux)
{
struct pci_attach_args *pa = aux;
struct hme_pci_softc *hsc = (void *)self;
diff --git a/sys/dev/pci/if_ipw.c b/sys/dev/pci/if_ipw.c
index e1ed43e809f..ff318602e70 100644
--- a/sys/dev/pci/if_ipw.c
+++ b/sys/dev/pci/if_ipw.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ipw.c,v 1.30 2006/10/12 01:31:30 christos Exp $ */
+/* $NetBSD: if_ipw.c,v 1.31 2006/11/16 01:33:08 christos 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.30 2006/10/12 01:31:30 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ipw.c,v 1.31 2006/11/16 01:33:08 christos Exp $");
/*-
* Intel(R) PRO/Wireless 2100 MiniPCI driver
@@ -160,7 +160,7 @@ CFATTACH_DECL(ipw, sizeof (struct ipw_softc), ipw_match, ipw_attach,
ipw_detach, NULL);
static int
-ipw_match(struct device *parent __unused, struct cfdata *match __unused,
+ipw_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -176,7 +176,7 @@ ipw_match(struct device *parent __unused, struct cfdata *match __unused,
#define IPW_PCI_BAR0 0x10
static void
-ipw_attach(struct device *parent __unused, struct device *self, void *aux)
+ipw_attach(struct device *parent, struct device *self, void *aux)
{
struct ipw_softc *sc = (struct ipw_softc *)self;
struct ieee80211com *ic = &sc->sc_ic;
@@ -361,7 +361,7 @@ fail: ipw_detach(self, 0);
}
static int
-ipw_detach(struct device* self, int flags __unused)
+ipw_detach(struct device* self, int flags)
{
struct ipw_softc *sc = (struct ipw_softc *)self;
struct ifnet *ifp = &sc->sc_if;
@@ -892,7 +892,7 @@ ipw_media_status(struct ifnet *ifp, struct ifmediareq *imr)
static int
ipw_newstate(struct ieee80211com *ic, enum ieee80211_state nstate,
- int arg __unused)
+ int arg)
{
struct ifnet *ifp = ic->ic_ifp;
struct ipw_softc *sc = ifp->if_softc;
@@ -2340,7 +2340,7 @@ fail: ifp->if_flags &= ~IFF_UP;
}
static void
-ipw_stop(struct ifnet *ifp, int disable __unused)
+ipw_stop(struct ifnet *ifp, int disable)
{
struct ipw_softc *sc = ifp->if_softc;
struct ieee80211com *ic = &sc->sc_ic;
diff --git a/sys/dev/pci/if_iwi.c b/sys/dev/pci/if_iwi.c
index 1ae8cc295d3..9e63f6a8cee 100644
--- a/sys/dev/pci/if_iwi.c
+++ b/sys/dev/pci/if_iwi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iwi.c,v 1.57 2006/10/12 01:31:30 christos Exp $ */
+/* $NetBSD: if_iwi.c,v 1.58 2006/11/16 01:33:08 christos Exp $ */
/*-
* Copyright (c) 2004, 2005
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iwi.c,v 1.57 2006/10/12 01:31:30 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iwi.c,v 1.58 2006/11/16 01:33:08 christos Exp $");
/*-
* Intel(R) PRO/Wireless 2200BG/2225BG/2915ABG driver
@@ -202,7 +202,7 @@ CFATTACH_DECL(iwi, sizeof (struct iwi_softc), iwi_match, iwi_attach,
iwi_detach, NULL);
static int
-iwi_match(struct device *parent __unused, struct cfdata *match __unused,
+iwi_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -223,7 +223,7 @@ iwi_match(struct device *parent __unused, struct cfdata *match __unused,
#define IWI_PCI_BAR0 0x10
static void
-iwi_attach(struct device *parent __unused, struct device *self, void *aux)
+iwi_attach(struct device *parent, struct device *self, void *aux)
{
struct iwi_softc *sc = (struct iwi_softc *)self;
struct ieee80211com *ic = &sc->sc_ic;
@@ -480,7 +480,7 @@ fail: iwi_detach(self, 0);
}
static int
-iwi_detach(struct device* self, int flags __unused)
+iwi_detach(struct device* self, int flags)
{
struct iwi_softc *sc = (struct iwi_softc *)self;
struct ifnet *ifp = &sc->sc_if;
@@ -796,7 +796,7 @@ fail: iwi_free_rx_ring(sc, ring);
}
static void
-iwi_reset_rx_ring(struct iwi_softc *sc __unused, struct iwi_rx_ring *ring)
+iwi_reset_rx_ring(struct iwi_softc *sc, struct iwi_rx_ring *ring)
{
ring->cur = 0;
}
@@ -883,7 +883,7 @@ iwi_powerhook(int why, void *arg)
}
static struct ieee80211_node *
-iwi_node_alloc(struct ieee80211_node_table *nt __unused)
+iwi_node_alloc(struct ieee80211_node_table *nt)
{
struct iwi_node *in;
@@ -2890,7 +2890,7 @@ err:
}
static void
-iwi_stop(struct ifnet *ifp, int disable __unused)
+iwi_stop(struct ifnet *ifp, int disable)
{
struct iwi_softc *sc = ifp->if_softc;
struct ieee80211com *ic = &sc->sc_ic;
diff --git a/sys/dev/pci/if_le_pci.c b/sys/dev/pci/if_le_pci.c
index c0386a706a1..f81b9e82870 100644
--- a/sys/dev/pci/if_le_pci.c
+++ b/sys/dev/pci/if_le_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le_pci.c,v 1.44 2006/10/12 01:31:30 christos Exp $ */
+/* $NetBSD: if_le_pci.c,v 1.45 2006/11/16 01:33:09 christos Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le_pci.c,v 1.44 2006/10/12 01:31:30 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_pci.c,v 1.45 2006/11/16 01:33:09 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -213,7 +213,7 @@ le_pci_mediachange(struct lance_softc *sc)
}
static int
-le_pci_match(struct device *parent __unused, struct cfdata *match __unused,
+le_pci_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -230,7 +230,7 @@ le_pci_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-le_pci_attach(struct device *parent __unused, struct device *self, void *aux)
+le_pci_attach(struct device *parent, struct device *self, void *aux)
{
struct le_softc *lesc = (void *)self;
struct lance_softc *sc = &lesc->sc_am79900.lsc;
diff --git a/sys/dev/pci/if_lmc.c b/sys/dev/pci/if_lmc.c
index 21d682d1b4a..9469cb5424a 100644
--- a/sys/dev/pci/if_lmc.c
+++ b/sys/dev/pci/if_lmc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_lmc.c,v 1.31 2006/10/12 01:31:30 christos Exp $ */
+/* $NetBSD: if_lmc.c,v 1.32 2006/11/16 01:33:09 christos Exp $ */
/*-
* Copyright (c) 2002-2006 David Boggs. <boggs@boggs.palo-alto.ca.us>
@@ -989,7 +989,7 @@ static struct card hssi_card =
};
static void
-hssi_ident(softc_t *sc __unused)
+hssi_ident(softc_t *sc)
{
printf(", EIA-613");
}
@@ -1184,7 +1184,7 @@ static struct card t3_card =
};
static void
-t3_ident(softc_t *sc __unused)
+t3_ident(softc_t *sc)
{
printf(", TXC03401 rev B");
}
@@ -1654,7 +1654,7 @@ static struct card ssi_card =
};
static void
-ssi_ident(softc_t *sc __unused)
+ssi_ident(softc_t *sc)
{
printf(", LTC1343/44");
}
@@ -3636,7 +3636,7 @@ rawip_watchdog(softc_t *sc)
}
static int
-rawip_open(softc_t *sc, struct config *config __unused)
+rawip_open(softc_t *sc, struct config *config)
{
sc->config.proto = PROTO_IP_HDLC;
@@ -3644,7 +3644,7 @@ rawip_open(softc_t *sc, struct config *config __unused)
}
static int
-rawip_attach(softc_t *sc, struct config *config __unused)
+rawip_attach(softc_t *sc, struct config *config)
{
#if IFNET
LMC_BPF_ATTACH(sc, DLT_RAW, 0);
@@ -3745,7 +3745,7 @@ ifnet_input(struct ifnet *ifp, struct mbuf *mbuf)
*/
static int /* context: process */
ifnet_output(struct ifnet *ifp, struct mbuf *m,
- struct sockaddr *dst __unused, struct rtentry *rt __unused)
+ struct sockaddr *dst, struct rtentry *rt)
{
softc_t *sc = IFP2SC(ifp);
int error = 0;
@@ -7062,7 +7062,7 @@ MODULE_DEPEND(if_lmc, sppp, 1, 1, 1);
/* Looking for a DEC 21140A chip on any Lan Media Corp card. */
/* context: kernel (boot) or process (syscall) */
static int
-nbsd_match(struct device *parent __unused, struct cfdata *match __unused,
+nbsd_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -7087,7 +7087,7 @@ nbsd_match(struct device *parent __unused, struct cfdata *match __unused,
/* NetBSD bottom-half initialization. */
/* context: kernel (boot) or process (syscall) */
static void
-nbsd_attach(struct device *parent __unused, struct device *self, void *aux)
+nbsd_attach(struct device *parent, struct device *self, void *aux)
{
softc_t *sc = (softc_t *)self; /* device is first in softc */
struct pci_attach_args *pa = aux;
@@ -7175,7 +7175,7 @@ nbsd_attach(struct device *parent __unused, struct device *self, void *aux)
/* context: kernel (boot) or process (syscall) */
static int
-nbsd_detach(struct device *self, int flags __unused)
+nbsd_detach(struct device *self, int flags)
{
softc_t *sc = (softc_t *)self; /* device is first in softc */
@@ -7214,7 +7214,7 @@ static struct cfdata cfdatas[] =
MOD_DRV("if_"DEVICE_NAME, cfdrivers, cfattachs, cfdatas);
-int if_lmc_lkmentry(struct lkm_table *lkmtp, int cmd, int ver __unused)
+int if_lmc_lkmentry(struct lkm_table *lkmtp, int cmd, int ver)
{ LKM_DISPATCH(lkmtp, cmd, ver, lkm_nofunc, lkm_nofunc, lkm_nofunc); }
# endif /* LKM */
diff --git a/sys/dev/pci/if_msk.c b/sys/dev/pci/if_msk.c
index 2468d0b48aa..c479dd60380 100644
--- a/sys/dev/pci/if_msk.c
+++ b/sys/dev/pci/if_msk.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_msk.c,v 1.2 2006/10/12 01:31:30 christos Exp $ */
+/* $NetBSD: if_msk.c,v 1.3 2006/11/16 01:33:09 christos Exp $ */
/* $OpenBSD: if_msk.c,v 1.11 2006/08/17 22:07:40 brad Exp $ */
/*
@@ -278,7 +278,7 @@ msk_marv_miibus_writereg(struct device *dev, int phy, int reg, int val)
}
void
-msk_marv_miibus_statchg(struct device *dev __unused)
+msk_marv_miibus_statchg(struct device *dev)
{
DPRINTFN(9, ("msk_marv_miibus_statchg: gpcr=%x\n",
SK_YU_READ_2(((struct sk_if_softc *)dev), YUKON_GPCR)));
@@ -618,7 +618,7 @@ msk_jalloc(struct sk_if_softc *sc_if)
* Release a jumbo buffer.
*/
void
-msk_jfree(struct mbuf *m, caddr_t buf, size_t size __unused, void *arg)
+msk_jfree(struct mbuf *m, caddr_t buf, size_t size, void *arg)
{
struct sk_jpool_entry *entry;
struct sk_if_softc *sc;
@@ -763,7 +763,7 @@ msk_lookup(const struct pci_attach_args *pa)
* IDs against our list and return a device name if we find a match.
*/
int
-mskc_probe(struct device *parent __unused, struct cfdata *match __unused,
+mskc_probe(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = (struct pci_attach_args *)aux;
@@ -873,7 +873,7 @@ void msk_reset(struct sk_softc *sc)
}
int
-msk_probe(struct device *parent __unused, struct cfdata *match __unused,
+msk_probe(struct device *parent, struct cfdata *match,
void *aux)
{
struct skc_attach_args *sa = aux;
@@ -1092,7 +1092,7 @@ mskcprint(void *aux, const char *pnp)
* setup and ethernet/BPF attach.
*/
void
-mskc_attach(struct device *parent __unused, struct device *self, void *aux)
+mskc_attach(struct device *parent, struct device *self, void *aux)
{
struct sk_softc *sc = (struct sk_softc *)self;
struct pci_attach_args *pa = aux;
@@ -1568,7 +1568,7 @@ mskc_shutdown(void *v)
}
__inline int
-msk_rxvalid(struct sk_softc *sc __unused, u_int32_t stat, u_int32_t len)
+msk_rxvalid(struct sk_softc *sc, u_int32_t stat, u_int32_t len)
{
if ((stat & (YU_RXSTAT_CRCERR | YU_RXSTAT_LONGERR |
YU_RXSTAT_MIIERR | YU_RXSTAT_BADFC | YU_RXSTAT_GOODFC |
@@ -2092,7 +2092,7 @@ msk_init(struct ifnet *ifp)
}
void
-msk_stop(struct ifnet *ifp, int disable __unused)
+msk_stop(struct ifnet *ifp, int disable)
{
struct sk_if_softc *sc_if = ifp->if_softc;
struct sk_softc *sc = sc_if->sk_softc;
diff --git a/sys/dev/pci/if_mtd_pci.c b/sys/dev/pci/if_mtd_pci.c
index ed6dd5bced7..b42bc4765be 100644
--- a/sys/dev/pci/if_mtd_pci.c
+++ b/sys/dev/pci/if_mtd_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mtd_pci.c,v 1.8 2006/10/12 01:31:30 christos Exp $ */
+/* $NetBSD: if_mtd_pci.c,v 1.9 2006/11/16 01:33:09 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
/* TODO: Check why in IO space, the MII won't work. Memory mapped works */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mtd_pci.c,v 1.8 2006/10/12 01:31:30 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mtd_pci.c,v 1.9 2006/11/16 01:33:09 christos Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -81,7 +81,7 @@ CFATTACH_DECL(mtd_pci, sizeof(struct mtd_softc), mtd_pci_match, mtd_pci_attach,
NULL, NULL);
static int
-mtd_pci_match(struct device *parent __unused, struct cfdata *match __unused,
+mtd_pci_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -96,7 +96,7 @@ mtd_pci_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-mtd_pci_attach(struct device *parent __unused, struct device *self, void *aux)
+mtd_pci_attach(struct device *parent, struct device *self, void *aux)
{
struct pci_attach_args * const pa = aux;
struct mtd_softc * const sc = (void *)self;
diff --git a/sys/dev/pci/if_ne_pci.c b/sys/dev/pci/if_ne_pci.c
index a355742f255..47564f70b4c 100644
--- a/sys/dev/pci/if_ne_pci.c
+++ b/sys/dev/pci/if_ne_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ne_pci.c,v 1.28 2006/10/12 01:31:30 christos Exp $ */
+/* $NetBSD: if_ne_pci.c,v 1.29 2006/11/16 01:33:09 christos Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ne_pci.c,v 1.28 2006/10/12 01:31:30 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ne_pci.c,v 1.29 2006/11/16 01:33:09 christos Exp $");
#include "opt_ipkdb.h"
@@ -179,7 +179,7 @@ ne_pci_lookup(const struct pci_attach_args *pa)
#define PCI_CBIO 0x10 /* Configuration Base IO Address */
static int
-ne_pci_match(struct device *parent __unused, struct cfdata *match __unused,
+ne_pci_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -191,7 +191,7 @@ ne_pci_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-ne_pci_attach(struct device *parent __unused, struct device *self, void *aux)
+ne_pci_attach(struct device *parent, struct device *self, void *aux)
{
struct ne_pci_softc *psc = (struct ne_pci_softc *)self;
struct ne2000_softc *nsc = &psc->sc_ne2000;
diff --git a/sys/dev/pci/if_nfe.c b/sys/dev/pci/if_nfe.c
index 99e381bc0bd..4f48cea51f2 100644
--- a/sys/dev/pci/if_nfe.c
+++ b/sys/dev/pci/if_nfe.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_nfe.c,v 1.6 2006/10/12 01:31:30 christos Exp $ */
+/* $NetBSD: if_nfe.c,v 1.7 2006/11/16 01:33:09 christos Exp $ */
/* $OpenBSD: if_nfe.c,v 1.52 2006/03/02 09:04:00 jsg Exp $ */
/*-
@@ -21,7 +21,7 @@
/* Driver for NVIDIA nForce MCP Fast Ethernet and Gigabit Ethernet */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_nfe.c,v 1.6 2006/10/12 01:31:30 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_nfe.c,v 1.7 2006/11/16 01:33:09 christos Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -177,7 +177,7 @@ const struct nfe_product {
};
int
-nfe_match(struct device *dev __unused, struct cfdata *match __unused, void *aux)
+nfe_match(struct device *dev, struct cfdata *match, void *aux)
{
struct pci_attach_args *pa = aux;
const struct nfe_product *np;
@@ -193,7 +193,7 @@ nfe_match(struct device *dev __unused, struct cfdata *match __unused, void *aux)
}
void
-nfe_attach(struct device *parent __unused, struct device *self, void *aux)
+nfe_attach(struct device *parent, struct device *self, void *aux)
{
struct nfe_softc *sc = (struct nfe_softc *)self;
struct pci_attach_args *pa = aux;
@@ -1189,7 +1189,7 @@ nfe_init(struct ifnet *ifp)
}
void
-nfe_stop(struct ifnet *ifp, int disable __unused)
+nfe_stop(struct ifnet *ifp, int disable)
{
struct nfe_softc *sc = ifp->if_softc;
@@ -1433,7 +1433,7 @@ nfe_jalloc(struct nfe_softc *sc)
* freed.
*/
void
-nfe_jfree(struct mbuf *m, caddr_t buf, size_t size __unused, void *arg)
+nfe_jfree(struct mbuf *m, caddr_t buf, size_t size, void *arg)
{
struct nfe_softc *sc = arg;
struct nfe_jbuf *jbuf;
diff --git a/sys/dev/pci/if_ntwoc_pci.c b/sys/dev/pci/if_ntwoc_pci.c
index dfbdfc5140e..b116cae47c5 100644
--- a/sys/dev/pci/if_ntwoc_pci.c
+++ b/sys/dev/pci/if_ntwoc_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ntwoc_pci.c,v 1.18 2006/10/12 01:31:30 christos Exp $ */
+/* $NetBSD: if_ntwoc_pci.c,v 1.19 2006/11/16 01:33:09 christos Exp $ */
/*
* Copyright (c) 1998 Vixie Enterprises
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ntwoc_pci.c,v 1.18 2006/10/12 01:31:30 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ntwoc_pci.c,v 1.19 2006/11/16 01:33:09 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -175,7 +175,7 @@ ntwoc_pci_sca_read_2(struct sca_softc *sc, u_int reg)
static int
-ntwoc_pci_match(struct device *parent __unused, struct cfdata *match __unused,
+ntwoc_pci_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = (struct pci_attach_args *)aux;
@@ -188,7 +188,7 @@ ntwoc_pci_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-ntwoc_pci_attach(struct device *parent __unused, struct device *self, void *aux)
+ntwoc_pci_attach(struct device *parent, struct device *self, void *aux)
{
struct ntwoc_pci_softc *sc = (void *)self;
struct pci_attach_args *pa = aux;
diff --git a/sys/dev/pci/if_pcn.c b/sys/dev/pci/if_pcn.c
index 847c4417041..8744fc061a7 100644
--- a/sys/dev/pci/if_pcn.c
+++ b/sys/dev/pci/if_pcn.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_pcn.c,v 1.35 2006/11/15 03:21:54 jdarrow Exp $ */
+/* $NetBSD: if_pcn.c,v 1.36 2006/11/16 01:33:09 christos Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_pcn.c,v 1.35 2006/11/15 03:21:54 jdarrow Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_pcn.c,v 1.36 2006/11/16 01:33:09 christos Exp $");
#include "bpfilter.h"
#include "rnd.h"
@@ -546,7 +546,7 @@ pcn_lookup_variant(uint16_t chipid)
}
static int
-pcn_match(struct device *parent __unused, struct cfdata *cf __unused, void *aux)
+pcn_match(struct device *parent, struct cfdata *cf, void *aux)
{
struct pci_attach_args *pa = aux;
@@ -575,7 +575,7 @@ pcn_match(struct device *parent __unused, struct cfdata *cf __unused, void *aux)
}
static void
-pcn_attach(struct device *parent __unused, struct device *self, void *aux)
+pcn_attach(struct device *parent, struct device *self, void *aux)
{
struct pcn_softc *sc = (struct pcn_softc *) self;
struct pci_attach_args *pa = aux;
diff --git a/sys/dev/pci/if_ral_pci.c b/sys/dev/pci/if_ral_pci.c
index 5b912ddb4f6..daaaba55d5d 100644
--- a/sys/dev/pci/if_ral_pci.c
+++ b/sys/dev/pci/if_ral_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ral_pci.c,v 1.5 2006/10/12 01:31:30 christos Exp $ */
+/* $NetBSD: if_ral_pci.c,v 1.6 2006/11/16 01:33:09 christos Exp $ */
/* $OpenBSD: if_ral_pci.c,v 1.6 2006/01/09 20:03:43 damien Exp $ */
/*-
@@ -22,7 +22,7 @@
* PCI front-end for the Ralink RT2560/RT2561/RT2561S/RT2661 driver.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ral_pci.c,v 1.5 2006/10/12 01:31:30 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ral_pci.c,v 1.6 2006/11/16 01:33:09 christos Exp $");
#include "bpfilter.h"
@@ -97,7 +97,7 @@ CFATTACH_DECL(ral_pci, sizeof (struct ral_pci_softc),
ral_pci_match, ral_pci_attach, ral_pci_detach, NULL);
int
-ral_pci_match(struct device *parent __unused, struct cfdata *cfdata __unused,
+ral_pci_match(struct device *parent, struct cfdata *cfdata,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -118,7 +118,7 @@ ral_pci_match(struct device *parent __unused, struct cfdata *cfdata __unused,
}
void
-ral_pci_attach(struct device *parent __unused, struct device *self, void *aux)
+ral_pci_attach(struct device *parent, struct device *self, void *aux)
{
struct ral_pci_softc *psc = (struct ral_pci_softc *)self;
struct rt2560_softc *sc = &psc->sc_sc;
@@ -177,7 +177,7 @@ ral_pci_attach(struct device *parent __unused, struct device *self, void *aux)
}
int
-ral_pci_detach(struct device *self, int flags __unused)
+ral_pci_detach(struct device *self, int flags)
{
struct ral_pci_softc *psc = (struct ral_pci_softc *)self;
struct rt2560_softc *sc = &psc->sc_sc;
diff --git a/sys/dev/pci/if_re_pci.c b/sys/dev/pci/if_re_pci.c
index ef2ec19a8f6..2b3b097cbb5 100644
--- a/sys/dev/pci/if_re_pci.c
+++ b/sys/dev/pci/if_re_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_re_pci.c,v 1.17 2006/11/03 17:51:47 tsutsui Exp $ */
+/* $NetBSD: if_re_pci.c,v 1.18 2006/11/16 01:33:09 christos Exp $ */
/*
* Copyright (c) 1997, 1998-2003
@@ -155,7 +155,7 @@ CFATTACH_DECL(re_pci, sizeof(struct re_pci_softc), re_pci_probe, re_pci_attach,
* IDs against our list and return a device name if we find a match.
*/
static int
-re_pci_probe(struct device *parent __unused, struct cfdata *match __unused,
+re_pci_probe(struct device *parent, struct cfdata *match,
void *aux)
{
const struct rtk_type *t;
@@ -212,7 +212,7 @@ re_pci_probe(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-re_pci_attach(struct device *parent __unused, struct device *self, void *aux)
+re_pci_attach(struct device *parent, struct device *self, void *aux)
{
struct re_pci_softc *psc = (void *)self;
struct rtk_softc *sc = &psc->sc_rtk;
diff --git a/sys/dev/pci/if_rtk_pci.c b/sys/dev/pci/if_rtk_pci.c
index f0a725ff388..f9dac179be5 100644
--- a/sys/dev/pci/if_rtk_pci.c
+++ b/sys/dev/pci/if_rtk_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_rtk_pci.c,v 1.29 2006/11/09 14:59:55 tsutsui Exp $ */
+/* $NetBSD: if_rtk_pci.c,v 1.30 2006/11/16 01:33:09 christos Exp $ */
/*
* Copyright (c) 1997, 1998
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rtk_pci.c,v 1.29 2006/11/09 14:59:55 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rtk_pci.c,v 1.30 2006/11/16 01:33:09 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -143,7 +143,7 @@ rtk_pci_lookup(const struct pci_attach_args *pa)
}
static int
-rtk_pci_match(struct device *parent __unused, struct cfdata *match __unused,
+rtk_pci_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -159,7 +159,7 @@ rtk_pci_match(struct device *parent __unused, struct cfdata *match __unused,
* setup and ethernet/BPF attach.
*/
static void
-rtk_pci_attach(struct device *parent __unused, struct device *self, void *aux)
+rtk_pci_attach(struct device *parent, struct device *self, void *aux)
{
struct rtk_pci_softc *psc = (struct rtk_pci_softc *)self;
struct rtk_softc *sc = &psc->sc_rtk;
diff --git a/sys/dev/pci/if_sf_pci.c b/sys/dev/pci/if_sf_pci.c
index 6bd0fb8218d..db24874fcca 100644
--- a/sys/dev/pci/if_sf_pci.c
+++ b/sys/dev/pci/if_sf_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sf_pci.c,v 1.11 2006/10/12 01:31:30 christos Exp $ */
+/* $NetBSD: if_sf_pci.c,v 1.12 2006/11/16 01:33:09 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sf_pci.c,v 1.11 2006/10/12 01:31:30 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sf_pci.c,v 1.12 2006/11/16 01:33:09 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -160,7 +160,7 @@ sf_pci_lookup(const struct pci_attach_args *pa)
}
static int
-sf_pci_match(struct device *parent __unused, struct cfdata *match __unused,
+sf_pci_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -172,7 +172,7 @@ sf_pci_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-sf_pci_attach(struct device *parent __unused, struct device *self, void *aux)
+sf_pci_attach(struct device *parent, struct device *self, void *aux)
{
struct sf_pci_softc *psc = (void *) self;
struct sf_softc *sc = &psc->sc_starfire;
diff --git a/sys/dev/pci/if_sip.c b/sys/dev/pci/if_sip.c
index 65ffa2c747a..eddcae73ef5 100644
--- a/sys/dev/pci/if_sip.c
+++ b/sys/dev/pci/if_sip.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sip.c,v 1.109 2006/10/12 01:31:30 christos Exp $ */
+/* $NetBSD: if_sip.c,v 1.110 2006/11/16 01:33:09 christos Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -80,7 +80,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sip.c,v 1.109 2006/10/12 01:31:30 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sip.c,v 1.110 2006/11/16 01:33:09 christos Exp $");
#include "bpfilter.h"
#include "rnd.h"
@@ -637,7 +637,7 @@ SIP_DECL(check_64bit)(const struct pci_attach_args *pa)
#endif /* DP83820 */
static int
-SIP_DECL(match)(struct device *parent __unused, struct cfdata *cf __unused,
+SIP_DECL(match)(struct device *parent, struct cfdata *cf,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -649,7 +649,7 @@ SIP_DECL(match)(struct device *parent __unused, struct cfdata *cf __unused,
}
static void
-SIP_DECL(attach)(struct device *parent __unused, struct device *self, void *aux)
+SIP_DECL(attach)(struct device *parent, struct device *self, void *aux)
{
struct sip_softc *sc = (struct sip_softc *) self;
struct pci_attach_args *pa = aux;
@@ -3530,7 +3530,7 @@ SIP_DECL(dp83815_mii_statchg)(struct device *self)
#if defined(DP83820)
static void
SIP_DECL(dp83820_read_macaddr)(struct sip_softc *sc,
- const struct pci_attach_args *pa __unused, u_int8_t *enaddr)
+ const struct pci_attach_args *pa, u_int8_t *enaddr)
{
u_int16_t eeprom_data[SIP_DP83820_EEPROM_LENGTH / 2];
u_int8_t cksum, *e, match;
@@ -3579,7 +3579,7 @@ SIP_DECL(sis900_eeprom_delay)(struct sip_softc *sc)
static void
SIP_DECL(sis900_read_macaddr)(struct sip_softc *sc,
- const struct pci_attach_args *pa __unused, u_int8_t *enaddr)
+ const struct pci_attach_args *pa, u_int8_t *enaddr)
{
u_int16_t myea[ETHER_ADDR_LEN / 2];
@@ -3684,7 +3684,7 @@ static const u_int8_t bbr4[] = {0,8,4,12,2,10,6,14,1,9,5,13,3,11,7,15};
static void
SIP_DECL(dp83815_read_macaddr)(struct sip_softc *sc,
- const struct pci_attach_args *pa __unused, u_int8_t *enaddr)
+ const struct pci_attach_args *pa, u_int8_t *enaddr)
{
u_int16_t eeprom_data[SIP_DP83815_EEPROM_LENGTH / 2], *ea;
u_int8_t cksum, *e, match;
diff --git a/sys/dev/pci/if_sk.c b/sys/dev/pci/if_sk.c
index 0ed2b4d8653..5adbcd94739 100644
--- a/sys/dev/pci/if_sk.c
+++ b/sys/dev/pci/if_sk.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sk.c,v 1.34 2006/10/12 01:31:30 christos Exp $ */
+/* $NetBSD: if_sk.c,v 1.35 2006/11/16 01:33:09 christos Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -548,7 +548,7 @@ sk_marv_miibus_writereg(struct device *dev, int phy, int reg, int val)
}
void
-sk_marv_miibus_statchg(struct device *dev __unused)
+sk_marv_miibus_statchg(struct device *dev)
{
DPRINTFN(9, ("sk_marv_miibus_statchg: gpcr=%x\n",
SK_YU_READ_2(((struct sk_if_softc *)dev), YUKON_GPCR)));
@@ -932,7 +932,7 @@ sk_jalloc(struct sk_if_softc *sc_if)
* Release a jumbo buffer.
*/
void
-sk_jfree(struct mbuf *m, caddr_t buf, size_t size __unused, void *arg)
+sk_jfree(struct mbuf *m, caddr_t buf, size_t size, void *arg)
{
struct sk_jpool_entry *entry;
struct sk_if_softc *sc;
@@ -1135,7 +1135,7 @@ sk_lookup(const struct pci_attach_args *pa)
*/
int
-skc_probe(struct device *parent __unused, struct cfdata *match __unused,
+skc_probe(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = (struct pci_attach_args *)aux;
@@ -1195,7 +1195,7 @@ void sk_reset(struct sk_softc *sc)
}
int
-sk_probe(struct device *parent __unused, struct cfdata *match __unused,
+sk_probe(struct device *parent, struct cfdata *match,
void *aux)
{
struct skc_attach_args *sa = aux;
@@ -1493,7 +1493,7 @@ skcprint(void *aux, const char *pnp)
* setup and ethernet/BPF attach.
*/
void
-skc_attach(struct device *parent __unused, struct device *self, void *aux)
+skc_attach(struct device *parent, struct device *self, void *aux)
{
struct sk_softc *sc = (struct sk_softc *)self;
struct pci_attach_args *pa = aux;
@@ -2857,7 +2857,7 @@ sk_init(struct ifnet *ifp)
}
void
-sk_stop(struct ifnet *ifp, int disable __unused)
+sk_stop(struct ifnet *ifp, int disable)
{
struct sk_if_softc *sc_if = ifp->if_softc;
struct sk_softc *sc = sc_if->sk_softc;
diff --git a/sys/dev/pci/if_ste.c b/sys/dev/pci/if_ste.c
index fd97c64c64f..0bf58bb49d4 100644
--- a/sys/dev/pci/if_ste.c
+++ b/sys/dev/pci/if_ste.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ste.c,v 1.24 2006/10/12 01:31:30 christos Exp $ */
+/* $NetBSD: if_ste.c,v 1.25 2006/11/16 01:33:09 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ste.c,v 1.24 2006/10/12 01:31:30 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ste.c,v 1.25 2006/11/16 01:33:09 christos Exp $");
#include "bpfilter.h"
@@ -290,7 +290,7 @@ ste_lookup(const struct pci_attach_args *pa)
}
static int
-ste_match(struct device *parent __unused, struct cfdata *cf __unused, void *aux)
+ste_match(struct device *parent, struct cfdata *cf, void *aux)
{
struct pci_attach_args *pa = aux;
@@ -301,7 +301,7 @@ ste_match(struct device *parent __unused, struct cfdata *cf __unused, void *aux)
}
static void
-ste_attach(struct device *parent __unused, struct device *self, void *aux)
+ste_attach(struct device *parent, struct device *self, void *aux)
{
struct ste_softc *sc = (struct ste_softc *) self;
struct pci_attach_args *pa = aux;
diff --git a/sys/dev/pci/if_stge.c b/sys/dev/pci/if_stge.c
index 5bca0e30533..7f4886d9375 100644
--- a/sys/dev/pci/if_stge.c
+++ b/sys/dev/pci/if_stge.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_stge.c,v 1.34 2006/10/12 01:31:30 christos Exp $ */
+/* $NetBSD: if_stge.c,v 1.35 2006/11/16 01:33:09 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_stge.c,v 1.34 2006/10/12 01:31:30 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_stge.c,v 1.35 2006/11/16 01:33:09 christos Exp $");
#include "bpfilter.h"
@@ -373,7 +373,7 @@ stge_lookup(const struct pci_attach_args *pa)
}
static int
-stge_match(struct device *parent __unused, struct cfdata *cf __unused,
+stge_match(struct device *parent, struct cfdata *cf,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -385,7 +385,7 @@ stge_match(struct device *parent __unused, struct cfdata *cf __unused,
}
static void
-stge_attach(struct device *parent __unused, struct device *self, void *aux)
+stge_attach(struct device *parent, struct device *self, void *aux)
{
struct stge_softc *sc = (struct stge_softc *) self;
struct pci_attach_args *pa = aux;
diff --git a/sys/dev/pci/if_ti.c b/sys/dev/pci/if_ti.c
index 1cda1d8ce0d..eb8bc5a126a 100644
--- a/sys/dev/pci/if_ti.c
+++ b/sys/dev/pci/if_ti.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ti.c,v 1.72 2006/10/12 01:31:30 christos Exp $ */
+/* $NetBSD: if_ti.c,v 1.73 2006/11/16 01:33:09 christos Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -81,7 +81,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ti.c,v 1.72 2006/10/12 01:31:30 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ti.c,v 1.73 2006/11/16 01:33:09 christos Exp $");
#include "bpfilter.h"
#include "opt_inet.h"
@@ -673,7 +673,7 @@ static void *ti_jalloc(sc)
/*
* Release a jumbo buffer.
*/
-static void ti_jfree(struct mbuf *m, caddr_t tbuf, size_t size __unused,
+static void ti_jfree(struct mbuf *m, caddr_t tbuf, size_t size,
void *arg)
{
struct ti_softc *sc;
@@ -1629,7 +1629,7 @@ ti_type_match(pa)
* against our list and return its name if we find a match.
*/
static int
-ti_probe(struct device *parent __unused, struct cfdata *match __unused,
+ti_probe(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -1641,7 +1641,7 @@ ti_probe(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-ti_attach(struct device *parent __unused, struct device *self, void *aux)
+ti_attach(struct device *parent, struct device *self, void *aux)
{
u_int32_t command;
struct ifnet *ifp;
diff --git a/sys/dev/pci/if_tl.c b/sys/dev/pci/if_tl.c
index e46618c0d51..b32916f410a 100644
--- a/sys/dev/pci/if_tl.c
+++ b/sys/dev/pci/if_tl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tl.c,v 1.76 2006/10/12 01:31:30 christos Exp $ */
+/* $NetBSD: if_tl.c,v 1.77 2006/11/16 01:33:09 christos Exp $ */
/*
* Copyright (c) 1997 Manuel Bouyer. All rights reserved.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tl.c,v 1.76 2006/10/12 01:31:30 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tl.c,v 1.77 2006/11/16 01:33:09 christos Exp $");
#undef TLDEBUG
#define TL_PRIV_STATS
@@ -281,7 +281,7 @@ tl_lookup_product(id)
}
static int
-tl_pci_match(struct device *parent __unused, struct cfdata *match __unused,
+tl_pci_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = (struct pci_attach_args *) aux;
@@ -293,7 +293,7 @@ tl_pci_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-tl_pci_attach(struct device *parent __unused, struct device *self, void *aux)
+tl_pci_attach(struct device *parent, struct device *self, void *aux)
{
tl_softc_t *sc = (tl_softc_t *)self;
struct pci_attach_args * const pa = (struct pci_attach_args *) aux;
@@ -533,7 +533,7 @@ static void tl_shutdown(v)
tl_stop(v, 1);
}
-static void tl_stop(struct ifnet *ifp, int disable __unused)
+static void tl_stop(struct ifnet *ifp, int disable)
{
tl_softc_t *sc = ifp->if_softc;
struct Tx_list *Tx;
@@ -916,7 +916,7 @@ tl_statchg(self)
/********** I2C glue **********/
static int
-tl_i2c_acquire_bus(void *cookie __unused, int flags __unused)
+tl_i2c_acquire_bus(void *cookie, int flags)
{
/* private bus */
@@ -924,7 +924,7 @@ tl_i2c_acquire_bus(void *cookie __unused, int flags __unused)
}
static void
-tl_i2c_release_bus(void *cookie __unused, int flags __unused)
+tl_i2c_release_bus(void *cookie, int flags)
{
/* private bus */
diff --git a/sys/dev/pci/if_tlp_pci.c b/sys/dev/pci/if_tlp_pci.c
index 48d01604c4c..b143d72c73b 100644
--- a/sys/dev/pci/if_tlp_pci.c
+++ b/sys/dev/pci/if_tlp_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tlp_pci.c,v 1.97 2006/10/12 01:31:30 christos Exp $ */
+/* $NetBSD: if_tlp_pci.c,v 1.98 2006/11/16 01:33:09 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2002 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tlp_pci.c,v 1.97 2006/10/12 01:31:30 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tlp_pci.c,v 1.98 2006/11/16 01:33:09 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -333,7 +333,7 @@ tlp_pci_check_slaved(struct tulip_pci_softc *psc, int shared, int slaved)
}
static int
-tlp_pci_match(struct device *parent __unused, struct cfdata *match __unused,
+tlp_pci_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -345,7 +345,7 @@ tlp_pci_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-tlp_pci_attach(struct device *parent __unused, struct device *self, void *aux)
+tlp_pci_attach(struct device *parent, struct device *self, void *aux)
{
struct tulip_pci_softc *psc = (void *) self;
struct tulip_softc *sc = &psc->sc_tulip;
@@ -1043,7 +1043,7 @@ tlp_pci_shared_intr(void *arg)
}
static void
-tlp_pci_dec_quirks(struct tulip_pci_softc *psc, const u_int8_t *enaddr __unused)
+tlp_pci_dec_quirks(struct tulip_pci_softc *psc, const u_int8_t *enaddr)
{
struct tulip_softc *sc = &psc->sc_tulip;
@@ -1137,7 +1137,7 @@ static void tlp_pci_znyx_21142_qs6611_reset(struct tulip_softc *);
static void
tlp_pci_znyx_21142_quirks(struct tulip_pci_softc *psc,
- const u_int8_t *enaddr __unused)
+ const u_int8_t *enaddr)
{
struct tulip_softc *sc = &psc->sc_tulip;
pcireg_t subid;
@@ -1187,7 +1187,7 @@ tlp_pci_znyx_21142_qs6611_reset(struct tulip_softc *sc)
static void
tlp_pci_smc_21040_quirks(struct tulip_pci_softc *psc,
- const u_int8_t *enaddr __unused)
+ const u_int8_t *enaddr)
{
struct tulip_softc *sc = &psc->sc_tulip;
u_int16_t id1, id2, ei;
@@ -1230,7 +1230,7 @@ tlp_pci_smc_21040_quirks(struct tulip_pci_softc *psc,
static void
tlp_pci_cogent_21040_quirks(struct tulip_pci_softc *psc,
- const u_int8_t *enaddr __unused)
+ const u_int8_t *enaddr)
{
strcpy(psc->sc_tulip.sc_name, "Cogent multi-port");
@@ -1239,7 +1239,7 @@ tlp_pci_cogent_21040_quirks(struct tulip_pci_softc *psc,
static void
tlp_pci_accton_21040_quirks(struct tulip_pci_softc *psc,
- const u_int8_t *enaddr __unused)
+ const u_int8_t *enaddr)
{
strcpy(psc->sc_tulip.sc_name, "ACCTON EN1203");
@@ -1249,7 +1249,7 @@ static void tlp_pci_asante_21140_reset(struct tulip_softc *);
static void
tlp_pci_asante_21140_quirks(struct tulip_pci_softc *psc,
- const u_int8_t *enaddr __unused)
+ const u_int8_t *enaddr)
{
struct tulip_softc *sc = &psc->sc_tulip;
@@ -1284,7 +1284,7 @@ static void tlp_pci_phobos_21140_reset(struct tulip_softc *);
static void
tlp_pci_phobos_21140_quirks(struct tulip_pci_softc *psc,
- const u_int8_t *enaddr __unused)
+ const u_int8_t *enaddr)
{
struct tulip_softc *sc = &psc->sc_tulip;
@@ -1325,7 +1325,7 @@ static const struct tulip_mediasw tlp_smc9332dst_mediasw = {
static void
tlp_pci_smc_21140_quirks(struct tulip_pci_softc *psc,
- const u_int8_t *enaddr __unused)
+ const u_int8_t *enaddr)
{
struct tulip_softc *sc = &psc->sc_tulip;
@@ -1409,7 +1409,7 @@ tlp_smc9332dst_tmsw_init(struct tulip_softc *sc)
static void
tlp_pci_vpc_21140_quirks(struct tulip_pci_softc *psc,
- const u_int8_t *enaddr __unused)
+ const u_int8_t *enaddr)
{
struct tulip_softc *sc = &psc->sc_tulip;
char *p1 = (char *) &sc->sc_srom[32];
@@ -1427,7 +1427,7 @@ static void tlp_pci_cobalt_21142_reset(struct tulip_softc *);
static void
tlp_pci_cobalt_21142_quirks(struct tulip_pci_softc *psc,
- const u_int8_t *enaddr __unused)
+ const u_int8_t *enaddr)
{
struct tulip_softc *sc = &psc->sc_tulip;
@@ -1459,7 +1459,7 @@ tlp_pci_cobalt_21142_reset(struct tulip_softc *sc)
static void
tlp_pci_algor_21142_quirks(struct tulip_pci_softc *psc,
- const u_int8_t *enaddr __unused)
+ const u_int8_t *enaddr)
{
struct tulip_softc *sc = &psc->sc_tulip;
@@ -1485,7 +1485,7 @@ static const struct tulip_mediasw tlp_cogent_em1x0_mediasw = {
static void
tlp_pci_adaptec_quirks(struct tulip_pci_softc *psc,
- const u_int8_t *enaddr __unused)
+ const u_int8_t *enaddr)
{
struct tulip_softc *sc = &psc->sc_tulip;
uint8_t *srom = sc->sc_srom, id0;
@@ -1603,7 +1603,7 @@ static void tlp_pci_netwinder_21142_reset(struct tulip_softc *);
static void
tlp_pci_netwinder_21142_quirks(struct tulip_pci_softc *psc,
- const u_int8_t *enaddr __unused)
+ const u_int8_t *enaddr)
{
struct tulip_softc *sc = &psc->sc_tulip;
@@ -1633,7 +1633,7 @@ static void tlp_pci_phobos_21142_reset(struct tulip_softc *);
static void
tlp_pci_phobos_21142_quirks(struct tulip_pci_softc *psc,
- const u_int8_t *enaddr __unused)
+ const u_int8_t *enaddr)
{
struct tulip_softc *sc = &psc->sc_tulip;
diff --git a/sys/dev/pci/if_txp.c b/sys/dev/pci/if_txp.c
index 2a2ed2a3f01..fc950b1c08b 100644
--- a/sys/dev/pci/if_txp.c
+++ b/sys/dev/pci/if_txp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_txp.c,v 1.17 2006/11/04 05:54:53 tsutsui Exp $ */
+/* $NetBSD: if_txp.c,v 1.18 2006/11/16 01:33:09 christos Exp $ */
/*
* Copyright (c) 2001
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_txp.c,v 1.17 2006/11/04 05:54:53 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_txp.c,v 1.18 2006/11/16 01:33:09 christos Exp $");
#include "bpfilter.h"
#include "opt_inet.h"
@@ -176,7 +176,7 @@ txp_pcilookup(id)
}
int
-txp_probe(struct device *parent __unused, struct cfdata *match __unused,
+txp_probe(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -187,7 +187,7 @@ txp_probe(struct device *parent __unused, struct cfdata *match __unused,
}
void
-txp_attach(struct device *parent __unused, struct device *self, void *aux)
+txp_attach(struct device *parent, struct device *self, void *aux)
{
struct txp_softc *sc = (struct txp_softc *)self;
struct pci_attach_args *pa = aux;
@@ -1802,7 +1802,7 @@ txp_stop(sc)
}
void
-txp_watchdog(struct ifnet *ifp __unused)
+txp_watchdog(struct ifnet *ifp)
{
}
diff --git a/sys/dev/pci/if_vge.c b/sys/dev/pci/if_vge.c
index 384982498b1..b6cb5508fb0 100644
--- a/sys/dev/pci/if_vge.c
+++ b/sys/dev/pci/if_vge.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vge.c,v 1.26 2006/11/04 05:07:16 tsutsui Exp $ */
+/* $NetBSD: if_vge.c,v 1.27 2006/11/16 01:33:09 christos Exp $ */
/*-
* Copyright (c) 2004
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vge.c,v 1.26 2006/11/04 05:07:16 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vge.c,v 1.27 2006/11/16 01:33:09 christos Exp $");
/*
* VIA Networking Technologies VT612x PCI gigabit ethernet NIC driver.
@@ -781,7 +781,7 @@ vge_reset(struct vge_softc *sc)
* IDs against our list and return a device name if we find a match.
*/
static int
-vge_probe(struct device *parent __unused, struct cfdata *match __unused,
+vge_probe(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -883,7 +883,7 @@ vge_allocmem(struct vge_softc *sc)
* setup and ethernet/BPF attach.
*/
static void
-vge_attach(struct device *parent __unused, struct device *self, void *aux)
+vge_attach(struct device *parent, struct device *self, void *aux)
{
uint8_t *eaddr;
struct vge_softc *sc = (void *)self;
diff --git a/sys/dev/pci/if_vr.c b/sys/dev/pci/if_vr.c
index ca3473f3694..0e220f45907 100644
--- a/sys/dev/pci/if_vr.c
+++ b/sys/dev/pci/if_vr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vr.c,v 1.83 2006/11/05 13:05:18 tsutsui Exp $ */
+/* $NetBSD: if_vr.c,v 1.84 2006/11/16 01:33:09 christos Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -104,7 +104,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vr.c,v 1.83 2006/11/05 13:05:18 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vr.c,v 1.84 2006/11/16 01:33:09 christos Exp $");
#include "rnd.h"
@@ -1459,7 +1459,7 @@ vr_lookup(struct pci_attach_args *pa)
}
static int
-vr_probe(struct device *parent __unused, struct cfdata *match __unused,
+vr_probe(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = (struct pci_attach_args *)aux;
@@ -1487,7 +1487,7 @@ vr_shutdown(void *arg)
* setup and ethernet/BPF attach.
*/
static void
-vr_attach(struct device *parent __unused, struct device *self, void *aux)
+vr_attach(struct device *parent, struct device *self, void *aux)
{
struct vr_softc *sc = (struct vr_softc *) self;
struct pci_attach_args *pa = (struct pci_attach_args *) aux;
diff --git a/sys/dev/pci/if_wi_pci.c b/sys/dev/pci/if_wi_pci.c
index dc9bb828088..4f15ec9010c 100644
--- a/sys/dev/pci/if_wi_pci.c
+++ b/sys/dev/pci/if_wi_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wi_pci.c,v 1.40 2006/10/12 01:31:30 christos Exp $ */
+/* $NetBSD: if_wi_pci.c,v 1.41 2006/11/16 01:33:09 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wi_pci.c,v 1.40 2006/10/12 01:31:30 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wi_pci.c,v 1.41 2006/11/16 01:33:09 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -212,7 +212,7 @@ wi_pci_lookup(struct pci_attach_args *pa)
}
static int
-wi_pci_match(struct device *parent __unused, struct cfdata *match __unused,
+wi_pci_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -223,7 +223,7 @@ wi_pci_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-wi_pci_attach(struct device *parent __unused, struct device *self, void *aux)
+wi_pci_attach(struct device *parent, struct device *self, void *aux)
{
struct wi_pci_softc *psc = (struct wi_pci_softc *)self;
struct wi_softc *sc = &psc->psc_wi;
diff --git a/sys/dev/pci/if_wpi.c b/sys/dev/pci/if_wpi.c
index 40f1006f6d6..da437e1f4a4 100644
--- a/sys/dev/pci/if_wpi.c
+++ b/sys/dev/pci/if_wpi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wpi.c,v 1.5 2006/10/31 21:53:41 joerg Exp $ */
+/* $NetBSD: if_wpi.c,v 1.6 2006/11/16 01:33:09 christos Exp $ */
/*-
* Copyright (c) 2006
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wpi.c,v 1.5 2006/10/31 21:53:41 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wpi.c,v 1.6 2006/11/16 01:33:09 christos Exp $");
/*
* Driver for Intel PRO/Wireless 3945ABG 802.11 network adapters.
@@ -162,7 +162,7 @@ CFATTACH_DECL(wpi, sizeof (struct wpi_softc), wpi_match, wpi_attach,
wpi_detach, NULL);
static int
-wpi_match(struct device *parent __unused, struct cfdata *match __unused,
+wpi_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -181,7 +181,7 @@ wpi_match(struct device *parent __unused, struct cfdata *match __unused,
#define WPI_PCI_BAR0 0x10
static void
-wpi_attach(struct device *parent __unused, struct device *self, void *aux)
+wpi_attach(struct device *parent, struct device *self, void *aux)
{
struct wpi_softc *sc = (struct wpi_softc *)self;
struct ieee80211com *ic = &sc->sc_ic;
@@ -399,7 +399,7 @@ fail1: while (--ac >= 0)
}
static int
-wpi_detach(struct device* self, int flags __unused)
+wpi_detach(struct device* self, int flags)
{
struct wpi_softc *sc = (struct wpi_softc *)self;
struct ifnet *ifp = &sc->sc_ec.ec_if;
@@ -779,7 +779,7 @@ wpi_free_tx_ring(struct wpi_softc *sc, struct wpi_tx_ring *ring)
/*ARGUSED*/
static struct ieee80211_node *
-wpi_node_alloc(struct ieee80211_node_table *ic __unused)
+wpi_node_alloc(struct ieee80211_node_table *ic)
{
struct wpi_node *wn;
@@ -2769,7 +2769,7 @@ fail1: wpi_stop(ifp, 1);
static void
-wpi_stop(struct ifnet *ifp, int disable __unused)
+wpi_stop(struct ifnet *ifp, int disable)
{
struct wpi_softc *sc = ifp->if_softc;
struct ieee80211com *ic = &sc->sc_ic;
diff --git a/sys/dev/pci/if_xge.c b/sys/dev/pci/if_xge.c
index ea8343830a6..53c54e579f1 100644
--- a/sys/dev/pci/if_xge.c
+++ b/sys/dev/pci/if_xge.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_xge.c,v 1.3 2006/10/12 01:31:31 christos Exp $ */
+/* $NetBSD: if_xge.c,v 1.4 2006/11/16 01:33:09 christos Exp $ */
/*
* Copyright (c) 2004, SUNET, Swedish University Computer Network.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_xge.c,v 1.3 2006/10/12 01:31:31 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_xge.c,v 1.4 2006/11/16 01:33:09 christos Exp $");
#include "bpfilter.h"
#include "rnd.h"
@@ -270,7 +270,7 @@ CFATTACH_DECL(xge, sizeof(struct xge_softc),
#define XGE_IP_MAXPACKET 65535 /* same as IP_MAXPACKET */
static int
-xge_match(struct device *parent __unused, struct cfdata *cf __unused, void *aux)
+xge_match(struct device *parent, struct cfdata *cf, void *aux)
{
struct pci_attach_args *pa = aux;
@@ -282,7 +282,7 @@ xge_match(struct device *parent __unused, struct cfdata *cf __unused, void *aux)
}
void
-xge_attach(struct device *parent __unused, struct device *self, void *aux)
+xge_attach(struct device *parent, struct device *self, void *aux)
{
struct pci_attach_args *pa = aux;
struct xge_softc *sc;
@@ -591,7 +591,7 @@ xge_ifmedia_status(struct ifnet *ifp, struct ifmediareq *ifmr)
}
int
-xge_xgmii_mediachange(struct ifnet *ifp __unused)
+xge_xgmii_mediachange(struct ifnet *ifp)
{
return 0;
}
@@ -666,7 +666,7 @@ xge_init(struct ifnet *ifp)
}
static void
-xge_stop(struct ifnet *ifp, int disable __unused)
+xge_stop(struct ifnet *ifp, int disable)
{
struct xge_softc *sc = ifp->if_softc;
uint64_t val;
diff --git a/sys/dev/pci/ifpci.c b/sys/dev/pci/ifpci.c
index 442c786bdb1..07bb754fcd6 100644
--- a/sys/dev/pci/ifpci.c
+++ b/sys/dev/pci/ifpci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ifpci.c,v 1.20 2006/10/16 13:00:36 pooka Exp $ */
+/* $NetBSD: ifpci.c,v 1.21 2006/11/16 01:33:09 christos Exp $ */
/*
* Copyright (c) 1999 Gary Jennejohn. All rights reserved.
*
@@ -36,14 +36,14 @@
* Fritz!Card PCI driver
* ------------------------------------------------
*
- * $Id: ifpci.c,v 1.20 2006/10/16 13:00:36 pooka Exp $
+ * $Id: ifpci.c,v 1.21 2006/11/16 01:33:09 christos Exp $
*
* last edit-date: [Fri Jan 5 11:38:58 2001]
*
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ifpci.c,v 1.20 2006/10/16 13:00:36 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ifpci.c,v 1.21 2006/11/16 01:33:09 christos Exp $");
#include <sys/param.h>
@@ -262,8 +262,8 @@ CFATTACH_DECL(ifpci, sizeof(struct ifpci_softc),
#define HSCX_AVMA1PP_ACTIVE 0x1000
static int
-ifpci_match(struct device *parent __unused,
- struct cfdata *match __unused , void *aux)
+ifpci_match(struct device *parent,
+ struct cfdata *match, void *aux)
{
struct pci_attach_args *pa = aux;
@@ -274,7 +274,7 @@ ifpci_match(struct device *parent __unused,
}
static void
-ifpci_attach(struct device *parent __unused, struct device *self, void *aux)
+ifpci_attach(struct device *parent, struct device *self, void *aux)
{
struct ifpci_softc *psc = (void*)self;
struct pci_attach_args *pa = aux;
@@ -398,7 +398,7 @@ ifpci_attach(struct device *parent __unused, struct device *self, void *aux)
}
static int
-ifpci_detach(struct device *self, int flags __unused)
+ifpci_detach(struct device *self, int flags)
{
struct ifpci_softc *psc = (struct ifpci_softc *)self;
diff --git a/sys/dev/pci/ifpci2.c b/sys/dev/pci/ifpci2.c
index 0e03c732282..42cc76b59f5 100644
--- a/sys/dev/pci/ifpci2.c
+++ b/sys/dev/pci/ifpci2.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ifpci2.c,v 1.8 2006/10/16 13:00:36 pooka Exp $ */
+/* $NetBSD: ifpci2.c,v 1.9 2006/11/16 01:33:09 christos Exp $ */
/*
* Copyright (c) 1999 Gary Jennejohn. All rights reserved.
*
@@ -36,14 +36,14 @@
* Fritz!Card PCI driver
* ------------------------------------------------
*
- * $Id: ifpci2.c,v 1.8 2006/10/16 13:00:36 pooka Exp $
+ * $Id: ifpci2.c,v 1.9 2006/11/16 01:33:09 christos Exp $
*
* last edit-date: [Fri Jan 5 11:38:58 2001]
*
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ifpci2.c,v 1.8 2006/10/16 13:00:36 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ifpci2.c,v 1.9 2006/11/16 01:33:09 christos Exp $");
#include <sys/param.h>
@@ -232,8 +232,8 @@ CFATTACH_DECL(ifritz, sizeof(struct ifpci_softc),
#define HSCX_AVMA1PP_ACTIVE 0x1000
static int
-ifpci2_match(struct device *parent __unused,
- struct cfdata *match __unused, void *aux)
+ifpci2_match(struct device *parent,
+ struct cfdata *match, void *aux)
{
struct pci_attach_args *pa = aux;
@@ -244,7 +244,7 @@ ifpci2_match(struct device *parent __unused,
}
static void
-ifpci2_attach(struct device *parent __unused, struct device *self, void *aux)
+ifpci2_attach(struct device *parent, struct device *self, void *aux)
{
struct ifpci_softc *psc = (void*)self;
struct pci_attach_args *pa = aux;
@@ -357,7 +357,7 @@ ifpci2_attach(struct device *parent __unused, struct device *self, void *aux)
}
static int
-ifpci2_detach(struct device *self, int flags __unused)
+ifpci2_detach(struct device *self, int flags)
{
struct ifpci_softc *psc = (struct ifpci_softc *)self;
diff --git a/sys/dev/pci/iha_pci.c b/sys/dev/pci/iha_pci.c
index ef330a7865f..754355b83c7 100644
--- a/sys/dev/pci/iha_pci.c
+++ b/sys/dev/pci/iha_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: iha_pci.c,v 1.12 2006/10/12 01:31:31 christos Exp $ */
+/* $NetBSD: iha_pci.c,v 1.13 2006/11/16 01:33:09 christos Exp $ */
/*-
* Device driver for the INI-9XXXU/UW or INIC-940/950 PCI SCSI Controller.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iha_pci.c,v 1.12 2006/10/12 01:31:31 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iha_pci.c,v 1.13 2006/11/16 01:33:09 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -63,7 +63,7 @@ CFATTACH_DECL(iha_pci, sizeof(struct iha_softc),
iha_pci_match, iha_pci_attach, NULL, NULL);
static int
-iha_pci_match(struct device *parent __unused, struct cfdata *match __unused,
+iha_pci_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -81,7 +81,7 @@ iha_pci_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-iha_pci_attach(struct device *parent __unused, struct device *self, void *aux)
+iha_pci_attach(struct device *parent, struct device *self, void *aux)
{
struct pci_attach_args *pa = aux;
bus_space_tag_t iot;
diff --git a/sys/dev/pci/iop_pci.c b/sys/dev/pci/iop_pci.c
index e9a68b4f2fc..07453735165 100644
--- a/sys/dev/pci/iop_pci.c
+++ b/sys/dev/pci/iop_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: iop_pci.c,v 1.17 2006/10/12 01:31:31 christos Exp $ */
+/* $NetBSD: iop_pci.c,v 1.18 2006/11/16 01:33:09 christos Exp $ */
/*-
* Copyright (c) 2000, 2001, 2002 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iop_pci.c,v 1.17 2006/10/12 01:31:31 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iop_pci.c,v 1.18 2006/11/16 01:33:09 christos Exp $");
#include "opt_i2o.h"
@@ -73,7 +73,7 @@ CFATTACH_DECL(iop_pci, sizeof(struct iop_softc),
iop_pci_match, iop_pci_attach, NULL, NULL);
static int
-iop_pci_match(struct device *parent __unused, struct cfdata *match __unused,
+iop_pci_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa;
@@ -115,7 +115,7 @@ iop_pci_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-iop_pci_attach(struct device *parent __unused, struct device *self, void *aux)
+iop_pci_attach(struct device *parent, struct device *self, void *aux)
{
struct pci_attach_args *pa;
struct iop_softc *sc;
diff --git a/sys/dev/pci/isic_pci.c b/sys/dev/pci/isic_pci.c
index 6ae36ade6fa..ab096d48311 100644
--- a/sys/dev/pci/isic_pci.c
+++ b/sys/dev/pci/isic_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isic_pci.c,v 1.26 2006/10/16 13:00:36 pooka Exp $ */
+/* $NetBSD: isic_pci.c,v 1.27 2006/11/16 01:33:09 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_pci.c,v 1.26 2006/10/16 13:00:36 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_pci.c,v 1.27 2006/11/16 01:33:09 christos Exp $");
#include <sys/param.h>
#include <sys/errno.h>
@@ -120,8 +120,8 @@ static const struct isic_pci_product * find_matching_card(pa)
* Match card
*/
static int
-isic_pci_match(struct device *parent __unused,
- struct cfdata *match __unused, void *aux)
+isic_pci_match(struct device *parent,
+ struct cfdata *match, void *aux)
{
struct pci_attach_args *pa = aux;
@@ -135,7 +135,7 @@ isic_pci_match(struct device *parent __unused,
* Attach the card
*/
static void
-isic_pci_attach(struct device *parent __unused, struct device *self, void *aux)
+isic_pci_attach(struct device *parent, struct device *self, void *aux)
{
struct pci_isic_softc *psc = (void*) self;
struct isic_softc *sc = &psc->sc_isic;
@@ -310,7 +310,7 @@ isic_pci_isdn_attach(psc, pa, cardname)
static int
-isic_pci_detach(struct device *self, int flags __unused)
+isic_pci_detach(struct device *self, int flags)
{
struct pci_isic_softc *psc = (struct pci_isic_softc *)self;
diff --git a/sys/dev/pci/isp_pci.c b/sys/dev/pci/isp_pci.c
index 38ddd60b426..9040b32cfed 100644
--- a/sys/dev/pci/isp_pci.c
+++ b/sys/dev/pci/isp_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isp_pci.c,v 1.97 2006/10/12 01:31:31 christos Exp $ */
+/* $NetBSD: isp_pci.c,v 1.98 2006/11/16 01:33:09 christos Exp $ */
/*
* This driver, which is contained in NetBSD in the files:
*
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isp_pci.c,v 1.97 2006/10/12 01:31:31 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isp_pci.c,v 1.98 2006/11/16 01:33:09 christos Exp $");
#include <dev/ic/isp_netbsd.h>
#include <dev/pci/pcireg.h>
@@ -340,7 +340,7 @@ const char vstring[] =
#endif
static int
-isp_pci_probe(struct device *parent __unused, struct cfdata *match __unused,
+isp_pci_probe(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -380,7 +380,7 @@ isp_pci_probe(struct device *parent __unused, struct cfdata *match __unused,
static void
-isp_pci_attach(struct device *parent __unused, struct device *self, void *aux)
+isp_pci_attach(struct device *parent, struct device *self, void *aux)
{
#ifdef DEBUG
static char oneshot = 1;
diff --git a/sys/dev/pci/iteide.c b/sys/dev/pci/iteide.c
index 9c5c7aa1859..935be86005e 100644
--- a/sys/dev/pci/iteide.c
+++ b/sys/dev/pci/iteide.c
@@ -1,4 +1,4 @@
-/* $NetBSD: iteide.c,v 1.6 2006/10/12 01:31:31 christos Exp $ */
+/* $NetBSD: iteide.c,v 1.7 2006/11/16 01:33:09 christos Exp $ */
/*
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iteide.c,v 1.6 2006/10/12 01:31:31 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iteide.c,v 1.7 2006/11/16 01:33:09 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -70,7 +70,7 @@ static const struct pciide_product_desc pciide_ite_products[] = {
};
static int
-iteide_match(struct device *parent __unused, struct cfdata *match __unused,
+iteide_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -83,7 +83,7 @@ iteide_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-iteide_attach(struct device *parent __unused, struct device *self, void *aux)
+iteide_attach(struct device *parent, struct device *self, void *aux)
{
struct pci_attach_args *pa = aux;
struct pciide_softc *sc = (struct pciide_softc *)self;
diff --git a/sys/dev/pci/iwic_pci.c b/sys/dev/pci/iwic_pci.c
index b7ceb206713..1c820766eb7 100644
--- a/sys/dev/pci/iwic_pci.c
+++ b/sys/dev/pci/iwic_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: iwic_pci.c,v 1.9 2006/10/16 13:00:36 pooka Exp $ */
+/* $NetBSD: iwic_pci.c,v 1.10 2006/11/16 01:33:09 christos Exp $ */
/*
* Copyright (c) 1999, 2000 Dave Boyce. All rights reserved.
@@ -36,7 +36,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iwic_pci.c,v 1.9 2006/10/16 13:00:36 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iwic_pci.c,v 1.10 2006/11/16 01:33:09 christos Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -211,8 +211,8 @@ iwic_find_card(const struct pci_attach_args * pa)
* iwic PCI probe
*---------------------------------------------------------------------------*/
static int
-iwic_pci_probe(struct device * dev __unused,
- struct cfdata * match __unused, void *aux)
+iwic_pci_probe(struct device * dev,
+ struct cfdata * match, void *aux)
{
if (iwic_find_card(aux))
return 1;
@@ -223,7 +223,7 @@ iwic_pci_probe(struct device * dev __unused,
* PCI attach
*---------------------------------------------------------------------------*/
static void
-iwic_pci_attach(struct device * parent __unused, struct device * dev, void *aux)
+iwic_pci_attach(struct device * parent, struct device * dev, void *aux)
{
struct iwic_softc *sc = (void *) dev;
struct iwic_bchan *bchan;
@@ -316,7 +316,7 @@ iwic_pci_intr(void *p)
}
static int
-iwic_pci_activate(struct device * dev __unused, enum devact act __unused)
+iwic_pci_activate(struct device * dev, enum devact act)
{
int error = EOPNOTSUPP;
diff --git a/sys/dev/pci/ixpide.c b/sys/dev/pci/ixpide.c
index 2fe65fcc1c7..8afb20c7227 100644
--- a/sys/dev/pci/ixpide.c
+++ b/sys/dev/pci/ixpide.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ixpide.c,v 1.7 2006/10/12 01:31:31 christos Exp $ */
+/* $NetBSD: ixpide.c,v 1.8 2006/11/16 01:33:09 christos Exp $ */
/*
* Copyright (c) 2004 The NetBSD Foundation.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixpide.c,v 1.7 2006/10/12 01:31:31 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixpide.c,v 1.8 2006/11/16 01:33:09 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -72,7 +72,7 @@ static const struct pciide_product_desc pciide_ixpide_products[] = {
};
static int
-ixpide_match(struct device *parent __unused, struct cfdata *cfdata __unused,
+ixpide_match(struct device *parent, struct cfdata *cfdata,
void *aux)
{
struct pci_attach_args *pa = (struct pci_attach_args *)aux;
@@ -86,7 +86,7 @@ ixpide_match(struct device *parent __unused, struct cfdata *cfdata __unused,
}
static void
-ixpide_attach(struct device *parent __unused, struct device *self, void *aux)
+ixpide_attach(struct device *parent, struct device *self, void *aux)
{
struct pci_attach_args *pa = aux;
struct pciide_softc *sc = (struct pciide_softc *)self;
diff --git a/sys/dev/pci/joy_eap.c b/sys/dev/pci/joy_eap.c
index c02e4c2056d..4a749c122fa 100644
--- a/sys/dev/pci/joy_eap.c
+++ b/sys/dev/pci/joy_eap.c
@@ -1,4 +1,4 @@
-/* $NetBSD: joy_eap.c,v 1.5 2006/10/12 01:31:31 christos Exp $ */
+/* $NetBSD: joy_eap.c,v 1.6 2006/11/16 01:33:09 christos Exp $ */
#include <sys/param.h>
#include <sys/systm.h>
@@ -82,7 +82,7 @@ eap_joy_detach(struct device *joydev, struct eap_gameport_args *gpa)
}
static int
-joy_eap_match(struct device *parent __unused, struct cfdata *match __unused,
+joy_eap_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct joy_eap_aa *eaa = aux;
@@ -93,7 +93,7 @@ joy_eap_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-joy_eap_attach(struct device *parent __unused, struct device *self, void *aux)
+joy_eap_attach(struct device *parent, struct device *self, void *aux)
{
struct joy_softc *sc = (struct joy_softc *)self;
struct joy_eap_aa *eaa = aux;
diff --git a/sys/dev/pci/joy_eso.c b/sys/dev/pci/joy_eso.c
index d95353a1f2a..0b856e5b42b 100644
--- a/sys/dev/pci/joy_eso.c
+++ b/sys/dev/pci/joy_eso.c
@@ -1,4 +1,4 @@
-/* $NetBSD: joy_eso.c,v 1.10 2006/10/12 01:31:31 christos Exp $ */
+/* $NetBSD: joy_eso.c,v 1.11 2006/11/16 01:33:09 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: joy_eso.c,v 1.10 2006/10/12 01:31:31 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: joy_eso.c,v 1.11 2006/11/16 01:33:09 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -62,7 +62,7 @@ __KERNEL_RCSID(0, "$NetBSD: joy_eso.c,v 1.10 2006/10/12 01:31:31 christos Exp $"
#include <dev/ic/joyvar.h>
static int
-joy_eso_match(struct device *parent __unused, struct cfdata *match __unused,
+joy_eso_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct audio_attach_args *aa = (struct audio_attach_args *)aux;
@@ -73,7 +73,7 @@ joy_eso_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-joy_eso_attach(struct device *parent, struct device *self, void *aux __unused)
+joy_eso_attach(struct device *parent, struct device *self, void *aux)
{
struct eso_softc *esc = (struct eso_softc *)parent;
struct joy_softc *sc = (struct joy_softc *)self;
diff --git a/sys/dev/pci/joy_pci.c b/sys/dev/pci/joy_pci.c
index 9c3cc1ac4bf..6a8cb540017 100644
--- a/sys/dev/pci/joy_pci.c
+++ b/sys/dev/pci/joy_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: joy_pci.c,v 1.13 2006/10/12 01:31:31 christos Exp $ */
+/* $NetBSD: joy_pci.c,v 1.14 2006/11/16 01:33:09 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: joy_pci.c,v 1.13 2006/10/12 01:31:31 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: joy_pci.c,v 1.14 2006/11/16 01:33:09 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -55,7 +55,7 @@ __KERNEL_RCSID(0, "$NetBSD: joy_pci.c,v 1.13 2006/10/12 01:31:31 christos Exp $"
static int bar_is_io(pci_chipset_tag_t pc, pcitag_t tag, int reg);
static int
-joy_pci_match(struct device *parent __unused, struct cfdata *match __unused,
+joy_pci_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -97,7 +97,7 @@ bar_is_io(pci_chipset_tag_t pc, pcitag_t tag, int reg)
}
static void
-joy_pci_attach(struct device *parent __unused, struct device *self, void *aux)
+joy_pci_attach(struct device *parent, struct device *self, void *aux)
{
struct joy_softc *sc = (struct joy_softc *)self;
struct pci_attach_args *pa = aux;
diff --git a/sys/dev/pci/ld_amr.c b/sys/dev/pci/ld_amr.c
index dfcf1409373..0f39daaf9a1 100644
--- a/sys/dev/pci/ld_amr.c
+++ b/sys/dev/pci/ld_amr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_amr.c,v 1.11 2006/10/12 01:31:31 christos Exp $ */
+/* $NetBSD: ld_amr.c,v 1.12 2006/11/16 01:33:09 christos Exp $ */
/*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_amr.c,v 1.11 2006/10/12 01:31:31 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_amr.c,v 1.12 2006/11/16 01:33:09 christos Exp $");
#include "rnd.h"
@@ -81,8 +81,8 @@ static void ld_amr_handler(struct amr_ccb *);
static int ld_amr_start(struct ld_softc *, struct buf *);
static int
-ld_amr_match(struct device *parent __unused, struct cfdata *match __unused,
- void *aux __unused)
+ld_amr_match(struct device *parent, struct cfdata *match,
+ void *aux)
{
return (1);
diff --git a/sys/dev/pci/ld_twa.c b/sys/dev/pci/ld_twa.c
index 46269c5b701..1e51af4c3fc 100644
--- a/sys/dev/pci/ld_twa.c
+++ b/sys/dev/pci/ld_twa.c
@@ -1,5 +1,5 @@
/* $wasabi: ld_twa.c,v 1.9 2006/02/14 18:44:37 jordanr Exp $ */
-/* $NetBSD: ld_twa.c,v 1.3 2006/10/12 01:31:31 christos Exp $ */
+/* $NetBSD: ld_twa.c,v 1.4 2006/11/16 01:33:09 christos Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_twa.c,v 1.3 2006/10/12 01:31:31 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_twa.c,v 1.4 2006/11/16 01:33:09 christos Exp $");
#include "rnd.h"
@@ -103,8 +103,8 @@ static const struct twa_callbacks ld_twa_callbacks = {
};
static int
-ld_twa_match(struct device *parent __unused, struct cfdata *match __unused,
- void *aux __unused)
+ld_twa_match(struct device *parent, struct cfdata *match,
+ void *aux)
{
return (1);
@@ -151,7 +151,7 @@ ld_twa_detach(struct device *self, int flags)
static int
ld_twa_dobio(struct ld_twa_softc *sc, void *data, int datasize,
- int blkno __unused, struct buf *bp)
+ int blkno, struct buf *bp)
{
int rv;
struct twa_request *tr;
diff --git a/sys/dev/pci/ld_twe.c b/sys/dev/pci/ld_twe.c
index e4c42e38e0b..6b003036f5a 100644
--- a/sys/dev/pci/ld_twe.c
+++ b/sys/dev/pci/ld_twe.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_twe.c,v 1.25 2006/10/12 01:31:31 christos Exp $ */
+/* $NetBSD: ld_twe.c,v 1.26 2006/11/16 01:33:09 christos Exp $ */
/*-
* Copyright (c) 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_twe.c,v 1.25 2006/10/12 01:31:31 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_twe.c,v 1.26 2006/11/16 01:33:09 christos Exp $");
#include "rnd.h"
@@ -92,8 +92,8 @@ static const struct twe_callbacks ld_twe_callbacks = {
};
static int
-ld_twe_match(struct device *parent __unused, struct cfdata *match __unused,
- void *aux __unused)
+ld_twe_match(struct device *parent, struct cfdata *match,
+ void *aux)
{
return (1);
diff --git a/sys/dev/pci/lpt_puc.c b/sys/dev/pci/lpt_puc.c
index fff1e93bdb5..e29509e1ba2 100644
--- a/sys/dev/pci/lpt_puc.c
+++ b/sys/dev/pci/lpt_puc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lpt_puc.c,v 1.11 2006/10/12 01:31:31 christos Exp $ */
+/* $NetBSD: lpt_puc.c,v 1.12 2006/11/16 01:33:09 christos Exp $ */
/*
* Copyright (c) 1998 Christopher G. Demetriou. All rights reserved.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lpt_puc.c,v 1.11 2006/10/12 01:31:31 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpt_puc.c,v 1.12 2006/11/16 01:33:09 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: lpt_puc.c,v 1.11 2006/10/12 01:31:31 christos Exp $"
#include <dev/ic/lptvar.h>
static int
-lpt_puc_probe(struct device *parent __unused, struct cfdata *match __unused,
+lpt_puc_probe(struct device *parent, struct cfdata *match,
void *aux)
{
struct puc_attach_args *aa = aux;
@@ -66,7 +66,7 @@ lpt_puc_probe(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-lpt_puc_attach(struct device *parent __unused, struct device *self, void *aux)
+lpt_puc_attach(struct device *parent, struct device *self, void *aux)
{
struct lpt_softc *sc = (void *)self;
struct puc_attach_args *aa = aux;
diff --git a/sys/dev/pci/machfb.c b/sys/dev/pci/machfb.c
index b8b00306888..4c5c4e1de43 100644
--- a/sys/dev/pci/machfb.c
+++ b/sys/dev/pci/machfb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: machfb.c,v 1.47 2006/10/12 01:31:31 christos Exp $ */
+/* $NetBSD: machfb.c,v 1.48 2006/11/16 01:33:09 christos Exp $ */
/*
* Copyright (c) 2002 Bang Jun-Young
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
__KERNEL_RCSID(0,
- "$NetBSD: machfb.c,v 1.47 2006/10/12 01:31:31 christos Exp $");
+ "$NetBSD: machfb.c,v 1.48 2006/11/16 01:33:09 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -467,7 +467,7 @@ wait_for_idle(struct mach64_softc *sc)
}
static int
-mach64_match(struct device *parent __unused, struct cfdata *match __unused,
+mach64_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = (struct pci_attach_args *)aux;
@@ -488,7 +488,7 @@ mach64_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-mach64_attach(struct device *parent __unused, struct device *self, void *aux)
+mach64_attach(struct device *parent, struct device *self, void *aux)
{
struct mach64_softc *sc = (void *)self;
struct pci_attach_args *pa = aux;
@@ -673,7 +673,7 @@ mach64_attach(struct device *parent __unused, struct device *self, void *aux)
static void
mach64_init_screen(void *cookie, struct vcons_screen *scr, int existing,
- long *defattr __unused)
+ long *defattr)
{
struct mach64_softc *sc = cookie;
struct rasops_info *ri = &scr->scr_ri;
@@ -1267,7 +1267,7 @@ mach64_set_screentype(struct mach64_softc *sc, const struct wsscreen_descr *des)
}
static int
-mach64_is_console(struct pci_attach_args *pa __unused)
+mach64_is_console(struct pci_attach_args *pa)
{
#ifdef __sparc__
int node;
@@ -1568,7 +1568,7 @@ mach64_showpal(struct mach64_softc *sc)
#endif
static int
-mach64_allocattr(void *cookie __unused, int fg, int bg, int flags, long *attrp)
+mach64_allocattr(void *cookie, int fg, int bg, int flags, long *attrp)
{
if ((fg == 0) && (bg == 0))
{
@@ -1584,7 +1584,7 @@ mach64_allocattr(void *cookie __unused, int fg, int bg, int flags, long *attrp)
*/
static int
-mach64_ioctl(void *v, void *vs __unused, u_long cmd, caddr_t data, int flag,
+mach64_ioctl(void *v, void *vs, u_long cmd, caddr_t data, int flag,
struct lwp *l)
{
struct vcons_data *vd = v;
@@ -1641,7 +1641,7 @@ mach64_ioctl(void *v, void *vs __unused, u_long cmd, caddr_t data, int flag,
}
static paddr_t
-mach64_mmap(void *v, void *vs __unused, off_t offset, int prot)
+mach64_mmap(void *v, void *vs, off_t offset, int prot)
{
struct vcons_data *vd = v;
struct mach64_softc *sc = vd->cookie;
diff --git a/sys/dev/pci/mlx_pci.c b/sys/dev/pci/mlx_pci.c
index 9c3a8fd0bce..fa66d9a636b 100644
--- a/sys/dev/pci/mlx_pci.c
+++ b/sys/dev/pci/mlx_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mlx_pci.c,v 1.15 2006/10/12 01:31:32 christos Exp $ */
+/* $NetBSD: mlx_pci.c,v 1.16 2006/11/16 01:33:09 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mlx_pci.c,v 1.15 2006/10/12 01:31:32 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mlx_pci.c,v 1.16 2006/11/16 01:33:09 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -185,7 +185,7 @@ mlx_pci_findmpi(struct pci_attach_args *pa)
* Match a supported board.
*/
static int
-mlx_pci_match(struct device *parent __unused, struct cfdata *cfdata __unused,
+mlx_pci_match(struct device *parent, struct cfdata *cfdata,
void *aux)
{
@@ -196,7 +196,7 @@ mlx_pci_match(struct device *parent __unused, struct cfdata *cfdata __unused,
* Attach a supported board.
*/
static void
-mlx_pci_attach(struct device *parent __unused, struct device *self, void *aux)
+mlx_pci_attach(struct device *parent, struct device *self, void *aux)
{
struct pci_attach_args *pa;
struct mlx_softc *mlx;
diff --git a/sys/dev/pci/mly.c b/sys/dev/pci/mly.c
index 1df037369c9..7d46eb3786e 100644
--- a/sys/dev/pci/mly.c
+++ b/sys/dev/pci/mly.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mly.c,v 1.31 2006/11/08 00:17:09 elad Exp $ */
+/* $NetBSD: mly.c,v 1.32 2006/11/16 01:33:09 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mly.c,v 1.31 2006/11/08 00:17:09 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mly.c,v 1.32 2006/11/16 01:33:09 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -265,7 +265,7 @@ mly_find_ident(struct pci_attach_args *pa)
* Match a supported board.
*/
static int
-mly_match(struct device *parent __unused, struct cfdata *cfdata __unused,
+mly_match(struct device *parent, struct cfdata *cfdata,
void *aux)
{
@@ -276,7 +276,7 @@ mly_match(struct device *parent __unused, struct cfdata *cfdata __unused,
* Attach a supported board.
*/
static void
-mly_attach(struct device *parent __unused, struct device *self, void *aux)
+mly_attach(struct device *parent, struct device *self, void *aux)
{
struct pci_attach_args *pa;
struct mly_softc *mly;
@@ -590,7 +590,7 @@ mly_scan_channel(struct mly_softc *mly, int bus)
* Shut down all configured `mly' devices.
*/
static void
-mly_shutdown(void *cookie __unused)
+mly_shutdown(void *cookie)
{
struct mly_softc *mly;
int i;
@@ -2088,8 +2088,8 @@ mly_get_xfer_mode(struct mly_softc *mly, int bus, struct scsipi_xfer_mode *xm)
* ioctl hook; used here only to initiate low-level rescans.
*/
static int
-mly_scsipi_ioctl(struct scsipi_channel *chan, u_long cmd, caddr_t data __unused,
- int flag __unused, struct proc *p __unused)
+mly_scsipi_ioctl(struct scsipi_channel *chan, u_long cmd, caddr_t data,
+ int flag, struct proc *p)
{
struct mly_softc *mly;
int rv;
@@ -2275,7 +2275,7 @@ mly_dmamem_free(struct mly_softc *mly, int size, bus_dmamap_t dmamap,
* Accept an open operation on the control device.
*/
int
-mlyopen(dev_t dev, int flag __unused, int mode __unused, struct lwp *l __unused)
+mlyopen(dev_t dev, int flag, int mode, struct lwp *l)
{
struct mly_softc *mly;
@@ -2294,8 +2294,8 @@ mlyopen(dev_t dev, int flag __unused, int mode __unused, struct lwp *l __unused)
* Accept the last close on the control device.
*/
int
-mlyclose(dev_t dev, int flag __unused, int mode __unused,
- struct lwp *l __unused)
+mlyclose(dev_t dev, int flag, int mode,
+ struct lwp *l)
{
struct mly_softc *mly;
@@ -2308,7 +2308,7 @@ mlyclose(dev_t dev, int flag __unused, int mode __unused,
* Handle control operations.
*/
int
-mlyioctl(dev_t dev, u_long cmd, caddr_t data, int flag __unused,
+mlyioctl(dev_t dev, u_long cmd, caddr_t data, int flag,
struct lwp *l)
{
struct mly_softc *mly;
diff --git a/sys/dev/pci/mpt_pci.c b/sys/dev/pci/mpt_pci.c
index 3a39115f1f4..536c53cafc5 100644
--- a/sys/dev/pci/mpt_pci.c
+++ b/sys/dev/pci/mpt_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mpt_pci.c,v 1.9 2006/10/12 01:31:32 christos Exp $ */
+/* $NetBSD: mpt_pci.c,v 1.10 2006/11/16 01:33:09 christos Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpt_pci.c,v 1.9 2006/10/12 01:31:32 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpt_pci.c,v 1.10 2006/11/16 01:33:09 christos Exp $");
#include <dev/ic/mpt.h> /* pulls in all headers */
@@ -132,7 +132,7 @@ mpt_pci_lookup(const struct pci_attach_args *pa)
}
static int
-mpt_pci_match(struct device *parent __unused, struct cfdata *cf __unused,
+mpt_pci_match(struct device *parent, struct cfdata *cf,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -144,7 +144,7 @@ mpt_pci_match(struct device *parent __unused, struct cfdata *cf __unused,
}
static void
-mpt_pci_attach(struct device *parent __unused, struct device *self, void *aux)
+mpt_pci_attach(struct device *parent, struct device *self, void *aux)
{
struct mpt_pci_softc *psc = (void *) self;
mpt_softc_t *mpt = &psc->sc_mpt;
diff --git a/sys/dev/pci/mpu_cmpci.c b/sys/dev/pci/mpu_cmpci.c
index ede84a767dd..07816b13093 100644
--- a/sys/dev/pci/mpu_cmpci.c
+++ b/sys/dev/pci/mpu_cmpci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mpu_cmpci.c,v 1.11 2006/10/12 01:31:32 christos Exp $ */
+/* $NetBSD: mpu_cmpci.c,v 1.12 2006/11/16 01:33:09 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpu_cmpci.c,v 1.11 2006/10/12 01:31:32 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpu_cmpci.c,v 1.12 2006/11/16 01:33:09 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -60,7 +60,7 @@ __KERNEL_RCSID(0, "$NetBSD: mpu_cmpci.c,v 1.11 2006/10/12 01:31:32 christos Exp
#include <dev/pci/cmpcivar.h>
static int
-mpu_cmpci_match(struct device *parent, struct cfdata *match __unused, void *aux)
+mpu_cmpci_match(struct device *parent, struct cfdata *match, void *aux)
{
struct audio_attach_args *aa = (struct audio_attach_args *)aux;
struct cmpci_softc *ysc = (struct cmpci_softc *)parent;
@@ -75,7 +75,7 @@ mpu_cmpci_match(struct device *parent, struct cfdata *match __unused, void *aux)
}
static void
-mpu_cmpci_attach(struct device *parent, struct device *self, void *aux __unused)
+mpu_cmpci_attach(struct device *parent, struct device *self, void *aux)
{
struct cmpci_softc *ysc = (struct cmpci_softc *)parent;
struct mpu_softc *sc = (struct mpu_softc *)self;
diff --git a/sys/dev/pci/mpu_eso.c b/sys/dev/pci/mpu_eso.c
index a04a6c9ade8..463fcedf338 100644
--- a/sys/dev/pci/mpu_eso.c
+++ b/sys/dev/pci/mpu_eso.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mpu_eso.c,v 1.12 2006/10/12 01:31:32 christos Exp $ */
+/* $NetBSD: mpu_eso.c,v 1.13 2006/11/16 01:33:09 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpu_eso.c,v 1.12 2006/10/12 01:31:32 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpu_eso.c,v 1.13 2006/11/16 01:33:09 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -61,7 +61,7 @@ __KERNEL_RCSID(0, "$NetBSD: mpu_eso.c,v 1.12 2006/10/12 01:31:32 christos Exp $"
#include <dev/pci/esovar.h>
static int
-mpu_eso_match(struct device *parent, struct cfdata *match __unused, void *aux)
+mpu_eso_match(struct device *parent, struct cfdata *match, void *aux)
{
struct audio_attach_args *aa = (struct audio_attach_args *)aux;
struct eso_softc *esc = (struct eso_softc *)parent;
@@ -76,7 +76,7 @@ mpu_eso_match(struct device *parent, struct cfdata *match __unused, void *aux)
}
static void
-mpu_eso_attach(struct device *parent, struct device *self, void *aux __unused)
+mpu_eso_attach(struct device *parent, struct device *self, void *aux)
{
struct eso_softc *esc = (struct eso_softc *)parent;
struct mpu_softc *sc = (struct mpu_softc *)self;
diff --git a/sys/dev/pci/mpu_fms.c b/sys/dev/pci/mpu_fms.c
index ed786e0b570..752c502003b 100644
--- a/sys/dev/pci/mpu_fms.c
+++ b/sys/dev/pci/mpu_fms.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mpu_fms.c,v 1.12 2006/10/12 01:31:32 christos Exp $ */
+/* $NetBSD: mpu_fms.c,v 1.13 2006/11/16 01:33:09 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpu_fms.c,v 1.12 2006/10/12 01:31:32 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpu_fms.c,v 1.13 2006/11/16 01:33:09 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -62,7 +62,7 @@ __KERNEL_RCSID(0, "$NetBSD: mpu_fms.c,v 1.12 2006/10/12 01:31:32 christos Exp $"
#include <dev/pci/fmsvar.h>
static int
-mpu_fms_match(struct device *parent, struct cfdata *match __unused, void *aux)
+mpu_fms_match(struct device *parent, struct cfdata *match, void *aux)
{
struct audio_attach_args *aa = (struct audio_attach_args *)aux;
struct fms_softc *ssc = (struct fms_softc *)parent;
@@ -77,7 +77,7 @@ mpu_fms_match(struct device *parent, struct cfdata *match __unused, void *aux)
}
static void
-mpu_fms_attach(struct device *parent, struct device *self, void *aux __unused)
+mpu_fms_attach(struct device *parent, struct device *self, void *aux)
{
struct fms_softc *ssc = (struct fms_softc *)parent;
struct mpu_softc *sc = (struct mpu_softc *)self;
diff --git a/sys/dev/pci/mpu_yds.c b/sys/dev/pci/mpu_yds.c
index 516788d7034..34d8bd1ff80 100644
--- a/sys/dev/pci/mpu_yds.c
+++ b/sys/dev/pci/mpu_yds.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mpu_yds.c,v 1.11 2006/10/12 01:31:32 christos Exp $ */
+/* $NetBSD: mpu_yds.c,v 1.12 2006/11/16 01:33:09 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpu_yds.c,v 1.11 2006/10/12 01:31:32 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpu_yds.c,v 1.12 2006/11/16 01:33:09 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -63,7 +63,7 @@ __KERNEL_RCSID(0, "$NetBSD: mpu_yds.c,v 1.11 2006/10/12 01:31:32 christos Exp $"
#include <dev/pci/ydsvar.h>
static int
-mpu_yds_match(struct device *parent, struct cfdata *match __unused, void *aux)
+mpu_yds_match(struct device *parent, struct cfdata *match, void *aux)
{
struct audio_attach_args *aa = (struct audio_attach_args *)aux;
struct yds_softc *ysc = (struct yds_softc *)parent;
@@ -78,7 +78,7 @@ mpu_yds_match(struct device *parent, struct cfdata *match __unused, void *aux)
}
static void
-mpu_yds_attach(struct device *parent, struct device *self, void *aux __unused)
+mpu_yds_attach(struct device *parent, struct device *self, void *aux)
{
struct yds_softc *ysc = (struct yds_softc *)parent;
struct mpu_softc *sc = (struct mpu_softc *)self;
diff --git a/sys/dev/pci/neo.c b/sys/dev/pci/neo.c
index f41882e9bbd..9234eb09cfe 100644
--- a/sys/dev/pci/neo.c
+++ b/sys/dev/pci/neo.c
@@ -1,4 +1,4 @@
-/* $NetBSD: neo.c,v 1.34 2006/10/12 01:31:32 christos Exp $ */
+/* $NetBSD: neo.c,v 1.35 2006/11/16 01:33:09 christos Exp $ */
/*
* Copyright (c) 1999 Cameron Grant <gandalf@vilnya.demon.co.uk>
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: neo.c,v 1.34 2006/10/12 01:31:32 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: neo.c,v 1.35 2006/11/16 01:33:09 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -501,7 +501,7 @@ nm_init(struct neo_softc *sc)
}
static int
-neo_match(struct device *parent __unused, struct cfdata *match __unused,
+neo_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa;
@@ -565,7 +565,7 @@ neo_power(int why, void *addr)
}
static void
-neo_attach(struct device *parent __unused, struct device *self, void *aux)
+neo_attach(struct device *parent, struct device *self, void *aux)
{
struct neo_softc *sc;
struct pci_attach_args *pa;
@@ -700,14 +700,14 @@ neo_reset_codec(void *v)
}
static enum ac97_host_flags
-neo_flags_codec(void *v __unused)
+neo_flags_codec(void *v)
{
return AC97_HOST_DONT_READ;
}
static int
-neo_query_encoding(void *addr __unused, struct audio_encoding *fp)
+neo_query_encoding(void *addr, struct audio_encoding *fp)
{
switch (fp->index) {
@@ -766,7 +766,7 @@ neo_query_encoding(void *addr __unused, struct audio_encoding *fp)
/* Todo: don't commit settings to card until we've verified all parameters */
static int
-neo_set_params(void *addr, int setmode, int usemode __unused,
+neo_set_params(void *addr, int setmode, int usemode,
audio_params_t *play, audio_params_t *rec, stream_filter_list_t *pfil,
stream_filter_list_t *rfil)
{
@@ -820,8 +820,8 @@ neo_set_params(void *addr, int setmode, int usemode __unused,
}
static int
-neo_round_blocksize(void *addr __unused, int blk __unused, int mode __unused,
- const audio_params_t *param __unused)
+neo_round_blocksize(void *addr, int blk, int mode,
+ const audio_params_t *param)
{
return NM_BUFFSIZE / 2;
@@ -912,7 +912,7 @@ neo_halt_input(void *addr)
}
static int
-neo_getdev(void *addr __unused, struct audio_device *retp)
+neo_getdev(void *addr, struct audio_device *retp)
{
*retp = neo_device;
@@ -947,8 +947,8 @@ neo_query_devinfo(void *addr, mixer_devinfo_t *dip)
}
static void *
-neo_malloc(void *addr, int direction, size_t size __unused,
- struct malloc_type *pool __unused, int flags __unused)
+neo_malloc(void *addr, int direction, size_t size,
+ struct malloc_type *pool, int flags)
{
struct neo_softc *sc;
void *rv;
@@ -975,7 +975,7 @@ neo_malloc(void *addr, int direction, size_t size __unused,
}
static void
-neo_free(void *addr, void *ptr, struct malloc_type *pool __unused)
+neo_free(void *addr, void *ptr, struct malloc_type *pool)
{
struct neo_softc *sc;
vaddr_t v;
@@ -991,8 +991,8 @@ neo_free(void *addr, void *ptr, struct malloc_type *pool __unused)
}
static size_t
-neo_round_buffersize(void *addr __unused, int direction __unused,
- size_t size __unused)
+neo_round_buffersize(void *addr, int direction,
+ size_t size)
{
return NM_BUFFSIZE;
@@ -1019,7 +1019,7 @@ neo_mappage(void *addr, void *mem, off_t off, int prot)
}
static int
-neo_get_props(void *addr __unused)
+neo_get_props(void *addr)
{
return AUDIO_PROP_INDEPENDENT | AUDIO_PROP_MMAP |
diff --git a/sys/dev/pci/njs_pci.c b/sys/dev/pci/njs_pci.c
index 0c47165d1bf..d361793198c 100644
--- a/sys/dev/pci/njs_pci.c
+++ b/sys/dev/pci/njs_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: njs_pci.c,v 1.4 2006/10/12 01:31:32 christos Exp $ */
+/* $NetBSD: njs_pci.c,v 1.5 2006/11/16 01:33:09 christos Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: njs_pci.c,v 1.4 2006/10/12 01:31:32 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: njs_pci.c,v 1.5 2006/11/16 01:33:09 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -111,7 +111,7 @@ njs_pci_lookup(const struct pci_attach_args *pa)
}
static int
-njs_pci_match(struct device *parent __unused, struct cfdata *match __unused,
+njs_pci_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -123,7 +123,7 @@ njs_pci_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-njs_pci_attach(struct device *parent __unused, struct device *self, void *aux)
+njs_pci_attach(struct device *parent, struct device *self, void *aux)
{
struct pci_attach_args *pa = aux;
struct njsc32_pci_softc *psc = (void *) self;
diff --git a/sys/dev/pci/oboe.c b/sys/dev/pci/oboe.c
index 2f1a2b9c507..f66cba2cd37 100644
--- a/sys/dev/pci/oboe.c
+++ b/sys/dev/pci/oboe.c
@@ -1,4 +1,4 @@
-/* $NetBSD: oboe.c,v 1.23 2006/10/12 01:31:32 christos Exp $ */
+/* $NetBSD: oboe.c,v 1.24 2006/11/16 01:33:09 christos Exp $ */
/* XXXXFVDL THIS DRIVER IS BROKEN FOR NON-i386 -- vtophys() usage */
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: oboe.c,v 1.23 2006/10/12 01:31:32 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: oboe.c,v 1.24 2006/11/16 01:33:09 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -167,7 +167,7 @@ static struct irframe_methods oboe_methods = {
};
static int
-oboe_match(struct device *parent __unused, struct cfdata *match __unused,
+oboe_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -180,7 +180,7 @@ oboe_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-oboe_attach(struct device *parent __unused, struct device *self, void *aux)
+oboe_attach(struct device *parent, struct device *self, void *aux)
{
struct oboe_softc *sc = (struct oboe_softc *)self;
struct pci_attach_args *pa = aux;
@@ -270,7 +270,7 @@ oboe_activate(struct device *self, enum devact act)
}
static int
-oboe_detach(struct device *self __unused, int flags __unused)
+oboe_detach(struct device *self, int flags)
{
#ifdef OBOE_DEBUG
struct oboe_softc *sc = (struct oboe_softc *)self;
@@ -282,7 +282,7 @@ oboe_detach(struct device *self __unused, int flags __unused)
}
static int
-oboe_open(void *h, int flag __unused, int mode __unused, struct lwp *l __unused)
+oboe_open(void *h, int flag, int mode, struct lwp *l)
{
struct oboe_softc *sc = h;
@@ -297,8 +297,8 @@ oboe_open(void *h, int flag __unused, int mode __unused, struct lwp *l __unused)
}
static int
-oboe_close(void *h, int flag __unused, int mode __unused,
- struct lwp *l __unused)
+oboe_close(void *h, int flag, int mode,
+ struct lwp *l)
{
struct oboe_softc *sc = h;
int error = 0;
@@ -449,7 +449,7 @@ oboe_get_speeds(void *h, int *speeds)
}
static int
-oboe_get_turnarounds(void *h __unused, int *turnarounds)
+oboe_get_turnarounds(void *h, int *turnarounds)
{
#ifdef OBOE_DEBUG
struct oboe_softc *sc = h;
@@ -500,7 +500,7 @@ filt_oboerdetach(struct knote *kn)
}
static int
-filt_oboeread(struct knote *kn, long hint __unused)
+filt_oboeread(struct knote *kn, long hint)
{
struct oboe_softc *sc = kn->kn_hook;
@@ -554,7 +554,7 @@ oboe_kqfilter(void *h, struct knote *kn)
}
static int
-oboe_reset(struct oboe_softc *sc __unused)
+oboe_reset(struct oboe_softc *sc)
{
#if 0
OUTB(sc, 0x00, OBOE_RST);
diff --git a/sys/dev/pci/ohci_pci.c b/sys/dev/pci/ohci_pci.c
index 6a2da020ecd..d6bcdd49168 100644
--- a/sys/dev/pci/ohci_pci.c
+++ b/sys/dev/pci/ohci_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci_pci.c,v 1.30 2006/10/12 01:31:32 christos Exp $ */
+/* $NetBSD: ohci_pci.c,v 1.31 2006/11/16 01:33:09 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci_pci.c,v 1.30 2006/10/12 01:31:32 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci_pci.c,v 1.31 2006/11/16 01:33:09 christos Exp $");
#include "ehci.h"
@@ -72,7 +72,7 @@ struct ohci_pci_softc {
};
static int
-ohci_pci_match(struct device *parent __unused, struct cfdata *match __unused,
+ohci_pci_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = (struct pci_attach_args *) aux;
@@ -86,7 +86,7 @@ ohci_pci_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-ohci_pci_attach(struct device *parent __unused, struct device *self, void *aux)
+ohci_pci_attach(struct device *parent, struct device *self, void *aux)
{
struct ohci_pci_softc *sc = (struct ohci_pci_softc *)self;
struct pci_attach_args *pa = (struct pci_attach_args *)aux;
diff --git a/sys/dev/pci/opl_cmpci.c b/sys/dev/pci/opl_cmpci.c
index 6fb09de6c58..5e92fca2437 100644
--- a/sys/dev/pci/opl_cmpci.c
+++ b/sys/dev/pci/opl_cmpci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: opl_cmpci.c,v 1.11 2006/10/12 01:31:32 christos Exp $ */
+/* $NetBSD: opl_cmpci.c,v 1.12 2006/11/16 01:33:09 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opl_cmpci.c,v 1.11 2006/10/12 01:31:32 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opl_cmpci.c,v 1.12 2006/11/16 01:33:09 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -64,7 +64,7 @@ __KERNEL_RCSID(0, "$NetBSD: opl_cmpci.c,v 1.11 2006/10/12 01:31:32 christos Exp
#include <dev/pci/cmpcivar.h>
static int
-opl_cmpci_match(struct device *parent, struct cfdata *match __unused, void *aux)
+opl_cmpci_match(struct device *parent, struct cfdata *match, void *aux)
{
struct audio_attach_args *aa = (struct audio_attach_args *)aux;
struct cmpci_softc *ssc = (struct cmpci_softc *)parent;
@@ -75,7 +75,7 @@ opl_cmpci_match(struct device *parent, struct cfdata *match __unused, void *aux)
}
static void
-opl_cmpci_attach(struct device *parent, struct device *self, void *aux __unused)
+opl_cmpci_attach(struct device *parent, struct device *self, void *aux)
{
struct cmpci_softc *ssc = (struct cmpci_softc *)parent;
struct opl_softc *sc = (struct opl_softc *)self;
diff --git a/sys/dev/pci/opl_eso.c b/sys/dev/pci/opl_eso.c
index 051f5274f9e..6b463f62949 100644
--- a/sys/dev/pci/opl_eso.c
+++ b/sys/dev/pci/opl_eso.c
@@ -1,4 +1,4 @@
-/* $NetBSD: opl_eso.c,v 1.12 2006/10/12 01:31:32 christos Exp $ */
+/* $NetBSD: opl_eso.c,v 1.13 2006/11/16 01:33:09 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opl_eso.c,v 1.12 2006/10/12 01:31:32 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opl_eso.c,v 1.13 2006/11/16 01:33:09 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -64,7 +64,7 @@ __KERNEL_RCSID(0, "$NetBSD: opl_eso.c,v 1.12 2006/10/12 01:31:32 christos Exp $"
#include <dev/pci/esovar.h>
static int
-opl_eso_match(struct device *parent __unused, struct cfdata *match __unused,
+opl_eso_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct audio_attach_args *aa = (struct audio_attach_args *)aux;
@@ -75,7 +75,7 @@ opl_eso_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-opl_eso_attach(struct device *parent, struct device *self, void *aux __unused)
+opl_eso_attach(struct device *parent, struct device *self, void *aux)
{
struct eso_softc *esc = (struct eso_softc *)parent;
struct opl_softc *sc = (struct opl_softc *)self;
diff --git a/sys/dev/pci/opl_fms.c b/sys/dev/pci/opl_fms.c
index dfdb56d1fce..6d504f7a054 100644
--- a/sys/dev/pci/opl_fms.c
+++ b/sys/dev/pci/opl_fms.c
@@ -1,4 +1,4 @@
-/* $NetBSD: opl_fms.c,v 1.11 2006/10/12 01:31:32 christos Exp $ */
+/* $NetBSD: opl_fms.c,v 1.12 2006/11/16 01:33:09 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opl_fms.c,v 1.11 2006/10/12 01:31:32 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opl_fms.c,v 1.12 2006/11/16 01:33:09 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -65,7 +65,7 @@ __KERNEL_RCSID(0, "$NetBSD: opl_fms.c,v 1.11 2006/10/12 01:31:32 christos Exp $"
#include <dev/pci/fmsvar.h>
static int
-opl_fms_match(struct device *parent __unused, struct cfdata *match __unused,
+opl_fms_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct audio_attach_args *aa = (struct audio_attach_args *)aux;
@@ -76,7 +76,7 @@ opl_fms_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-opl_fms_attach(struct device *parent, struct device *self, void *aux __unused)
+opl_fms_attach(struct device *parent, struct device *self, void *aux)
{
struct fms_softc *ssc = (struct fms_softc *)parent;
struct opl_softc *sc = (struct opl_softc *)self;
diff --git a/sys/dev/pci/opl_sv.c b/sys/dev/pci/opl_sv.c
index b22938f223c..6efe7a16121 100644
--- a/sys/dev/pci/opl_sv.c
+++ b/sys/dev/pci/opl_sv.c
@@ -1,4 +1,4 @@
-/* $NetBSD: opl_sv.c,v 1.10 2006/10/12 01:31:32 christos Exp $ */
+/* $NetBSD: opl_sv.c,v 1.11 2006/11/16 01:33:09 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opl_sv.c,v 1.10 2006/10/12 01:31:32 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opl_sv.c,v 1.11 2006/11/16 01:33:09 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -64,7 +64,7 @@ __KERNEL_RCSID(0, "$NetBSD: opl_sv.c,v 1.10 2006/10/12 01:31:32 christos Exp $")
#include <dev/pci/svvar.h>
static int
-opl_sv_match(struct device *parent __unused, struct cfdata *match __unused,
+opl_sv_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct audio_attach_args *aa = (struct audio_attach_args *)aux;
@@ -75,7 +75,7 @@ opl_sv_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-opl_sv_attach(struct device *parent, struct device *self, void *aux __unused)
+opl_sv_attach(struct device *parent, struct device *self, void *aux)
{
struct sv_softc *ssc = (struct sv_softc *)parent;
struct opl_softc *sc = (struct opl_softc *)self;
diff --git a/sys/dev/pci/opl_yds.c b/sys/dev/pci/opl_yds.c
index 344ac64f811..8ec767d7274 100644
--- a/sys/dev/pci/opl_yds.c
+++ b/sys/dev/pci/opl_yds.c
@@ -1,4 +1,4 @@
-/* $NetBSD: opl_yds.c,v 1.11 2006/10/12 01:31:32 christos Exp $ */
+/* $NetBSD: opl_yds.c,v 1.12 2006/11/16 01:33:09 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opl_yds.c,v 1.11 2006/10/12 01:31:32 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opl_yds.c,v 1.12 2006/11/16 01:33:09 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -66,7 +66,7 @@ __KERNEL_RCSID(0, "$NetBSD: opl_yds.c,v 1.11 2006/10/12 01:31:32 christos Exp $"
#include <dev/pci/ydsvar.h>
static int
-opl_yds_match(struct device *parent, struct cfdata *match __unused, void *aux)
+opl_yds_match(struct device *parent, struct cfdata *match, void *aux)
{
struct audio_attach_args *aa = (struct audio_attach_args *)aux;
struct yds_softc *ssc = (struct yds_softc *)parent;
@@ -77,7 +77,7 @@ opl_yds_match(struct device *parent, struct cfdata *match __unused, void *aux)
}
static void
-opl_yds_attach(struct device *parent, struct device *self, void *aux __unused)
+opl_yds_attach(struct device *parent, struct device *self, void *aux)
{
struct yds_softc *ssc = (struct yds_softc *)parent;
struct opl_softc *sc = (struct opl_softc *)self;
diff --git a/sys/dev/pci/optiide.c b/sys/dev/pci/optiide.c
index 9fb7770eb4b..a619dca6585 100644
--- a/sys/dev/pci/optiide.c
+++ b/sys/dev/pci/optiide.c
@@ -1,4 +1,4 @@
-/* $NetBSD: optiide.c,v 1.13 2006/10/12 01:31:32 christos Exp $ */
+/* $NetBSD: optiide.c,v 1.14 2006/11/16 01:33:09 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: optiide.c,v 1.13 2006/10/12 01:31:32 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: optiide.c,v 1.14 2006/11/16 01:33:09 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -81,7 +81,7 @@ static const struct pciide_product_desc pciide_opti_products[] = {
};
static int
-optiide_match(struct device *parent __unused, struct cfdata *match __unused,
+optiide_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -96,7 +96,7 @@ optiide_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-optiide_attach(struct device *parent __unused, struct device *self, void *aux)
+optiide_attach(struct device *parent, struct device *self, void *aux)
{
struct pci_attach_args *pa = aux;
struct pciide_softc *sc = (struct pciide_softc *)self;
diff --git a/sys/dev/pci/pccbb.c b/sys/dev/pci/pccbb.c
index 8b8c0f58b53..2d4741088bf 100644
--- a/sys/dev/pci/pccbb.c
+++ b/sys/dev/pci/pccbb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pccbb.c,v 1.136 2006/10/24 14:16:39 itohy Exp $ */
+/* $NetBSD: pccbb.c,v 1.137 2006/11/16 01:33:09 christos Exp $ */
/*
* Copyright (c) 1998, 1999 and 2000
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pccbb.c,v 1.136 2006/10/24 14:16:39 itohy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pccbb.c,v 1.137 2006/11/16 01:33:09 christos Exp $");
/*
#define CBB_DEBUG
@@ -280,7 +280,7 @@ static struct cardbus_functions pccbb_funcs = {
#endif
int
-pcicbbmatch(struct device *parent __unused, struct cfdata *match __unused,
+pcicbbmatch(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = (struct pci_attach_args *)aux;
@@ -420,7 +420,7 @@ pccbb_shutdown(void *arg)
}
void
-pccbbattach(struct device *parent __unused, struct device *self, void *aux)
+pccbbattach(struct device *parent, struct device *self, void *aux)
{
struct pccbb_softc *sc = (void *)self;
struct pci_attach_args *pa = aux;
@@ -1581,7 +1581,7 @@ cb_detect_voltage(sc)
}
STATIC int
-cbbprint(void *aux __unused, const char *pcic __unused)
+cbbprint(void *aux, const char *pcic)
{
#if 0
struct cbslot_attach_args *cba = aux;
@@ -1829,7 +1829,7 @@ pccbb_intr_route(sc)
* The arguments irq is not used because pccbb selects intr vector.
*/
static void *
-pccbb_intr_establish(struct pccbb_softc *sc, int irq __unused, int level,
+pccbb_intr_establish(struct pccbb_softc *sc, int irq, int level,
int (*func)(void *), void *arg)
{
struct pccbb_intrhand_list *pil, *newpil;
@@ -1996,7 +1996,7 @@ pccbb_make_tag(cc, busno, function)
}
static void
-pccbb_free_tag(cardbus_chipset_tag_t cc __unused, cardbustag_t tag __unused)
+pccbb_free_tag(cardbus_chipset_tag_t cc, cardbustag_t tag)
{
}
@@ -2394,7 +2394,7 @@ pccbb_pcmcia_wait_ready(ph)
*/
static void
pccbb_pcmcia_delay(
- struct pcic_handle *ph __unused,
+ struct pcic_handle *ph,
int timo, /* in ms. must not be zero */
const char *wmesg
)
diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c
index 725ad1e55ab..575b187f6d6 100644
--- a/sys/dev/pci/pci.c
+++ b/sys/dev/pci/pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci.c,v 1.102 2006/10/12 01:31:32 christos Exp $ */
+/* $NetBSD: pci.c,v 1.103 2006/11/16 01:33:09 christos Exp $ */
/*
* Copyright (c) 1995, 1996, 1997, 1998
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci.c,v 1.102 2006/10/12 01:31:32 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci.c,v 1.103 2006/11/16 01:33:09 christos Exp $");
#include "opt_pci.h"
@@ -94,7 +94,7 @@ int pci_enumerate_bus(struct pci_softc *, const int *,
*/
static int
-pcirescan(struct device *sc, const char *ifattr __unused, const int *locators)
+pcirescan(struct device *sc, const char *ifattr, const int *locators)
{
KASSERT(ifattr && !strcmp(ifattr, "pci"));
@@ -105,7 +105,7 @@ pcirescan(struct device *sc, const char *ifattr __unused, const int *locators)
}
static int
-pcimatch(struct device *parent __unused, struct cfdata *cf, void *aux)
+pcimatch(struct device *parent, struct cfdata *cf, void *aux)
{
struct pcibus_attach_args *pba = aux;
@@ -666,7 +666,7 @@ pci_vpd_write(pci_chipset_tag_t pc, pcitag_t tag, int offset, int count,
}
int
-pci_dma64_available(struct pci_attach_args *pa __unused)
+pci_dma64_available(struct pci_attach_args *pa)
{
#ifdef _PCI_HAVE_DMA64
if (BUS_DMA_TAG_VALID(pa->pa_dmat64) &&
@@ -815,8 +815,8 @@ pci_activate(pci_chipset_tag_t pc, pcitag_t tag, void *sc,
}
int
-pci_activate_null(pci_chipset_tag_t pc __unused, pcitag_t tag __unused,
- void *sc __unused, pcireg_t state __unused)
+pci_activate_null(pci_chipset_tag_t pc, pcitag_t tag,
+ void *sc, pcireg_t state)
{
return 0;
}
diff --git a/sys/dev/pci/pci_map.c b/sys/dev/pci/pci_map.c
index 01b6167c28e..5e7cf64199e 100644
--- a/sys/dev/pci/pci_map.c
+++ b/sys/dev/pci/pci_map.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_map.c,v 1.17 2006/10/12 01:31:32 christos Exp $ */
+/* $NetBSD: pci_map.c,v 1.18 2006/11/16 01:33:09 christos Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_map.c,v 1.17 2006/10/12 01:31:32 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_map.c,v 1.18 2006/11/16 01:33:09 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: pci_map.c,v 1.17 2006/10/12 01:31:32 christos Exp $"
#include <dev/pci/pcivar.h>
static int
-pci_io_find(pci_chipset_tag_t pc, pcitag_t tag, int reg, pcireg_t type __unused,
+pci_io_find(pci_chipset_tag_t pc, pcitag_t tag, int reg, pcireg_t type,
bus_addr_t *basep, bus_size_t *sizep, int *flagsp)
{
pcireg_t address, mask;
diff --git a/sys/dev/pci/pci_subr.c b/sys/dev/pci/pci_subr.c
index 136715342a1..6e8f85ac467 100644
--- a/sys/dev/pci/pci_subr.c
+++ b/sys/dev/pci/pci_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_subr.c,v 1.70 2006/11/08 18:44:16 drochner Exp $ */
+/* $NetBSD: pci_subr.c,v 1.71 2006/11/16 01:33:09 christos Exp $ */
/*
* Copyright (c) 1997 Zubin D. Dittia. All rights reserved.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.70 2006/11/08 18:44:16 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.71 2006/11/16 01:33:09 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_pci.h"
@@ -312,7 +312,7 @@ struct pci_product {
#endif /* PCIVERBOSE */
const char *
-pci_findvendor(pcireg_t id_reg __unused)
+pci_findvendor(pcireg_t id_reg)
{
#ifdef PCIVERBOSE
pci_vendor_id_t vendor = PCI_VENDOR(id_reg);
@@ -326,7 +326,7 @@ pci_findvendor(pcireg_t id_reg __unused)
}
const char *
-pci_findproduct(pcireg_t id_reg __unused)
+pci_findproduct(pcireg_t id_reg)
{
#ifdef PCIVERBOSE
pci_vendor_id_t vendor = PCI_VENDOR(id_reg);
@@ -438,7 +438,7 @@ pci_devinfo(pcireg_t id_reg, pcireg_t class_reg, int showclass, char *cp,
static void
pci_conf_print_common(
#ifdef _KERNEL
- pci_chipset_tag_t pc __unused, pcitag_t tag __unused,
+ pci_chipset_tag_t pc, pcitag_t tag,
#endif
const pcireg_t *regs)
{
@@ -780,7 +780,7 @@ pci_conf_print_type0(
static void
pci_conf_print_caplist(
#ifdef _KERNEL
- pci_chipset_tag_t pc __unused, pcitag_t tag __unused,
+ pci_chipset_tag_t pc, pcitag_t tag,
#endif
const pcireg_t *regs, int capoff)
{
diff --git a/sys/dev/pci/pci_usrreq.c b/sys/dev/pci/pci_usrreq.c
index 3e5c3036cd8..0dfde95adf7 100644
--- a/sys/dev/pci/pci_usrreq.c
+++ b/sys/dev/pci/pci_usrreq.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_usrreq.c,v 1.12 2006/10/12 01:31:33 christos Exp $ */
+/* $NetBSD: pci_usrreq.c,v 1.13 2006/11/16 01:33:09 christos Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_usrreq.c,v 1.12 2006/10/12 01:31:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_usrreq.c,v 1.13 2006/11/16 01:33:09 christos Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -56,8 +56,8 @@ __KERNEL_RCSID(0, "$NetBSD: pci_usrreq.c,v 1.12 2006/10/12 01:31:33 christos Exp
#include <dev/pci/pciio.h>
static int
-pciopen(dev_t dev, int flags __unused, int mode __unused,
- struct lwp *l __unused)
+pciopen(dev_t dev, int flags, int mode,
+ struct lwp *l)
{
struct pci_softc *sc;
int unit;
@@ -71,7 +71,7 @@ pciopen(dev_t dev, int flags __unused, int mode __unused,
}
static int
-pciioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l __unused)
+pciioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct pci_softc *sc = device_lookup(&pci_cd, minor(dev));
struct pciio_bdf_cfgreg *bdfr = (void *) data;
@@ -110,7 +110,7 @@ pciioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l __unused)
}
static paddr_t
-pcimmap(dev_t dev __unused, off_t offset __unused, int prot __unused)
+pcimmap(dev_t dev, off_t offset, int prot)
{
#if 0
struct pci_softc *sc = device_lookup(&pci_cd, minor(dev));
@@ -141,7 +141,7 @@ const struct cdevsw pci_cdevsw = {
*/
int
pci_devioctl(pci_chipset_tag_t pc, pcitag_t tag, u_long cmd, caddr_t data,
- int flag, struct lwp *l __unused)
+ int flag, struct lwp *l)
{
struct pciio_cfgreg *r = (void *) data;
diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c
index 953769bca9a..207dbd6cc74 100644
--- a/sys/dev/pci/pciide.c
+++ b/sys/dev/pci/pciide.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide.c,v 1.214 2006/10/12 01:31:33 christos Exp $ */
+/* $NetBSD: pciide.c,v 1.215 2006/11/16 01:33:09 christos Exp $ */
/*
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pciide.c,v 1.214 2006/10/12 01:31:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciide.c,v 1.215 2006/11/16 01:33:09 christos Exp $");
#include <sys/param.h>
@@ -90,7 +90,7 @@ CFATTACH_DECL(pciide, sizeof(struct pciide_softc),
pciide_match, pciide_attach, NULL, NULL);
int
-pciide_match(struct device *parent __unused, struct cfdata *match __unused,
+pciide_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -109,7 +109,7 @@ pciide_match(struct device *parent __unused, struct cfdata *match __unused,
}
void
-pciide_attach(struct device *parent __unused, struct device *self, void *aux)
+pciide_attach(struct device *parent, struct device *self, void *aux)
{
struct pci_attach_args *pa = aux;
struct pciide_softc *sc = (struct pciide_softc *)self;
diff --git a/sys/dev/pci/pciide_common.c b/sys/dev/pci/pciide_common.c
index 5a42457a956..b1dedf16f59 100644
--- a/sys/dev/pci/pciide_common.c
+++ b/sys/dev/pci/pciide_common.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_common.c,v 1.34 2006/10/17 15:16:30 itohy Exp $ */
+/* $NetBSD: pciide_common.c,v 1.35 2006/11/16 01:33:10 christos Exp $ */
/*
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pciide_common.c,v 1.34 2006/10/17 15:16:30 itohy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciide_common.c,v 1.35 2006/11/16 01:33:10 christos Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@@ -705,7 +705,7 @@ pciide_dma_init(v, channel, drive, databuf, datalen, flags)
}
void
-pciide_dma_start(void *v, int channel, int drive __unused)
+pciide_dma_start(void *v, int channel, int drive)
{
struct pciide_softc *sc = v;
struct pciide_channel *cp = &sc->pciide_channels[channel];
diff --git a/sys/dev/pci/pcscp.c b/sys/dev/pci/pcscp.c
index ed6a28111b4..68568e522e8 100644
--- a/sys/dev/pci/pcscp.c
+++ b/sys/dev/pci/pcscp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pcscp.c,v 1.37 2006/10/12 01:31:33 christos Exp $ */
+/* $NetBSD: pcscp.c,v 1.38 2006/11/16 01:33:10 christos Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcscp.c,v 1.37 2006/10/12 01:31:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcscp.c,v 1.38 2006/11/16 01:33:10 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -133,7 +133,7 @@ static struct ncr53c9x_glue pcscp_glue = {
};
static int
-pcscp_match(struct device *parent __unused, struct cfdata *match __unused,
+pcscp_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -152,7 +152,7 @@ pcscp_match(struct device *parent __unused, struct cfdata *match __unused,
* Attach this instance, and then all the sub-devices
*/
static void
-pcscp_attach(struct device *parent __unused, struct device *self, void *aux)
+pcscp_attach(struct device *parent, struct device *self, void *aux)
{
struct pci_attach_args *pa = aux;
struct pcscp_softc *esc = (void *)self;
diff --git a/sys/dev/pci/pdcide.c b/sys/dev/pci/pdcide.c
index 97a0c7dc1d1..8245b63b459 100644
--- a/sys/dev/pci/pdcide.c
+++ b/sys/dev/pci/pdcide.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pdcide.c,v 1.23 2006/10/12 01:31:33 christos Exp $ */
+/* $NetBSD: pdcide.c,v 1.24 2006/11/16 01:33:10 christos Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Manuel Bouyer.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pdcide.c,v 1.23 2006/10/12 01:31:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pdcide.c,v 1.24 2006/11/16 01:33:10 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -119,7 +119,7 @@ static const struct pciide_product_desc pciide_promise_products[] = {
};
static int
-pdcide_match(struct device *parent __unused, struct cfdata *match __unused,
+pdcide_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -132,7 +132,7 @@ pdcide_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-pdcide_attach(struct device *parent __unused, struct device *self, void *aux)
+pdcide_attach(struct device *parent, struct device *self, void *aux)
{
struct pci_attach_args *pa = aux;
struct pciide_softc *sc = (struct pciide_softc *)self;
diff --git a/sys/dev/pci/pdcsata.c b/sys/dev/pci/pdcsata.c
index 6d324790280..98b5227d1a9 100644
--- a/sys/dev/pci/pdcsata.c
+++ b/sys/dev/pci/pdcsata.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pdcsata.c,v 1.13 2006/10/25 17:38:27 bouyer Exp $ */
+/* $NetBSD: pdcsata.c,v 1.14 2006/11/16 01:33:10 christos Exp $ */
/*
* Copyright (c) 2004, Manuel Bouyer.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pdcsata.c,v 1.13 2006/10/25 17:38:27 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pdcsata.c,v 1.14 2006/11/16 01:33:10 christos Exp $");
#include <sys/types.h>
#include <sys/malloc.h>
@@ -201,7 +201,7 @@ static const struct pciide_product_desc pciide_pdcsata_products[] = {
};
static int
-pdcsata_match(struct device *parent __unused, struct cfdata *match __unused,
+pdcsata_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -214,7 +214,7 @@ pdcsata_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-pdcsata_attach(struct device *parent __unused, struct device *self, void *aux)
+pdcsata_attach(struct device *parent, struct device *self, void *aux)
{
struct pci_attach_args *pa = aux;
struct pciide_softc *sc = (struct pciide_softc *)self;
@@ -593,7 +593,7 @@ pdc203xx_dma_start(void *v, int channel, int drive)
}
static int
-pdc203xx_dma_finish(void *v, int channel, int drive, int force __unused)
+pdc203xx_dma_finish(void *v, int channel, int drive, int force)
{
struct pciide_softc *sc = v;
struct pciide_channel *cp = &sc->pciide_channels[channel];
diff --git a/sys/dev/pci/piixide.c b/sys/dev/pci/piixide.c
index 47362c25a9a..48e61c89f40 100644
--- a/sys/dev/pci/piixide.c
+++ b/sys/dev/pci/piixide.c
@@ -1,4 +1,4 @@
-/* $NetBSD: piixide.c,v 1.32 2006/11/08 11:09:52 drochner Exp $ */
+/* $NetBSD: piixide.c,v 1.33 2006/11/16 01:33:10 christos Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Manuel Bouyer.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: piixide.c,v 1.32 2006/11/08 11:09:52 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: piixide.c,v 1.33 2006/11/16 01:33:10 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -240,7 +240,7 @@ CFATTACH_DECL(piixide, sizeof(struct pciide_softc),
piixide_match, piixide_attach, NULL, NULL);
static int
-piixide_match(struct device *parent __unused, struct cfdata *match __unused,
+piixide_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -253,7 +253,7 @@ piixide_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-piixide_attach(struct device *parent __unused, struct device *self, void *aux)
+piixide_attach(struct device *parent, struct device *self, void *aux)
{
struct pci_attach_args *pa = aux;
struct pciide_softc *sc = (struct pciide_softc *)self;
diff --git a/sys/dev/pci/piixpm.c b/sys/dev/pci/piixpm.c
index 4c65e2162ae..21d68e497f5 100644
--- a/sys/dev/pci/piixpm.c
+++ b/sys/dev/pci/piixpm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: piixpm.c,v 1.10 2006/10/31 14:03:07 toshii Exp $ */
+/* $NetBSD: piixpm.c,v 1.11 2006/11/16 01:33:10 christos Exp $ */
/* $OpenBSD: piixpm.c,v 1.20 2006/02/27 08:25:02 grange Exp $ */
/*
@@ -96,7 +96,7 @@ CFATTACH_DECL(piixpm, sizeof(struct piixpm_softc),
piixpm_match, piixpm_attach, NULL, NULL);
int
-piixpm_match(struct device *parent __unused, struct cfdata *match __unused,
+piixpm_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa;
@@ -124,7 +124,7 @@ piixpm_match(struct device *parent __unused, struct cfdata *match __unused,
}
void
-piixpm_attach(struct device *parent __unused, struct device *self, void *aux)
+piixpm_attach(struct device *parent, struct device *self, void *aux)
{
struct piixpm_softc *sc = (struct piixpm_softc *)self;
struct pci_attach_args *pa = aux;
diff --git a/sys/dev/pci/ppb.c b/sys/dev/pci/ppb.c
index e0e18ea2aef..5fa39bb236d 100644
--- a/sys/dev/pci/ppb.c
+++ b/sys/dev/pci/ppb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ppb.c,v 1.33 2006/10/12 01:31:33 christos Exp $ */
+/* $NetBSD: ppb.c,v 1.34 2006/11/16 01:33:10 christos Exp $ */
/*
* Copyright (c) 1996, 1998 Christopher G. Demetriou. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ppb.c,v 1.33 2006/10/12 01:31:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ppb.c,v 1.34 2006/11/16 01:33:10 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -49,7 +49,7 @@ struct ppb_softc {
};
static int
-ppbmatch(struct device *parent __unused, struct cfdata *match __unused,
+ppbmatch(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -67,7 +67,7 @@ ppbmatch(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-ppbattach(struct device *parent __unused, struct device *self, void *aux)
+ppbattach(struct device *parent, struct device *self, void *aux)
{
struct ppb_softc *sc = (void *) self;
struct pci_attach_args *pa = aux;
diff --git a/sys/dev/pci/puc.c b/sys/dev/pci/puc.c
index defbab05c68..ef63c647121 100644
--- a/sys/dev/pci/puc.c
+++ b/sys/dev/pci/puc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: puc.c,v 1.28 2006/10/12 01:31:33 christos Exp $ */
+/* $NetBSD: puc.c,v 1.29 2006/11/16 01:33:10 christos Exp $ */
/*
* Copyright (c) 1996, 1998, 1999
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: puc.c,v 1.28 2006/10/12 01:31:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puc.c,v 1.29 2006/11/16 01:33:10 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -100,7 +100,7 @@ static int puc_print(void *, const char *);
static const char *puc_port_type_name(int);
static int
-puc_match(struct device *parent __unused, struct cfdata *match __unused,
+puc_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -141,7 +141,7 @@ puc_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-puc_attach(struct device *parent __unused, struct device *self, void *aux)
+puc_attach(struct device *parent, struct device *self, void *aux)
{
struct puc_softc *sc = (struct puc_softc *)self;
struct pci_attach_args *pa = aux;
diff --git a/sys/dev/pci/rccide.c b/sys/dev/pci/rccide.c
index d01da501ac6..0baf7d2700d 100644
--- a/sys/dev/pci/rccide.c
+++ b/sys/dev/pci/rccide.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rccide.c,v 1.14 2006/10/12 01:31:33 christos Exp $ */
+/* $NetBSD: rccide.c,v 1.15 2006/11/16 01:33:10 christos Exp $ */
/*
* Copyright (c) 2003 By Noon Software, Inc. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rccide.c,v 1.14 2006/10/12 01:31:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rccide.c,v 1.15 2006/11/16 01:33:10 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -78,7 +78,7 @@ static const struct pciide_product_desc pciide_serverworks_products[] = {
};
static int
-rccide_match(struct device *parent __unused, struct cfdata *match __unused,
+rccide_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -94,7 +94,7 @@ rccide_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-rccide_attach(struct device *parent __unused, struct device *self, void *aux)
+rccide_attach(struct device *parent, struct device *self, void *aux)
{
struct pci_attach_args *pa = aux;
struct pciide_softc *sc = (void *)self;
diff --git a/sys/dev/pci/satalink.c b/sys/dev/pci/satalink.c
index 98ed7b057d0..3cb739a708d 100644
--- a/sys/dev/pci/satalink.c
+++ b/sys/dev/pci/satalink.c
@@ -1,4 +1,4 @@
-/* $NetBSD: satalink.c,v 1.32 2006/10/25 17:34:49 bouyer Exp $ */
+/* $NetBSD: satalink.c,v 1.33 2006/11/16 01:33:10 christos Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: satalink.c,v 1.32 2006/10/25 17:34:49 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: satalink.c,v 1.33 2006/11/16 01:33:10 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -303,7 +303,7 @@ static const struct pciide_product_desc pciide_satalink_products[] = {
};
static int
-satalink_match(struct device *parent __unused, struct cfdata *match __unused,
+satalink_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -316,7 +316,7 @@ satalink_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-satalink_attach(struct device *parent __unused, struct device *self, void *aux)
+satalink_attach(struct device *parent, struct device *self, void *aux)
{
struct pci_attach_args *pa = aux;
struct pciide_softc *sc = (struct pciide_softc *)self;
diff --git a/sys/dev/pci/siop_pci.c b/sys/dev/pci/siop_pci.c
index 847fb720e27..220513ad88d 100644
--- a/sys/dev/pci/siop_pci.c
+++ b/sys/dev/pci/siop_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: siop_pci.c,v 1.20 2006/10/12 01:31:33 christos Exp $ */
+/* $NetBSD: siop_pci.c,v 1.21 2006/11/16 01:33:10 christos Exp $ */
/*
* Copyright (c) 2000 Manuel Bouyer.
@@ -32,7 +32,7 @@
/* SYM53c8xx PCI-SCSI I/O Processors driver: PCI front-end */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: siop_pci.c,v 1.20 2006/10/12 01:31:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siop_pci.c,v 1.21 2006/11/16 01:33:10 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -57,7 +57,7 @@ struct siop_pci_softc {
};
static int
-siop_pci_match(struct device *parent __unused, struct cfdata *match __unused,
+siop_pci_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -71,7 +71,7 @@ siop_pci_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-siop_pci_attach(struct device *parent __unused, struct device *self, void *aux)
+siop_pci_attach(struct device *parent, struct device *self, void *aux)
{
struct pci_attach_args *pa = aux;
struct siop_pci_softc *sc = (struct siop_pci_softc *)self;
diff --git a/sys/dev/pci/siside.c b/sys/dev/pci/siside.c
index 13704073295..1ee2d1c84fe 100644
--- a/sys/dev/pci/siside.c
+++ b/sys/dev/pci/siside.c
@@ -1,4 +1,4 @@
-/* $NetBSD: siside.c,v 1.20 2006/10/12 01:31:33 christos Exp $ */
+/* $NetBSD: siside.c,v 1.21 2006/11/16 01:33:10 christos Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Manuel Bouyer.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: siside.c,v 1.20 2006/10/12 01:31:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siside.c,v 1.21 2006/11/16 01:33:10 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -84,7 +84,7 @@ static const struct pciide_product_desc pciide_sis_products[] = {
};
static int
-siside_match(struct device *parent __unused, struct cfdata *match __unused,
+siside_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -97,7 +97,7 @@ siside_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-siside_attach(struct device *parent __unused, struct device *self, void *aux)
+siside_attach(struct device *parent, struct device *self, void *aux)
{
struct pci_attach_args *pa = aux;
struct pciide_softc *sc = (struct pciide_softc *)self;
diff --git a/sys/dev/pci/slide.c b/sys/dev/pci/slide.c
index 09d7f0935bf..0223047a1cc 100644
--- a/sys/dev/pci/slide.c
+++ b/sys/dev/pci/slide.c
@@ -1,4 +1,4 @@
-/* $NetBSD: slide.c,v 1.14 2006/10/12 01:31:33 christos Exp $ */
+/* $NetBSD: slide.c,v 1.15 2006/11/16 01:33:10 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: slide.c,v 1.14 2006/10/12 01:31:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: slide.c,v 1.15 2006/11/16 01:33:10 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -84,7 +84,7 @@ static const struct pciide_product_desc pciide_winbond_products[] = {
};
static int
-slide_match(struct device *parent __unused, struct cfdata *match __unused,
+slide_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -101,7 +101,7 @@ slide_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-slide_attach(struct device *parent __unused, struct device *self, void *aux)
+slide_attach(struct device *parent, struct device *self, void *aux)
{
struct pci_attach_args *pa = aux;
struct pciide_softc *sc = (struct pciide_softc *)self;
diff --git a/sys/dev/pci/stpcide.c b/sys/dev/pci/stpcide.c
index 539b0c34a61..fafb51fcfa4 100644
--- a/sys/dev/pci/stpcide.c
+++ b/sys/dev/pci/stpcide.c
@@ -1,4 +1,4 @@
-/* $NetBSD: stpcide.c,v 1.15 2006/10/12 01:31:33 christos Exp $ */
+/* $NetBSD: stpcide.c,v 1.16 2006/11/16 01:33:10 christos Exp $ */
/*
* Copyright (c) 2003 Tohru Nishimura
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: stpcide.c,v 1.15 2006/10/12 01:31:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: stpcide.c,v 1.16 2006/11/16 01:33:10 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -59,7 +59,7 @@ CFATTACH_DECL(stpcide, sizeof(struct pciide_softc),
stpcide_match, stpcide_attach, NULL, NULL);
static int
-stpcide_match(struct device *parent __unused, struct cfdata *match __unused,
+stpcide_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -72,7 +72,7 @@ stpcide_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-stpcide_attach(struct device *parent __unused, struct device *self, void *aux)
+stpcide_attach(struct device *parent, struct device *self, void *aux)
{
struct pci_attach_args *pa = aux;
struct pciide_softc *sc = (struct pciide_softc *)self;
diff --git a/sys/dev/pci/sv.c b/sys/dev/pci/sv.c
index f7223173d69..d284c42fce8 100644
--- a/sys/dev/pci/sv.c
+++ b/sys/dev/pci/sv.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sv.c,v 1.34 2006/10/12 01:31:33 christos Exp $ */
+/* $NetBSD: sv.c,v 1.35 2006/11/16 01:33:10 christos Exp $ */
/* $OpenBSD: sv.c,v 1.2 1998/07/13 01:50:15 csapuntz Exp $ */
/*
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sv.c,v 1.34 2006/10/12 01:31:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sv.c,v 1.35 2006/11/16 01:33:10 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -268,7 +268,7 @@ sv_write_indirect(struct sv_softc *sc, uint8_t reg, uint8_t val)
}
static int
-sv_match(struct device *parent __unused, struct cfdata *match __unused,
+sv_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa;
@@ -349,7 +349,7 @@ sv_defer(struct device *self)
}
static void
-sv_attach(struct device *parent __unused, struct device *self, void *aux)
+sv_attach(struct device *parent, struct device *self, void *aux)
{
struct sv_softc *sc;
struct pci_attach_args *pa;
@@ -580,7 +580,7 @@ sv_freemem(struct sv_softc *sc, struct sv_dma *p)
}
static int
-sv_open(void *addr, int flags __unused)
+sv_open(void *addr, int flags)
{
struct sv_softc *sc;
@@ -593,7 +593,7 @@ sv_open(void *addr, int flags __unused)
}
static int
-sv_query_encoding(void *addr __unused, struct audio_encoding *fp)
+sv_query_encoding(void *addr, struct audio_encoding *fp)
{
switch (fp->index) {
@@ -773,8 +773,8 @@ sv_set_params(void *addr, int setmode, int usemode, audio_params_t *play,
}
static int
-sv_round_blocksize(void *addr __unused, int blk, int mode __unused,
- const audio_params_t *param __unused)
+sv_round_blocksize(void *addr, int blk, int mode,
+ const audio_params_t *param)
{
return blk & -32; /* keep good alignment */
@@ -921,7 +921,7 @@ sv_halt_input(void *addr)
}
static int
-sv_getdev(void *addr __unused, struct audio_device *retp)
+sv_getdev(void *addr, struct audio_device *retp)
{
*retp = sv_device;
@@ -991,7 +991,7 @@ static const struct {
#define SV_SRS_MODE (SV_LAST_MIXER + 4)
static int
-sv_query_devinfo(void *addr __unused, mixer_devinfo_t *dip)
+sv_query_devinfo(void *addr, mixer_devinfo_t *dip)
{
int i;
@@ -1418,7 +1418,7 @@ sv_free(void *addr, void *ptr, struct malloc_type *pool)
}
static size_t
-sv_round_buffersize(void *addr __unused, int direction __unused, size_t size)
+sv_round_buffersize(void *addr, int direction, size_t size)
{
return size;
@@ -1442,7 +1442,7 @@ sv_mappage(void *addr, void *mem, off_t off, int prot)
}
static int
-sv_get_props(void *addr __unused)
+sv_get_props(void *addr)
{
return AUDIO_PROP_MMAP | AUDIO_PROP_INDEPENDENT | AUDIO_PROP_FULLDUPLEX;
}
diff --git a/sys/dev/pci/svwsata.c b/sys/dev/pci/svwsata.c
index 72ff2f7068f..86fea4a04f8 100644
--- a/sys/dev/pci/svwsata.c
+++ b/sys/dev/pci/svwsata.c
@@ -1,4 +1,4 @@
-/* $NetBSD: svwsata.c,v 1.5 2006/10/25 17:34:49 bouyer Exp $ */
+/* $NetBSD: svwsata.c,v 1.6 2006/11/16 01:33:10 christos Exp $ */
/*
* Copyright (c) 2005 Mark Kettenis
@@ -17,7 +17,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svwsata.c,v 1.5 2006/10/25 17:34:49 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svwsata.c,v 1.6 2006/11/16 01:33:10 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -34,7 +34,7 @@ __KERNEL_RCSID(0, "$NetBSD: svwsata.c,v 1.5 2006/10/25 17:34:49 bouyer Exp $");
static int svwsata_match(struct device *, struct cfdata *, void *);
static void svwsata_attach(struct device *, struct device *, void *);
-static void svwsata_chip_map(struct pciide_softc *, struct pci_attach_args *) __unused;
+static void svwsata_chip_map(struct pciide_softc *, struct pci_attach_args *);
static void svwsata_mapreg_dma(struct pciide_softc *, struct pci_attach_args *);
static void svwsata_mapchan(struct pciide_channel *);
@@ -70,7 +70,7 @@ static const struct pciide_product_desc pciide_svwsata_products[] = {
};
static int
-svwsata_match(struct device *parent __unused, struct cfdata *match __unused,
+svwsata_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -84,7 +84,7 @@ svwsata_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-svwsata_attach(struct device *parent __unused, struct device *self, void *aux)
+svwsata_attach(struct device *parent, struct device *self, void *aux)
{
struct pci_attach_args *pa = aux;
struct pciide_softc *sc = (void *)self;
diff --git a/sys/dev/pci/trm.c b/sys/dev/pci/trm.c
index bfb31302903..cb9b1b3d84a 100644
--- a/sys/dev/pci/trm.c
+++ b/sys/dev/pci/trm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: trm.c,v 1.24 2006/10/12 01:31:33 christos Exp $ */
+/* $NetBSD: trm.c,v 1.25 2006/11/16 01:33:10 christos Exp $ */
/*
* Device Driver for Tekram DC395U/UW/F, DC315/U
* PCI SCSI Bus Master Host Adapter
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trm.c,v 1.24 2006/10/12 01:31:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trm.c,v 1.25 2006/11/16 01:33:10 christos Exp $");
/* #define TRM_DEBUG */
#ifdef TRM_DEBUG
@@ -366,7 +366,7 @@ static const uint8_t trm_clock_period[] = {
#define NPERIOD (sizeof(trm_clock_period)/sizeof(trm_clock_period[0]))
static int
-trm_probe(struct device *parent __unused, struct cfdata *match __unused,
+trm_probe(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -383,7 +383,7 @@ trm_probe(struct device *parent __unused, struct cfdata *match __unused,
* attach and init a host adapter
*/
static void
-trm_attach(struct device *parent __unused, struct device *self, void *aux)
+trm_attach(struct device *parent, struct device *self, void *aux)
{
struct pci_attach_args *const pa = aux;
struct trm_softc *sc = (struct trm_softc *)self;
diff --git a/sys/dev/pci/twa.c b/sys/dev/pci/twa.c
index 28414d85337..755d96cbb98 100644
--- a/sys/dev/pci/twa.c
+++ b/sys/dev/pci/twa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: twa.c,v 1.15 2006/10/12 01:31:33 christos Exp $ */
+/* $NetBSD: twa.c,v 1.16 2006/11/16 01:33:10 christos Exp $ */
/* $wasabi: twa.c,v 1.27 2006/07/28 18:17:21 wrstuden Exp $ */
/*-
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: twa.c,v 1.15 2006/10/12 01:31:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: twa.c,v 1.16 2006/11/16 01:33:10 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -439,7 +439,7 @@ twa_request_wait_handler(struct twa_request *tr)
}
static int
-twa_match(struct device *parent __unused, struct cfdata *cfdata __unused,
+twa_match(struct device *parent, struct cfdata *cfdata,
void *aux)
{
int i;
@@ -1527,7 +1527,7 @@ twa_setup(struct twa_softc *sc)
void *twa_sdh;
static void
-twa_attach(struct device *parent __unused, struct device *self, void *aux)
+twa_attach(struct device *parent, struct device *self, void *aux)
{
struct pci_attach_args *pa;
struct twa_softc *sc;
@@ -1636,7 +1636,7 @@ twa_attach(struct device *parent __unused, struct device *self, void *aux)
}
static void
-twa_shutdown(void *arg __unused)
+twa_shutdown(void *arg)
{
extern struct cfdriver twa_cd;
struct twa_softc *sc;
@@ -2115,7 +2115,7 @@ bail:
* Accept an open operation on the control device.
*/
static int
-twaopen(dev_t dev, int flag __unused, int mode __unused, struct lwp *l __unused)
+twaopen(dev_t dev, int flag, int mode, struct lwp *l)
{
struct twa_softc *twa;
@@ -2131,8 +2131,8 @@ twaopen(dev_t dev, int flag __unused, int mode __unused, struct lwp *l __unused)
* Accept the last close on the control device.
*/
static int
-twaclose(dev_t dev, int flag __unused, int mode __unused,
- struct lwp *l __unused)
+twaclose(dev_t dev, int flag, int mode,
+ struct lwp *l)
{
struct twa_softc *twa;
@@ -2155,8 +2155,8 @@ twaclose(dev_t dev, int flag __unused, int mode __unused,
* non-zero-- failure
*/
static int
-twaioctl(dev_t dev, u_long cmd, caddr_t data, int flag __unused,
- struct lwp *l __unused)
+twaioctl(dev_t dev, u_long cmd, caddr_t data, int flag,
+ struct lwp *l)
{
struct twa_softc *sc;
struct twa_ioctl_9k *user_buf = (struct twa_ioctl_9k *)data;
@@ -2688,7 +2688,7 @@ static int
twa_init_connection(struct twa_softc *sc, uint16_t message_credits,
uint32_t set_features, uint16_t current_fw_srl,
uint16_t current_fw_arch_id, uint16_t current_fw_branch,
- uint16_t current_fw_build __unused, uint16_t *fw_on_ctlr_srl,
+ uint16_t current_fw_build, uint16_t *fw_on_ctlr_srl,
uint16_t *fw_on_ctlr_arch_id, uint16_t *fw_on_ctlr_branch,
uint16_t *fw_on_ctlr_build, uint32_t *init_connect_result)
{
diff --git a/sys/dev/pci/twe.c b/sys/dev/pci/twe.c
index 48f48dd844e..75c3c5b8a5a 100644
--- a/sys/dev/pci/twe.c
+++ b/sys/dev/pci/twe.c
@@ -1,4 +1,4 @@
-/* $NetBSD: twe.c,v 1.80 2006/11/08 00:17:09 elad Exp $ */
+/* $NetBSD: twe.c,v 1.81 2006/11/16 01:33:10 christos Exp $ */
/*-
* Copyright (c) 2000, 2001, 2002, 2003, 2004 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: twe.c,v 1.80 2006/11/08 00:17:09 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: twe.c,v 1.81 2006/11/16 01:33:10 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -296,7 +296,7 @@ twe_outl(struct twe_softc *sc, int off, u_int32_t val)
* Match a supported board.
*/
static int
-twe_match(struct device *parent __unused, struct cfdata *cfdata __unused,
+twe_match(struct device *parent, struct cfdata *cfdata,
void *aux)
{
struct pci_attach_args *pa;
@@ -314,7 +314,7 @@ twe_match(struct device *parent __unused, struct cfdata *cfdata __unused,
* XXX This doesn't fail gracefully.
*/
static void
-twe_attach(struct device *parent __unused, struct device *self, void *aux)
+twe_attach(struct device *parent, struct device *self, void *aux)
{
struct pci_attach_args *pa;
struct twe_softc *sc;
@@ -1403,7 +1403,7 @@ twe_status_check(struct twe_softc *sc, u_int status)
* Allocate and initialise a CCB.
*/
static inline void
-twe_ccb_init(struct twe_softc *sc __unused, struct twe_ccb *ccb, int flags)
+twe_ccb_init(struct twe_softc *sc, struct twe_ccb *ccb, int flags)
{
struct twe_cmd *tc;
@@ -1713,7 +1713,7 @@ twe_ccb_submit(struct twe_softc *sc, struct twe_ccb *ccb)
* Accept an open operation on the control device.
*/
static int
-tweopen(dev_t dev, int flag __unused, int mode __unused, struct lwp *l __unused)
+tweopen(dev_t dev, int flag, int mode, struct lwp *l)
{
struct twe_softc *twe;
@@ -1730,8 +1730,8 @@ tweopen(dev_t dev, int flag __unused, int mode __unused, struct lwp *l __unused)
* Accept the last close on the control device.
*/
static int
-tweclose(dev_t dev, int flag __unused, int mode __unused,
- struct lwp *l __unused)
+tweclose(dev_t dev, int flag, int mode,
+ struct lwp *l)
{
struct twe_softc *twe;
@@ -1741,7 +1741,7 @@ tweclose(dev_t dev, int flag __unused, int mode __unused,
}
void
-twe_ccb_wait_handler(struct twe_ccb *ccb, int error __unused)
+twe_ccb_wait_handler(struct twe_ccb *ccb, int error)
{
/* Just wake up the sleeper. */
@@ -1752,7 +1752,7 @@ twe_ccb_wait_handler(struct twe_ccb *ccb, int error __unused)
* Handle control operations.
*/
static int
-tweioctl(dev_t dev, u_long cmd, caddr_t data, int flag __unused,
+tweioctl(dev_t dev, u_long cmd, caddr_t data, int flag,
struct lwp *l)
{
struct twe_softc *twe;
diff --git a/sys/dev/pci/ubsec.c b/sys/dev/pci/ubsec.c
index 2d212a627ea..367aa82bb14 100644
--- a/sys/dev/pci/ubsec.c
+++ b/sys/dev/pci/ubsec.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ubsec.c,v 1.10 2006/10/12 01:31:33 christos Exp $ */
+/* $NetBSD: ubsec.c,v 1.11 2006/11/16 01:33:10 christos Exp $ */
/* $FreeBSD: src/sys/dev/ubsec/ubsec.c,v 1.6.2.6 2003/01/23 21:06:43 sam Exp $ */
/* $OpenBSD: ubsec.c,v 1.127 2003/06/04 14:04:58 jason Exp $ */
@@ -284,7 +284,7 @@ ubsec_lookup(const struct pci_attach_args *pa)
}
static int
-ubsec_probe(struct device *parent __unused, struct cfdata *match __unused,
+ubsec_probe(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = (struct pci_attach_args *)aux;
@@ -296,7 +296,7 @@ ubsec_probe(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-ubsec_attach(struct device *parent __unused, struct device *self, void *aux)
+ubsec_attach(struct device *parent, struct device *self, void *aux)
{
struct ubsec_softc *sc = (struct ubsec_softc *)self;
struct pci_attach_args *pa = aux;
@@ -2100,7 +2100,7 @@ ubsec_kprocess(void *arg, struct cryptkop *krp, int hint)
*/
static int
ubsec_kprocess_modexp_sw(struct ubsec_softc *sc, struct cryptkop *krp,
- int hint __unused)
+ int hint)
{
struct ubsec_q2_modexp *me;
struct ubsec_mcr *mcr;
@@ -2305,7 +2305,7 @@ errout:
*/
static int
ubsec_kprocess_modexp_hw(struct ubsec_softc *sc, struct cryptkop *krp,
- int hint __unused)
+ int hint)
{
struct ubsec_q2_modexp *me;
struct ubsec_mcr *mcr;
@@ -2506,7 +2506,7 @@ errout:
static int
ubsec_kprocess_rsapriv(struct ubsec_softc *sc, struct cryptkop *krp,
- int hint __unused)
+ int hint)
{
struct ubsec_q2_rsapriv *rp = NULL;
struct ubsec_mcr *mcr;
diff --git a/sys/dev/pci/uhci_pci.c b/sys/dev/pci/uhci_pci.c
index c1ce80f93a6..17128107280 100644
--- a/sys/dev/pci/uhci_pci.c
+++ b/sys/dev/pci/uhci_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uhci_pci.c,v 1.33 2006/10/12 01:31:33 christos Exp $ */
+/* $NetBSD: uhci_pci.c,v 1.34 2006/11/16 01:33:10 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhci_pci.c,v 1.33 2006/10/12 01:31:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci_pci.c,v 1.34 2006/11/16 01:33:10 christos Exp $");
#include "ehci.h"
@@ -78,7 +78,7 @@ struct uhci_pci_softc {
};
static int
-uhci_pci_match(struct device *parent __unused, struct cfdata *match __unused,
+uhci_pci_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = (struct pci_attach_args *) aux;
@@ -92,7 +92,7 @@ uhci_pci_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-uhci_pci_attach(struct device *parent __unused, struct device *self, void *aux)
+uhci_pci_attach(struct device *parent, struct device *self, void *aux)
{
struct uhci_pci_softc *sc = (struct uhci_pci_softc *)self;
struct pci_attach_args *pa = (struct pci_attach_args *)aux;
diff --git a/sys/dev/pci/vga_pci.c b/sys/dev/pci/vga_pci.c
index 8cdff2138c2..7c156caabf1 100644
--- a/sys/dev/pci/vga_pci.c
+++ b/sys/dev/pci/vga_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vga_pci.c,v 1.29 2006/10/12 01:31:33 christos Exp $ */
+/* $NetBSD: vga_pci.c,v 1.30 2006/11/16 01:33:10 christos Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vga_pci.c,v 1.29 2006/10/12 01:31:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga_pci.c,v 1.30 2006/11/16 01:33:10 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -120,7 +120,7 @@ vga_pci_lookup_quirks(struct pci_attach_args *pa)
}
static int
-vga_pci_match(struct device *parent __unused, struct cfdata *match __unused,
+vga_pci_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -162,7 +162,7 @@ vga_pci_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-vga_pci_attach(struct device *parent __unused, struct device *self, void *aux)
+vga_pci_attach(struct device *parent, struct device *self, void *aux)
{
struct vga_pci_softc *psc = (void *) self;
struct vga_softc *sc = &psc->sc_vga;
@@ -218,8 +218,8 @@ vga_pci_attach(struct device *parent __unused, struct device *self, void *aux)
int
vga_pci_cnattach(bus_space_tag_t iot, bus_space_tag_t memt,
- pci_chipset_tag_t pc __unused, int bus __unused, int device __unused,
- int function __unused)
+ pci_chipset_tag_t pc, int bus, int device,
+ int function)
{
return (vga_cnattach(iot, memt, WSDISPLAY_TYPE_PCIVGA, 0));
diff --git a/sys/dev/pci/viaenv.c b/sys/dev/pci/viaenv.c
index b5236bb8ec5..9b27ae0b8f7 100644
--- a/sys/dev/pci/viaenv.c
+++ b/sys/dev/pci/viaenv.c
@@ -1,4 +1,4 @@
-/* $NetBSD: viaenv.c,v 1.16 2006/10/12 01:31:33 christos Exp $ */
+/* $NetBSD: viaenv.c,v 1.17 2006/11/16 01:33:10 christos Exp $ */
/*
* Copyright (c) 2000 Johan Danielsson
@@ -35,7 +35,7 @@
/* driver for the hardware monitoring part of the VIA VT82C686A */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: viaenv.c,v 1.16 2006/10/12 01:31:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: viaenv.c,v 1.17 2006/11/16 01:33:10 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -94,7 +94,7 @@ static int viaenv_streinfo(struct sysmon_envsys *,
struct envsys_basic_info *);
static int
-viaenv_match(struct device *parent __unused, struct cfdata *match __unused,
+viaenv_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct viapm_attach_args *va = aux;
@@ -265,7 +265,7 @@ viaenv_refresh_sensor_data(struct viaenv_softc *sc)
}
static void
-viaenv_attach(struct device *parent __unused, struct device *self, void *aux)
+viaenv_attach(struct device *parent, struct device *self, void *aux)
{
struct viapm_attach_args *va = aux;
struct viaenv_softc *sc = (struct viaenv_softc *) self;
@@ -365,7 +365,7 @@ viaenv_gtredata(struct sysmon_envsys *sme, struct envsys_tre_data *tred)
}
static int
-viaenv_streinfo(struct sysmon_envsys *sme __unused,
+viaenv_streinfo(struct sysmon_envsys *sme,
struct envsys_basic_info *binfo)
{
diff --git a/sys/dev/pci/viaide.c b/sys/dev/pci/viaide.c
index 7ba685dda33..c6255960647 100644
--- a/sys/dev/pci/viaide.c
+++ b/sys/dev/pci/viaide.c
@@ -1,4 +1,4 @@
-/* $NetBSD: viaide.c,v 1.36 2006/11/12 22:42:20 bouyer Exp $ */
+/* $NetBSD: viaide.c,v 1.37 2006/11/16 01:33:10 christos Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Manuel Bouyer.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: viaide.c,v 1.36 2006/11/12 22:42:20 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: viaide.c,v 1.37 2006/11/16 01:33:10 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -303,7 +303,7 @@ viaide_lookup(pcireg_t id)
}
static int
-viaide_match(struct device *parent __unused, struct cfdata *match __unused,
+viaide_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -314,7 +314,7 @@ viaide_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-viaide_attach(struct device *parent __unused, struct device *self, void *aux)
+viaide_attach(struct device *parent, struct device *self, void *aux)
{
struct pci_attach_args *pa = aux;
struct pciide_softc *sc = (struct pciide_softc *)self;
diff --git a/sys/dev/pci/viapm.c b/sys/dev/pci/viapm.c
index 50892e1fd11..a3ed48f7636 100644
--- a/sys/dev/pci/viapm.c
+++ b/sys/dev/pci/viapm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: viapm.c,v 1.15 2006/10/12 01:31:33 christos Exp $ */
+/* $NetBSD: viapm.c,v 1.16 2006/11/16 01:33:10 christos Exp $ */
/*
* Copyright (c) 2000 Johan Danielsson
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: viapm.c,v 1.15 2006/10/12 01:31:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: viapm.c,v 1.16 2006/11/16 01:33:10 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -62,7 +62,7 @@ struct viapm_softc {
};
static int
-viapm_match(struct device *parent __unused, struct cfdata *match __unused,
+viapm_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -108,7 +108,7 @@ viapm_print(void *aux, const char *pnp)
}
static void
-viapm_attach(struct device *parent __unused, struct device *self, void *aux)
+viapm_attach(struct device *parent, struct device *self, void *aux)
{
struct viapm_softc *sc = (struct viapm_softc *) self;
struct pci_attach_args *pa = aux;
diff --git a/sys/dev/pci/weasel_pci.c b/sys/dev/pci/weasel_pci.c
index 1df7017f890..ae516250a10 100644
--- a/sys/dev/pci/weasel_pci.c
+++ b/sys/dev/pci/weasel_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: weasel_pci.c,v 1.8 2006/10/12 01:31:33 christos Exp $ */
+/* $NetBSD: weasel_pci.c,v 1.9 2006/11/16 01:33:10 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: weasel_pci.c,v 1.8 2006/10/12 01:31:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: weasel_pci.c,v 1.9 2006/11/16 01:33:10 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -91,7 +91,7 @@ static int weasel_pci_wdog_disarm(struct weasel_softc *);
static int weasel_pci_wdog_query_state(struct weasel_softc *);
static int
-weasel_pci_match(struct device *parent __unused, struct cfdata *cf __unused,
+weasel_pci_match(struct device *parent, struct cfdata *cf,
void *aux)
{
struct pci_attach_args *pa = aux;
@@ -104,7 +104,7 @@ weasel_pci_match(struct device *parent __unused, struct cfdata *cf __unused,
}
static void
-weasel_pci_attach(struct device *parent __unused, struct device *self,
+weasel_pci_attach(struct device *parent, struct device *self,
void *aux)
{
struct weasel_softc *sc = (void *) self;
diff --git a/sys/dev/pci/yds.c b/sys/dev/pci/yds.c
index 719ca132b0d..33c5a02274a 100644
--- a/sys/dev/pci/yds.c
+++ b/sys/dev/pci/yds.c
@@ -1,4 +1,4 @@
-/* $NetBSD: yds.c,v 1.36 2006/10/12 01:31:33 christos Exp $ */
+/* $NetBSD: yds.c,v 1.37 2006/11/16 01:33:10 christos Exp $ */
/*
* Copyright (c) 2000, 2001 Kazuki Sakamoto and Minoura Makoto.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: yds.c,v 1.36 2006/10/12 01:31:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: yds.c,v 1.37 2006/11/16 01:33:10 christos Exp $");
#include "mpu.h"
@@ -281,7 +281,7 @@ static const struct audio_format yds_formats[] = {
#ifdef AUDIO_DEBUG
static void
-yds_dump_play_slot(struct yds_softc *sc, int bank __unused)
+yds_dump_play_slot(struct yds_softc *sc, int bank)
{
int i, j;
uint32_t *p;
@@ -525,7 +525,7 @@ yds_disable_dsp(struct yds_softc *sc)
}
static int
-yds_match(struct device *parent __unused, struct cfdata *match __unused,
+yds_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pci_attach_args *pa;
@@ -740,7 +740,7 @@ yds_powerhook(int why, void *addr)
}
static void
-yds_attach(struct device *parent __unused, struct device *self, void *aux)
+yds_attach(struct device *parent, struct device *self, void *aux)
{
struct yds_softc *sc;
struct pci_attach_args *pa;
@@ -1194,7 +1194,7 @@ yds_freemem(struct yds_softc *sc, struct yds_dma *p)
}
static int
-yds_open(void *addr, int flags __unused)
+yds_open(void *addr, int flags)
{
struct yds_softc *sc;
uint32_t mode;
@@ -1232,7 +1232,7 @@ yds_query_encoding(void *addr, struct audio_encoding *fp)
}
static int
-yds_set_params(void *addr __unused, int setmode, int usemode __unused,
+yds_set_params(void *addr, int setmode, int usemode,
audio_params_t *play, audio_params_t* rec,
stream_filter_list_t *pfil, stream_filter_list_t *rfil)
{
@@ -1250,8 +1250,8 @@ yds_set_params(void *addr __unused, int setmode, int usemode __unused,
}
static int
-yds_round_blocksize(void *addr __unused, int blk, int mode __unused,
- const audio_params_t *param __unused)
+yds_round_blocksize(void *addr, int blk, int mode,
+ const audio_params_t *param)
{
/*
@@ -1610,7 +1610,7 @@ yds_halt_input(void *addr)
}
static int
-yds_getdev(void *addr __unused, struct audio_device *retp)
+yds_getdev(void *addr, struct audio_device *retp)
{
*retp = yds_device;
@@ -1648,7 +1648,7 @@ yds_query_devinfo(void *addr, mixer_devinfo_t *dip)
}
static void *
-yds_malloc(void *addr, int direction __unused, size_t size,
+yds_malloc(void *addr, int direction, size_t size,
struct malloc_type *pool, int flags)
{
struct yds_softc *sc;
@@ -1698,7 +1698,7 @@ yds_find_dma(struct yds_softc *sc, void *addr)
}
static size_t
-yds_round_buffersize(void *addr __unused, int direction __unused, size_t size)
+yds_round_buffersize(void *addr, int direction, size_t size)
{
/*
@@ -1726,7 +1726,7 @@ yds_mappage(void *addr, void *mem, off_t off, int prot)
}
static int
-yds_get_props(void *addr __unused)
+yds_get_props(void *addr)
{
return AUDIO_PROP_MMAP | AUDIO_PROP_INDEPENDENT |
diff --git a/sys/dev/pckbport/pckbd.c b/sys/dev/pckbport/pckbd.c
index 38a549a5b80..00b5bce44c0 100644
--- a/sys/dev/pckbport/pckbd.c
+++ b/sys/dev/pckbport/pckbd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbd.c,v 1.13 2006/10/12 01:31:49 christos Exp $ */
+/* $NetBSD: pckbd.c,v 1.14 2006/11/16 01:33:20 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pckbd.c,v 1.13 2006/10/12 01:31:49 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbd.c,v 1.14 2006/11/16 01:33:20 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -304,7 +304,7 @@ pckbd_powerhook(int why, void *opaque)
* these are both bad jokes
*/
int
-pckbdprobe(struct device *parent __unused, struct cfdata *cf, void *aux)
+pckbdprobe(struct device *parent, struct cfdata *cf, void *aux)
{
struct pckbport_attach_args *pa = aux;
int res;
@@ -356,7 +356,7 @@ pckbdprobe(struct device *parent __unused, struct cfdata *cf, void *aux)
}
void
-pckbdattach(struct device *parent __unused, struct device *self, void *aux)
+pckbdattach(struct device *parent, struct device *self, void *aux)
{
struct pckbd_softc *sc = device_private(self);
struct pckbport_attach_args *pa = aux;
@@ -596,8 +596,8 @@ pckbd_input(void *vsc, int data)
}
int
-pckbd_ioctl(void *v, u_long cmd, caddr_t data, int flag __unused,
- struct lwp *l __unused)
+pckbd_ioctl(void *v, u_long cmd, caddr_t data, int flag,
+ struct lwp *l)
{
struct pckbd_softc *sc = v;
@@ -707,7 +707,7 @@ pckbd_cnpollc(void *v, int on)
}
void
-pckbd_cnbell(void *v __unused, u_int pitch, u_int period, u_int volume)
+pckbd_cnbell(void *v, u_int pitch, u_int period, u_int volume)
{
pckbd_bell(pitch, period, volume, 1);
diff --git a/sys/dev/pckbport/pms.c b/sys/dev/pckbport/pms.c
index 8527395189f..f148d25233b 100644
--- a/sys/dev/pckbport/pms.c
+++ b/sys/dev/pckbport/pms.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pms.c,v 1.15 2006/11/12 19:00:43 plunky Exp $ */
+/* $NetBSD: pms.c,v 1.16 2006/11/16 01:33:20 christos Exp $ */
/*-
* Copyright (c) 2004 Kentaro Kurahone.
@@ -28,7 +28,7 @@
#include "opt_pms.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pms.c,v 1.15 2006/11/12 19:00:43 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pms.c,v 1.16 2006/11/16 01:33:20 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -130,7 +130,7 @@ pms_protocol(pckbport_tag_t tag, pckbport_slot_t slot)
}
int
-pmsprobe(struct device *parent __unused, struct cfdata *match __unused,
+pmsprobe(struct device *parent, struct cfdata *match,
void *aux)
{
struct pckbport_attach_args *pa = aux;
@@ -169,7 +169,7 @@ pmsprobe(struct device *parent __unused, struct cfdata *match __unused,
}
void
-pmsattach(struct device *parent __unused, struct device *self, void *aux)
+pmsattach(struct device *parent, struct device *self, void *aux)
{
struct pms_softc *sc = device_private(self);
struct pckbport_attach_args *pa = aux;
@@ -372,8 +372,8 @@ pms_power(int why, void *v)
#endif /* !PMS_DISABLE_POWERHOOK */
int
-pms_ioctl(void *v, u_long cmd, caddr_t data, int flag __unused,
- struct lwp *l __unused)
+pms_ioctl(void *v, u_long cmd, caddr_t data, int flag,
+ struct lwp *l)
{
struct pms_softc *sc = v;
u_char kbcmd[2];
diff --git a/sys/dev/pckbport/synaptics.c b/sys/dev/pckbport/synaptics.c
index d730618d4fa..39ffa9768d8 100644
--- a/sys/dev/pckbport/synaptics.c
+++ b/sys/dev/pckbport/synaptics.c
@@ -1,4 +1,4 @@
-/* $NetBSD: synaptics.c,v 1.12 2006/11/12 19:00:43 plunky Exp $ */
+/* $NetBSD: synaptics.c,v 1.13 2006/11/16 01:33:20 christos Exp $ */
/*
* Copyright (c) 2005, Steve C. Woodford
@@ -1052,7 +1052,7 @@ synaptics_check_edge(int x, int y)
}
static inline int
-synaptics_edge_motion(struct synaptics_softc *sc __unused, int delta, int dir)
+synaptics_edge_motion(struct synaptics_softc *sc, int delta, int dir)
{
/*
diff --git a/sys/dev/pcmcia/aic_pcmcia.c b/sys/dev/pcmcia/aic_pcmcia.c
index 2ece96813b7..d7746cc1851 100644
--- a/sys/dev/pcmcia/aic_pcmcia.c
+++ b/sys/dev/pcmcia/aic_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aic_pcmcia.c,v 1.34 2006/10/12 01:31:49 christos Exp $ */
+/* $NetBSD: aic_pcmcia.c,v 1.35 2006/11/16 01:33:20 christos Exp $ */
/*
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic_pcmcia.c,v 1.34 2006/10/12 01:31:49 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic_pcmcia.c,v 1.35 2006/11/16 01:33:20 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -85,7 +85,7 @@ const size_t aic_pcmcia_nproducts =
sizeof(aic_pcmcia_products) / sizeof(aic_pcmcia_products[0]);
int
-aic_pcmcia_match(struct device *parent __unused, struct cfdata *match __unused,
+aic_pcmcia_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pcmcia_attach_args *pa = aux;
@@ -108,7 +108,7 @@ aic_pcmcia_validate_config(cfe)
}
void
-aic_pcmcia_attach(struct device *parent __unused, struct device *self,
+aic_pcmcia_attach(struct device *parent, struct device *self,
void *aux)
{
struct aic_pcmcia_softc *psc = (void *)self;
diff --git a/sys/dev/pcmcia/bt3c.c b/sys/dev/pcmcia/bt3c.c
index 10041f13f85..f2dd96b0b1c 100644
--- a/sys/dev/pcmcia/bt3c.c
+++ b/sys/dev/pcmcia/bt3c.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bt3c.c,v 1.5 2006/10/12 01:31:49 christos Exp $ */
+/* $NetBSD: bt3c.c,v 1.6 2006/11/16 01:33:20 christos Exp $ */
/*-
* Copyright (c) 2005 Iain D. Hibbert,
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bt3c.c,v 1.5 2006/10/12 01:31:49 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bt3c.c,v 1.6 2006/11/16 01:33:20 christos Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -823,7 +823,7 @@ bt3c_disable(struct hci_unit *unit)
*/
static int
-bt3c_match(struct device *parent __unused, struct cfdata *match __unused,
+bt3c_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pcmcia_attach_args *pa = aux;
@@ -836,7 +836,7 @@ bt3c_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-bt3c_attach(struct device *parent __unused, struct device *self, void *aux)
+bt3c_attach(struct device *parent, struct device *self, void *aux)
{
struct bt3c_softc *sc = (struct bt3c_softc *)self;
struct pcmcia_attach_args *pa = aux;
@@ -897,7 +897,7 @@ no_config_entry:
}
static int
-bt3c_detach(struct device *self, int flags __unused)
+bt3c_detach(struct device *self, int flags)
{
struct bt3c_softc *sc = (struct bt3c_softc *)self;
int err = 0;
@@ -921,7 +921,7 @@ bt3c_detach(struct device *self, int flags __unused)
}
static int
-bt3c_activate(struct device *self __unused, enum devact act)
+bt3c_activate(struct device *self, enum devact act)
{
// struct bt3c_softc *sc = (struct bt3c_softc *)self;
int err = 0;
diff --git a/sys/dev/pcmcia/com_pcmcia.c b/sys/dev/pcmcia/com_pcmcia.c
index 3d01d8071f1..3225530577a 100644
--- a/sys/dev/pcmcia/com_pcmcia.c
+++ b/sys/dev/pcmcia/com_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com_pcmcia.c,v 1.53 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: com_pcmcia.c,v 1.54 2006/11/16 01:33:20 christos Exp $ */
/*-
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_pcmcia.c,v 1.53 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_pcmcia.c,v 1.54 2006/11/16 01:33:20 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -124,7 +124,7 @@ static const size_t com_pcmcia_nproducts =
sizeof(com_pcmcia_products) / sizeof(com_pcmcia_products[0]);
int
-com_pcmcia_match(struct device *parent __unused, struct cfdata *match __unused,
+com_pcmcia_match(struct device *parent, struct cfdata *match,
void *aux)
{
int comportmask;
@@ -178,7 +178,7 @@ com_pcmcia_validate_config(cfe)
}
void
-com_pcmcia_attach(struct device *parent __unused, struct device *self,
+com_pcmcia_attach(struct device *parent, struct device *self,
void *aux)
{
struct com_pcmcia_softc *psc = (void *) self;
diff --git a/sys/dev/pcmcia/esl.c b/sys/dev/pcmcia/esl.c
index e52456ce574..4926cf1d732 100644
--- a/sys/dev/pcmcia/esl.c
+++ b/sys/dev/pcmcia/esl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: esl.c,v 1.20 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: esl.c,v 1.21 2006/11/16 01:33:20 christos Exp $ */
/*
* Copyright (c) 2001 Jared D. McNeill <jmcneill@invisible.ca>
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esl.c,v 1.20 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esl.c,v 1.21 2006/11/16 01:33:20 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -145,7 +145,7 @@ static const char *eslmodel[] = {
};
int
-esl_open(void *hdl, int flags __unused)
+esl_open(void *hdl, int flags)
{
struct esl_pcmcia_softc *sc;
int i;
@@ -186,7 +186,7 @@ esl_close(void *hdl)
}
int
-esl_query_encoding(void *hdl __unused, struct audio_encoding *ae)
+esl_query_encoding(void *hdl, struct audio_encoding *ae)
{
switch (ae->index) {
@@ -245,9 +245,9 @@ esl_query_encoding(void *hdl __unused, struct audio_encoding *ae)
}
int
-esl_set_params(void *hdl, int setmode __unused, int usemode __unused,
- audio_params_t *play, audio_params_t *rec __unused,
- stream_filter_list_t *pfil, stream_filter_list_t *rfil __unused)
+esl_set_params(void *hdl, int setmode, int usemode,
+ audio_params_t *play, audio_params_t *rec,
+ stream_filter_list_t *pfil, stream_filter_list_t *rfil)
{
audio_params_t hw;
struct esl_pcmcia_softc *sc;
@@ -298,8 +298,8 @@ esl_set_params(void *hdl, int setmode __unused, int usemode __unused,
}
int
-esl_round_blocksize(void *hdl __unused, int bs, int mode __unused,
- const audio_params_t *param __unused)
+esl_round_blocksize(void *hdl, int bs, int mode,
+ const audio_params_t *param)
{
return (bs / 128) * 128;
@@ -322,21 +322,21 @@ esl_halt_output(void *hdl)
}
int
-esl_halt_input(void *hdl __unused)
+esl_halt_input(void *hdl)
{
return 0;
}
int
-esl_speaker_ctl(void *hdl __unused, int on __unused)
+esl_speaker_ctl(void *hdl, int on)
{
return 0;
}
int
-esl_getdev(void *hdl __unused, struct audio_device *ret)
+esl_getdev(void *hdl, struct audio_device *ret)
{
*ret = esl_device;
@@ -415,7 +415,7 @@ esl_get_port(void *hdl, mixer_ctrl_t *mc)
}
int
-esl_query_devinfo(void *hdl __unused, mixer_devinfo_t *di)
+esl_query_devinfo(void *hdl, mixer_devinfo_t *di)
{
switch(di->index) {
@@ -463,7 +463,7 @@ esl_query_devinfo(void *hdl __unused, mixer_devinfo_t *di)
}
int
-esl_get_props(void *hdl __unused)
+esl_get_props(void *hdl)
{
return AUDIO_PROP_MMAP;
diff --git a/sys/dev/pcmcia/esl_pcmcia.c b/sys/dev/pcmcia/esl_pcmcia.c
index f6ba177a6c1..c5c6eba3097 100644
--- a/sys/dev/pcmcia/esl_pcmcia.c
+++ b/sys/dev/pcmcia/esl_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: esl_pcmcia.c,v 1.16 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: esl_pcmcia.c,v 1.17 2006/11/16 01:33:20 christos Exp $ */
/*
* Copyright (c) 2000 Jared D. McNeill <jmcneill@invisible.ca>
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esl_pcmcia.c,v 1.16 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esl_pcmcia.c,v 1.17 2006/11/16 01:33:20 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -73,7 +73,7 @@ CFATTACH_DECL(esl_pcmcia, sizeof(struct esl_pcmcia_softc),
esl_pcmcia_match, esl_pcmcia_attach, esl_pcmcia_detach, NULL);
int
-esl_pcmcia_match(struct device *parent __unused, struct cfdata *match __unused,
+esl_pcmcia_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pcmcia_attach_args *pa;
@@ -97,7 +97,7 @@ esl_pcmcia_validate_config(struct pcmcia_config_entry *cfe)
}
void
-esl_pcmcia_attach(struct device *parent __unused, struct device *self,
+esl_pcmcia_attach(struct device *parent, struct device *self,
void *aux)
{
struct esl_pcmcia_softc *esc;
diff --git a/sys/dev/pcmcia/esp_pcmcia.c b/sys/dev/pcmcia/esp_pcmcia.c
index 159350bcc04..9fb178eec59 100644
--- a/sys/dev/pcmcia/esp_pcmcia.c
+++ b/sys/dev/pcmcia/esp_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: esp_pcmcia.c,v 1.28 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: esp_pcmcia.c,v 1.29 2006/11/16 01:33:20 christos Exp $ */
/*-
* Copyright (c) 2000, 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esp_pcmcia.c,v 1.28 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esp_pcmcia.c,v 1.29 2006/11/16 01:33:20 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -133,7 +133,7 @@ const size_t esp_pcmcia_nproducts =
sizeof(esp_pcmcia_products) / sizeof(esp_pcmcia_products[0]);
int
-esp_pcmcia_match(struct device *parent __unused, struct cfdata *match __unused,
+esp_pcmcia_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pcmcia_attach_args *pa = aux;
@@ -156,7 +156,7 @@ esp_pcmcia_validate_config(cfe)
}
void
-esp_pcmcia_attach(struct device *parent __unused, struct device *self,
+esp_pcmcia_attach(struct device *parent, struct device *self,
void *aux)
{
struct esp_pcmcia_softc *esc = (void *)self;
@@ -446,7 +446,7 @@ esp_pcmcia_dma_go(sc)
}
void
-esp_pcmcia_dma_stop(struct ncr53c9x_softc *sc __unused)
+esp_pcmcia_dma_stop(struct ncr53c9x_softc *sc)
{
}
diff --git a/sys/dev/pcmcia/if_an_pcmcia.c b/sys/dev/pcmcia/if_an_pcmcia.c
index baf57b178c5..fc6368fa1ea 100644
--- a/sys/dev/pcmcia/if_an_pcmcia.c
+++ b/sys/dev/pcmcia/if_an_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_an_pcmcia.c,v 1.30 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: if_an_pcmcia.c,v 1.31 2006/11/16 01:33:20 christos Exp $ */
/*-
* Copyright (c) 2000, 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_an_pcmcia.c,v 1.30 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_an_pcmcia.c,v 1.31 2006/11/16 01:33:20 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -105,7 +105,7 @@ static const size_t an_pcmcia_nproducts =
sizeof(an_pcmcia_products) / sizeof(an_pcmcia_products[0]);
static int
-an_pcmcia_match(struct device *parent __unused, struct cfdata *match __unused,
+an_pcmcia_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pcmcia_attach_args *pa = aux;
@@ -127,7 +127,7 @@ an_pcmcia_validate_config(cfe)
}
static void
-an_pcmcia_attach(struct device *parent __unused, struct device *self,
+an_pcmcia_attach(struct device *parent, struct device *self,
void *aux)
{
struct an_pcmcia_softc *psc = (void *)self;
@@ -180,7 +180,7 @@ fail:
static int
-an_pcmcia_detach(struct device *self, int flags __unused)
+an_pcmcia_detach(struct device *self, int flags)
{
struct an_pcmcia_softc *psc = (void *)self;
int error;
diff --git a/sys/dev/pcmcia/if_awi_pcmcia.c b/sys/dev/pcmcia/if_awi_pcmcia.c
index 196e948c4ee..198a545f6f7 100644
--- a/sys/dev/pcmcia/if_awi_pcmcia.c
+++ b/sys/dev/pcmcia/if_awi_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_awi_pcmcia.c,v 1.36 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: if_awi_pcmcia.c,v 1.37 2006/11/16 01:33:20 christos Exp $ */
/*-
* Copyright (c) 1999, 2004 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_awi_pcmcia.c,v 1.36 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_awi_pcmcia.c,v 1.37 2006/11/16 01:33:20 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -159,7 +159,7 @@ awi_pcmcia_disable(sc)
}
static int
-awi_pcmcia_match(struct device *parent __unused, struct cfdata *match __unused,
+awi_pcmcia_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pcmcia_attach_args *pa = aux;
@@ -188,7 +188,7 @@ awi_pcmcia_validate_config(cfe)
}
static void
-awi_pcmcia_attach(struct device *parent __unused, struct device *self,
+awi_pcmcia_attach(struct device *parent, struct device *self,
void *aux)
{
struct awi_pcmcia_softc *psc = (void *)self;
@@ -249,7 +249,7 @@ fail:
}
static int
-awi_pcmcia_detach(struct device *self, int flags __unused)
+awi_pcmcia_detach(struct device *self, int flags)
{
struct awi_pcmcia_softc *psc = (struct awi_pcmcia_softc *)self;
int error;
diff --git a/sys/dev/pcmcia/if_cnw.c b/sys/dev/pcmcia/if_cnw.c
index 10a92309236..764f91987d8 100644
--- a/sys/dev/pcmcia/if_cnw.c
+++ b/sys/dev/pcmcia/if_cnw.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cnw.c,v 1.37 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: if_cnw.c,v 1.38 2006/11/16 01:33:20 christos Exp $ */
/*-
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -112,7 +112,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cnw.c,v 1.37 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cnw.c,v 1.38 2006/11/16 01:33:20 christos Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -479,7 +479,7 @@ cnw_disable(sc)
* Match the hardware we handle.
*/
int
-cnw_match(struct device *parent __unused, struct cfdata *match __unused,
+cnw_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pcmcia_attach_args *pa = aux;
@@ -498,7 +498,7 @@ cnw_match(struct device *parent __unused, struct cfdata *match __unused,
* Attach the card.
*/
void
-cnw_attach(struct device *parent __unused, struct device *self, void *aux)
+cnw_attach(struct device *parent, struct device *self, void *aux)
{
struct cnw_softc *sc = (void *) self;
struct pcmcia_attach_args *pa = aux;
@@ -1210,7 +1210,7 @@ cnw_activate(self, act)
}
int
-cnw_detach(struct device *self, int flags __unused)
+cnw_detach(struct device *self, int flags)
{
struct cnw_softc *sc = (struct cnw_softc *)self;
struct ifnet *ifp = &sc->sc_ethercom.ec_if;
diff --git a/sys/dev/pcmcia/if_cs_pcmcia.c b/sys/dev/pcmcia/if_cs_pcmcia.c
index 41008abccbc..ef4084181b7 100644
--- a/sys/dev/pcmcia/if_cs_pcmcia.c
+++ b/sys/dev/pcmcia/if_cs_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cs_pcmcia.c,v 1.13 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: if_cs_pcmcia.c,v 1.14 2006/11/16 01:33:20 christos Exp $ */
/*-
* Copyright (c)2001 YAMAMOTO Takashi,
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cs_pcmcia.c,v 1.13 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cs_pcmcia.c,v 1.14 2006/11/16 01:33:20 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -78,7 +78,7 @@ CFATTACH_DECL(cs_pcmcia, sizeof(struct cs_pcmcia_softc),
cs_pcmcia_match, cs_pcmcia_attach, cs_pcmcia_detach, cs_activate);
static int
-cs_pcmcia_match(struct device *parent __unused, struct cfdata *match __unused,
+cs_pcmcia_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pcmcia_attach_args *pa = aux;
@@ -101,7 +101,7 @@ cs_pcmcia_validate_config(struct pcmcia_config_entry *cfe)
}
static void
-cs_pcmcia_attach(struct device *parent __unused, struct device *self, void *aux)
+cs_pcmcia_attach(struct device *parent, struct device *self, void *aux)
{
struct cs_pcmcia_softc *psc = (void *)self;
struct cs_softc *sc = (void *)&psc->sc_cs;
@@ -154,7 +154,7 @@ fail:
}
static int
-cs_pcmcia_detach(struct device *self, int flags __unused)
+cs_pcmcia_detach(struct device *self, int flags)
{
struct cs_pcmcia_softc *psc = (void *)self;
struct cs_softc *sc = &psc->sc_cs;
diff --git a/sys/dev/pcmcia/if_ep_pcmcia.c b/sys/dev/pcmcia/if_ep_pcmcia.c
index 5271fac674a..9f50d067785 100644
--- a/sys/dev/pcmcia/if_ep_pcmcia.c
+++ b/sys/dev/pcmcia/if_ep_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ep_pcmcia.c,v 1.57 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: if_ep_pcmcia.c,v 1.58 2006/11/16 01:33:20 christos Exp $ */
/*-
* Copyright (c) 1998, 2000, 2004 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ep_pcmcia.c,v 1.57 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ep_pcmcia.c,v 1.58 2006/11/16 01:33:20 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -158,7 +158,7 @@ const size_t ep_pcmcia_nproducts =
sizeof(ep_pcmcia_products) / sizeof(ep_pcmcia_products[0]);
int
-ep_pcmcia_match(struct device *parent __unused, struct cfdata *match __unused,
+ep_pcmcia_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pcmcia_attach_args *pa = aux;
diff --git a/sys/dev/pcmcia/if_mbe_pcmcia.c b/sys/dev/pcmcia/if_mbe_pcmcia.c
index 765fbf71ccc..a71bc2ba7a3 100644
--- a/sys/dev/pcmcia/if_mbe_pcmcia.c
+++ b/sys/dev/pcmcia/if_mbe_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mbe_pcmcia.c,v 1.40 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: if_mbe_pcmcia.c,v 1.41 2006/11/16 01:33:20 christos Exp $ */
/*-
* Copyright (c) 1998, 2000, 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mbe_pcmcia.c,v 1.40 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mbe_pcmcia.c,v 1.41 2006/11/16 01:33:20 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -145,7 +145,7 @@ static const size_t mbe_pcmcia_nproducts =
sizeof(mbe_pcmcia_products) / sizeof(mbe_pcmcia_products[0]);
int
-mbe_pcmcia_match(struct device *parent __unused, struct cfdata *match __unused,
+mbe_pcmcia_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pcmcia_attach_args *pa = aux;
@@ -167,7 +167,7 @@ mbe_pcmcia_validate_config(cfe)
}
void
-mbe_pcmcia_attach(struct device *parent __unused, struct device *self,
+mbe_pcmcia_attach(struct device *parent, struct device *self,
void *aux)
{
struct mbe_pcmcia_softc *psc = (void *)self;
@@ -244,7 +244,7 @@ fail:
}
int
-mbe_pcmcia_detach(struct device *self, int flags __unused)
+mbe_pcmcia_detach(struct device *self, int flags)
{
struct mbe_pcmcia_softc *psc = (void *)self;
int error;
diff --git a/sys/dev/pcmcia/if_ne_pcmcia.c b/sys/dev/pcmcia/if_ne_pcmcia.c
index bb6701a9715..39e0132621b 100644
--- a/sys/dev/pcmcia/if_ne_pcmcia.c
+++ b/sys/dev/pcmcia/if_ne_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ne_pcmcia.c,v 1.148 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: if_ne_pcmcia.c,v 1.149 2006/11/16 01:33:20 christos Exp $ */
/*
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ne_pcmcia.c,v 1.148 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ne_pcmcia.c,v 1.149 2006/11/16 01:33:20 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -541,7 +541,7 @@ match:
int
-ne_pcmcia_match(struct device *parent __unused, struct cfdata *match __unused,
+ne_pcmcia_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pcmcia_attach_args *pa = aux;
@@ -568,7 +568,7 @@ ne_pcmcia_validate_config(cfe)
}
void
-ne_pcmcia_attach( struct device *parent __unused, struct device *self,
+ne_pcmcia_attach( struct device *parent, struct device *self,
void *aux)
{
struct ne_pcmcia_softc *psc = (void *) self;
diff --git a/sys/dev/pcmcia/if_ray.c b/sys/dev/pcmcia/if_ray.c
index 66b690fa34f..d3c4b6b5c5c 100644
--- a/sys/dev/pcmcia/if_ray.c
+++ b/sys/dev/pcmcia/if_ray.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ray.c,v 1.62 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: if_ray.c,v 1.63 2006/11/16 01:33:20 christos Exp $ */
/*
* Copyright (c) 2000 Christian E. Hopps
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ray.c,v 1.62 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ray.c,v 1.63 2006/11/16 01:33:20 christos Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -475,7 +475,7 @@ CFATTACH_DECL(ray, sizeof(struct ray_softc),
*/
static int
-ray_match(struct device *parent __unused, struct cfdata *match __unused,
+ray_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pcmcia_attach_args *pa = aux;
@@ -505,7 +505,7 @@ ray_validate_config(cfe)
}
static void
-ray_attach(struct device *parent __unused, struct device *self, void *aux)
+ray_attach(struct device *parent, struct device *self, void *aux)
{
struct ray_softc *sc = (void *)self;
struct pcmcia_attach_args *pa = aux;
@@ -650,7 +650,7 @@ ray_activate(dev, act)
}
static int
-ray_detach(struct device *self, int flags __unused)
+ray_detach(struct device *self, int flags)
{
struct ray_softc *sc;
struct ifnet *ifp;
@@ -879,7 +879,7 @@ ray_reset_resetloop(arg)
}
void
-ray_power(int why __unused, void *arg __unused)
+ray_power(int why, void *arg)
{
#if 0
struct ray_softc *sc;
diff --git a/sys/dev/pcmcia/if_sm_pcmcia.c b/sys/dev/pcmcia/if_sm_pcmcia.c
index ec65a726d3c..42208ea3637 100644
--- a/sys/dev/pcmcia/if_sm_pcmcia.c
+++ b/sys/dev/pcmcia/if_sm_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sm_pcmcia.c,v 1.47 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: if_sm_pcmcia.c,v 1.48 2006/11/16 01:33:20 christos Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000, 2004 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sm_pcmcia.c,v 1.47 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sm_pcmcia.c,v 1.48 2006/11/16 01:33:20 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -112,7 +112,7 @@ const size_t sm_pcmcia_nproducts =
sizeof(sm_pcmcia_products) / sizeof(sm_pcmcia_products[0]);
int
-sm_pcmcia_match(struct device *parent __unused, struct cfdata *match __unused,
+sm_pcmcia_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pcmcia_attach_args *pa = aux;
@@ -140,7 +140,7 @@ sm_pcmcia_validate_config(cfe)
}
void
-sm_pcmcia_attach(struct device *parent __unused, struct device *self, void *aux)
+sm_pcmcia_attach(struct device *parent, struct device *self, void *aux)
{
struct sm_pcmcia_softc *psc = (struct sm_pcmcia_softc *)self;
struct smc91cxx_softc *sc = &psc->sc_smc;
diff --git a/sys/dev/pcmcia/if_tr_pcmcia.c b/sys/dev/pcmcia/if_tr_pcmcia.c
index d2d4e15da2e..c8ff5335dec 100644
--- a/sys/dev/pcmcia/if_tr_pcmcia.c
+++ b/sys/dev/pcmcia/if_tr_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tr_pcmcia.c,v 1.17 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: if_tr_pcmcia.c,v 1.18 2006/11/16 01:33:20 christos Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang. All rights reserved.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tr_pcmcia.c,v 1.17 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tr_pcmcia.c,v 1.18 2006/11/16 01:33:20 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -106,7 +106,7 @@ CFATTACH_DECL(tr_pcmcia, sizeof(struct tr_pcmcia_softc),
tr_pcmcia_match, tr_pcmcia_attach, tr_pcmcia_detach, tr_activate);
static int
-tr_pcmcia_match(struct device *parent __unused, struct cfdata *match __unused,
+tr_pcmcia_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pcmcia_attach_args *pa = aux;
@@ -121,7 +121,7 @@ tr_pcmcia_match(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-tr_pcmcia_attach(struct device *parent __unused, struct device *self, void *aux)
+tr_pcmcia_attach(struct device *parent, struct device *self, void *aux)
{
struct tr_pcmcia_softc *psc = (void *)self;
struct tr_softc *sc = &psc->sc_tr;
diff --git a/sys/dev/pcmcia/if_wi_pcmcia.c b/sys/dev/pcmcia/if_wi_pcmcia.c
index d53f40ab096..96632ee4202 100644
--- a/sys/dev/pcmcia/if_wi_pcmcia.c
+++ b/sys/dev/pcmcia/if_wi_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wi_pcmcia.c,v 1.71 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: if_wi_pcmcia.c,v 1.72 2006/11/16 01:33:20 christos Exp $ */
/*-
* Copyright (c) 2001, 2004 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wi_pcmcia.c,v 1.71 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wi_pcmcia.c,v 1.72 2006/11/16 01:33:20 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -252,7 +252,7 @@ static const size_t wi_pcmcia_nproducts =
sizeof(wi_pcmcia_products) / sizeof(wi_pcmcia_products[0]);
static int
-wi_pcmcia_match(struct device *parent __unused, struct cfdata *match __unused,
+wi_pcmcia_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pcmcia_attach_args *pa = aux;
@@ -322,7 +322,7 @@ wi_pcmcia_validate_config(cfe)
}
static void
-wi_pcmcia_attach(struct device *parent __unused, struct device *self,
+wi_pcmcia_attach(struct device *parent, struct device *self,
void *aux)
{
struct wi_pcmcia_softc *psc = (void *)self;
@@ -389,7 +389,7 @@ fail:
}
static int
-wi_pcmcia_detach(struct device *self, int flags __unused)
+wi_pcmcia_detach(struct device *self, int flags)
{
struct wi_pcmcia_softc *psc = (struct wi_pcmcia_softc *)self;
int error;
diff --git a/sys/dev/pcmcia/if_xi.c b/sys/dev/pcmcia/if_xi.c
index e887c5e4d23..6895ddb524e 100644
--- a/sys/dev/pcmcia/if_xi.c
+++ b/sys/dev/pcmcia/if_xi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_xi.c,v 1.58 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: if_xi.c,v 1.59 2006/11/16 01:33:20 christos Exp $ */
/* OpenBSD: if_xe.c,v 1.9 1999/09/16 11:28:42 niklas Exp */
/*
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_xi.c,v 1.58 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_xi.c,v 1.59 2006/11/16 01:33:20 christos Exp $");
#include "opt_inet.h"
#include "opt_ipx.h"
@@ -259,7 +259,7 @@ xi_attach(sc, myea)
}
int
-xi_detach(struct device *self, int flags __unused)
+xi_detach(struct device *self, int flags)
{
struct xi_softc *sc = (void *)self;
struct ifnet *ifp = &sc->sc_ethercom.ec_if;
@@ -665,7 +665,7 @@ xi_mdi_write(self, phy, reg, value)
}
STATIC void
-xi_statchg(struct device *self __unused)
+xi_statchg(struct device *self)
{
/* XXX Update ifp->if_baudrate */
}
diff --git a/sys/dev/pcmcia/isic_pcmcia.c b/sys/dev/pcmcia/isic_pcmcia.c
index 5b3dce63b0f..d6295c15020 100644
--- a/sys/dev/pcmcia/isic_pcmcia.c
+++ b/sys/dev/pcmcia/isic_pcmcia.c
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_pcmcia.c,v 1.30 2006/10/16 13:00:36 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_pcmcia.c,v 1.31 2006/11/16 01:33:20 christos Exp $");
#include <sys/param.h>
#include <sys/errno.h>
@@ -179,8 +179,8 @@ find_matching_card(pa)
* Match card
*/
static int
-isic_pcmcia_match(struct device *parent __unused,
- struct cfdata *match __unused, void *aux)
+isic_pcmcia_match(struct device *parent,
+ struct cfdata *match, void *aux)
{
struct pcmcia_attach_args *pa = aux;
@@ -194,7 +194,7 @@ isic_pcmcia_match(struct device *parent __unused,
* Attach the card
*/
static void
-isic_pcmcia_attach(struct device *parent __unused,
+isic_pcmcia_attach(struct device *parent,
struct device *self, void *aux)
{
struct pcmcia_isic_softc *psc = (void*) self;
@@ -243,7 +243,7 @@ fail:
}
static int
-isic_pcmcia_detach(struct device *self, int flags __unused)
+isic_pcmcia_detach(struct device *self, int flags)
{
struct pcmcia_isic_softc *psc = (struct pcmcia_isic_softc *)self;
diff --git a/sys/dev/pcmcia/isic_pcmcia_elsa_mcall.c b/sys/dev/pcmcia/isic_pcmcia_elsa_mcall.c
index d02c95bc799..a080129ecfd 100644
--- a/sys/dev/pcmcia/isic_pcmcia_elsa_mcall.c
+++ b/sys/dev/pcmcia/isic_pcmcia_elsa_mcall.c
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_pcmcia_elsa_mcall.c,v 1.11 2006/10/16 13:00:36 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_pcmcia_elsa_mcall.c,v 1.12 2006/11/16 01:33:20 christos Exp $");
#include "opt_isicpcmcia.h"
#ifdef ISICPCMCIA_ELSA_MCALL
@@ -104,8 +104,8 @@ elsa_mcall_read_fifo(void *buf, const void *base, size_t len)
}
#else
static void
-elsa_mcall_read_fifo(struct isic_softc *sc __unused, int what __unused,
- void *buf __unused, size_t size __unused)
+elsa_mcall_read_fifo(struct isic_softc *sc, int what,
+ void *buf, size_t size)
{
/*
bus_space_tag_t t = sc->sc_maps[0].t;
@@ -124,8 +124,8 @@ elsa_mcall_write_fifo(void *base, const void *buf, size_t len)
}
#else
static void
-elsa_mcall_write_fifo(struct isic_softc *sc __unused, int what __unused,
- const void *buf __unused, size_t size __unused)
+elsa_mcall_write_fifo(struct isic_softc *sc, int what,
+ const void *buf, size_t size)
{
/*
bus_space_tag_t t = sc->sc_maps[0].t;
@@ -144,8 +144,8 @@ elsa_mcall_write_reg(u_char *base, u_int offset, u_int v)
}
#else
static void
-elsa_mcall_write_reg(struct isic_softc *sc __unused, int what __unused,
- bus_size_t offs __unused, u_int8_t data __unused)
+elsa_mcall_write_reg(struct isic_softc *sc, int what,
+ bus_size_t offs, u_int8_t data)
{
/*
bus_space_tag_t t = sc->sc_maps[0].t;
@@ -165,8 +165,8 @@ elsa_mcall_read_reg(u_char *base, u_int offset)
}
#else
static u_int8_t
-elsa_mcall_read_reg(struct isic_softc *sc __unused, int what __unused,
- bus_size_t offs __unused)
+elsa_mcall_read_reg(struct isic_softc *sc, int what,
+ bus_size_t offs)
{
/*
bus_space_tag_t t = sc->sc_maps[0].t;
diff --git a/sys/dev/pcmcia/mhzc.c b/sys/dev/pcmcia/mhzc.c
index 573b4a71efc..d767d609500 100644
--- a/sys/dev/pcmcia/mhzc.c
+++ b/sys/dev/pcmcia/mhzc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mhzc.c,v 1.38 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: mhzc.c,v 1.39 2006/11/16 01:33:20 christos Exp $ */
/*-
* Copyright (c) 1999, 2000, 2004 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mhzc.c,v 1.38 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mhzc.c,v 1.39 2006/11/16 01:33:20 christos Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -172,7 +172,7 @@ void mhzc_disable(struct mhzc_softc *, int);
int mhzc_intr(void *);
int
-mhzc_match(struct device *parent __unused, struct cfdata *match __unused,
+mhzc_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pcmcia_attach_args *pa = aux;
@@ -184,7 +184,7 @@ mhzc_match(struct device *parent __unused, struct cfdata *match __unused,
}
void
-mhzc_attach(struct device *parent __unused, struct device *self, void *aux)
+mhzc_attach(struct device *parent, struct device *self, void *aux)
{
struct mhzc_softc *sc = (void *)self;
struct pcmcia_attach_args *pa = aux;
@@ -663,7 +663,7 @@ int com_mhzc_enable(struct com_softc *);
void com_mhzc_disable(struct com_softc *);
int
-com_mhzc_match(struct device *parent __unused, struct cfdata *match __unused,
+com_mhzc_match(struct device *parent, struct cfdata *match,
void *aux)
{
extern struct cfdriver com_cd;
@@ -677,7 +677,7 @@ com_mhzc_match(struct device *parent __unused, struct cfdata *match __unused,
}
void
-com_mhzc_attach(struct device *parent, struct device *self, void *aux __unused)
+com_mhzc_attach(struct device *parent, struct device *self, void *aux)
{
struct com_softc *sc = (void *)self;
struct mhzc_softc *msc = (void *)parent;
@@ -737,7 +737,7 @@ int sm_mhzc_enable(struct smc91cxx_softc *);
void sm_mhzc_disable(struct smc91cxx_softc *);
int
-sm_mhzc_match(struct device *parent __unused, struct cfdata *match __unused,
+sm_mhzc_match(struct device *parent, struct cfdata *match,
void *aux)
{
extern struct cfdriver sm_cd;
@@ -751,7 +751,7 @@ sm_mhzc_match(struct device *parent __unused, struct cfdata *match __unused,
}
void
-sm_mhzc_attach(struct device *parent, struct device *self, void *aux __unused)
+sm_mhzc_attach(struct device *parent, struct device *self, void *aux)
{
struct smc91cxx_softc *sc = (void *)self;
struct mhzc_softc *msc = (void *)parent;
diff --git a/sys/dev/pcmcia/opl_esl.c b/sys/dev/pcmcia/opl_esl.c
index 03c0f594de6..36ab301887e 100644
--- a/sys/dev/pcmcia/opl_esl.c
+++ b/sys/dev/pcmcia/opl_esl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: opl_esl.c,v 1.13 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: opl_esl.c,v 1.14 2006/11/16 01:33:20 christos Exp $ */
/*
* Copyright (c) 2001 Jared D. McNeill <jmcneill@invisible.ca>
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opl_esl.c,v 1.13 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opl_esl.c,v 1.14 2006/11/16 01:33:20 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -67,7 +67,7 @@ CFATTACH_DECL(opl_esl, sizeof(struct opl_softc),
opl_esl_match, opl_esl_attach, opl_esl_detach, NULL);
int
-opl_esl_match(struct device *parent, struct cfdata *match __unused, void *aux)
+opl_esl_match(struct device *parent, struct cfdata *match, void *aux)
{
struct audio_attach_args *aa = (struct audio_attach_args *)aux;
struct esl_pcmcia_softc *ssc = (struct esl_pcmcia_softc *)parent;
@@ -79,7 +79,7 @@ opl_esl_match(struct device *parent, struct cfdata *match __unused, void *aux)
}
void
-opl_esl_attach(struct device *parent, struct device *self, void *aux __unused)
+opl_esl_attach(struct device *parent, struct device *self, void *aux)
{
struct esl_pcmcia_softc *ssc = (struct esl_pcmcia_softc *)parent;
struct opl_softc *sc = (struct opl_softc *)self;
diff --git a/sys/dev/pcmcia/pcmcia.c b/sys/dev/pcmcia/pcmcia.c
index 72d90ffc989..f5780f2c60c 100644
--- a/sys/dev/pcmcia/pcmcia.c
+++ b/sys/dev/pcmcia/pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pcmcia.c,v 1.81 2006/10/24 20:54:10 drochner Exp $ */
+/* $NetBSD: pcmcia.c,v 1.82 2006/11/16 01:33:20 christos Exp $ */
/*
* Copyright (c) 2004 Charles M. Hannum. All rights reserved.
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcmcia.c,v 1.81 2006/10/24 20:54:10 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcmcia.c,v 1.82 2006/11/16 01:33:20 christos Exp $");
#include "opt_pcmciaverbose.h"
@@ -112,7 +112,7 @@ pcmcia_ccr_write(pf, ccr, val)
}
int
-pcmcia_match(struct device *parent __unused, struct cfdata *match, void *aux)
+pcmcia_match(struct device *parent, struct cfdata *match, void *aux)
{
struct pcmciabus_attach_args *paa = aux;
@@ -124,7 +124,7 @@ pcmcia_match(struct device *parent __unused, struct cfdata *match, void *aux)
}
void
-pcmcia_attach(struct device *parent __unused, struct device *self, void *aux)
+pcmcia_attach(struct device *parent, struct device *self, void *aux)
{
struct pcmciabus_attach_args *paa = aux;
struct pcmcia_softc *sc = (struct pcmcia_softc *) self;
@@ -202,7 +202,7 @@ done:
}
int
-pcmcia_rescan(struct device *self, const char *ifattr __unused,
+pcmcia_rescan(struct device *self, const char *ifattr,
const int *locators)
{
struct pcmcia_softc *sc = (struct pcmcia_softc *)self;
diff --git a/sys/dev/pcmcia/pcmcia_cis.c b/sys/dev/pcmcia/pcmcia_cis.c
index 94f08844d95..52977638278 100644
--- a/sys/dev/pcmcia/pcmcia_cis.c
+++ b/sys/dev/pcmcia/pcmcia_cis.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pcmcia_cis.c,v 1.49 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: pcmcia_cis.c,v 1.50 2006/11/16 01:33:20 christos Exp $ */
/*
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcmcia_cis.c,v 1.49 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcmcia_cis.c,v 1.50 2006/11/16 01:33:20 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -760,7 +760,7 @@ pcmcia_parse_cis_tuple(tuple, arg)
}
static void
-decode_end(struct pcmcia_tuple *tuple __unused, struct cis_state *state)
+decode_end(struct pcmcia_tuple *tuple, struct cis_state *state)
{
/* if we've seen a LONGLINK_MFC, and this is the first
* END after it, reset the function list.
@@ -782,7 +782,7 @@ decode_end(struct pcmcia_tuple *tuple __unused, struct cis_state *state)
}
static void
-decode_longlink_mfc(struct pcmcia_tuple *tuple __unused,
+decode_longlink_mfc(struct pcmcia_tuple *tuple,
struct cis_state *state)
{
/*
@@ -799,8 +799,8 @@ decode_longlink_mfc(struct pcmcia_tuple *tuple __unused,
}
static void
-decode_device(struct pcmcia_tuple *tuple __unused,
- struct cis_state *state __unused)
+decode_device(struct pcmcia_tuple *tuple,
+ struct cis_state *state)
{
#ifdef PCMCIACISDEBUG
u_int reg, dtype, dspeed;
diff --git a/sys/dev/pcmcia/pcmcom.c b/sys/dev/pcmcia/pcmcom.c
index 80efcc39be4..5b0a2bf313e 100644
--- a/sys/dev/pcmcia/pcmcom.c
+++ b/sys/dev/pcmcia/pcmcom.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pcmcom.c,v 1.29 2006/11/16 00:53:16 christos Exp $ */
+/* $NetBSD: pcmcom.c,v 1.30 2006/11/16 01:33:20 christos Exp $ */
/*-
* Copyright (c) 1998, 2000, 2004 The NetBSD Foundation, Inc.
@@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcmcom.c,v 1.29 2006/11/16 00:53:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcmcom.c,v 1.30 2006/11/16 01:33:20 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -123,7 +123,7 @@ void pcmcom_disable(struct pcmcom_softc *);
int pcmcom_intr(void *);
int
-pcmcom_match(struct device *parent __unused, struct cfdata *cf __unused,
+pcmcom_match(struct device *parent, struct cfdata *cf,
void *aux)
{
struct pcmcia_attach_args *pa = aux;
@@ -145,7 +145,7 @@ pcmcom_validate_config(cfe)
}
void
-pcmcom_attach(struct device *parent __unused, struct device *self, void *aux)
+pcmcom_attach(struct device *parent, struct device *self, void *aux)
{
struct pcmcom_softc *sc = (void *)self;
struct pcmcia_attach_args *pa = aux;
@@ -343,8 +343,8 @@ int com_pcmcom_enable(struct com_softc *);
void com_pcmcom_disable(struct com_softc *);
int
-com_pcmcom_match(struct device *parent __unused, struct cfdata *cf __unused,
- void *aux __unused)
+com_pcmcom_match(struct device *parent, struct cfdata *cf,
+ void *aux)
{
/* Device is always present. */
@@ -352,7 +352,7 @@ com_pcmcom_match(struct device *parent __unused, struct cfdata *cf __unused,
}
void
-com_pcmcom_attach(struct device *parent __unused, struct device *self,
+com_pcmcom_attach(struct device *parent, struct device *self,
void *aux)
{
struct com_softc *sc = (struct com_softc *)self;
diff --git a/sys/dev/pcmcia/spc_pcmcia.c b/sys/dev/pcmcia/spc_pcmcia.c
index 34dc95d7061..2027bb4ae33 100644
--- a/sys/dev/pcmcia/spc_pcmcia.c
+++ b/sys/dev/pcmcia/spc_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: spc_pcmcia.c,v 1.16 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: spc_pcmcia.c,v 1.17 2006/11/16 01:33:20 christos Exp $ */
/*-
* Copyright (c) 2000, 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spc_pcmcia.c,v 1.16 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spc_pcmcia.c,v 1.17 2006/11/16 01:33:20 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -85,7 +85,7 @@ const size_t spc_pcmcia_nproducts =
sizeof(spc_pcmcia_products) / sizeof(spc_pcmcia_products[0]);
int
-spc_pcmcia_match(struct device *parent __unused, struct cfdata *match __unused,
+spc_pcmcia_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pcmcia_attach_args *pa = aux;
@@ -108,7 +108,7 @@ spc_pcmcia_validate_config(cfe)
}
void
-spc_pcmcia_attach(struct device *parent __unused, struct device *self,
+spc_pcmcia_attach(struct device *parent, struct device *self,
void *aux)
{
struct spc_pcmcia_softc *sc = (void *)self;
diff --git a/sys/dev/pcmcia/wdc_pcmcia.c b/sys/dev/pcmcia/wdc_pcmcia.c
index cc4c0fa3d47..6c7b25f5e4d 100644
--- a/sys/dev/pcmcia/wdc_pcmcia.c
+++ b/sys/dev/pcmcia/wdc_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc_pcmcia.c,v 1.107 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: wdc_pcmcia.c,v 1.108 2006/11/16 01:33:20 christos Exp $ */
/*-
* Copyright (c) 1998, 2003, 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_pcmcia.c,v 1.107 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_pcmcia.c,v 1.108 2006/11/16 01:33:20 christos Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -176,7 +176,7 @@ static void wdc_pcmcia_dataout_memory(struct ata_channel *, int, void *,
size_t);
static int
-wdc_pcmcia_match(struct device *parent __unused, struct cfdata *match __unused,
+wdc_pcmcia_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pcmcia_attach_args *pa = aux;
@@ -212,7 +212,7 @@ wdc_pcmcia_validate_config_memory(struct pcmcia_config_entry *cfe)
}
static void
-wdc_pcmcia_attach(struct device *parent __unused, struct device *self,
+wdc_pcmcia_attach(struct device *parent, struct device *self,
void *aux)
{
struct wdc_pcmcia_softc *sc = (void *)self;
diff --git a/sys/dev/pcmcia/xirc.c b/sys/dev/pcmcia/xirc.c
index 36c912aaa81..df9fb5cfa48 100644
--- a/sys/dev/pcmcia/xirc.c
+++ b/sys/dev/pcmcia/xirc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: xirc.c,v 1.19 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: xirc.c,v 1.20 2006/11/16 01:33:20 christos Exp $ */
/*-
* Copyright (c) 1999, 2000, 2004 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xirc.c,v 1.19 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xirc.c,v 1.20 2006/11/16 01:33:20 christos Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -152,7 +152,7 @@ void xirc_disable(struct xirc_softc *, int, int);
int xirc_intr(void *);
int
-xirc_match(struct device *parent __unused, struct cfdata *match __unused,
+xirc_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct pcmcia_attach_args *pa = aux;
@@ -587,7 +587,7 @@ int com_xirc_enable(struct com_softc *);
void com_xirc_disable(struct com_softc *);
int
-com_xirc_match(struct device *parent __unused, struct cfdata *match __unused,
+com_xirc_match(struct device *parent, struct cfdata *match,
void *aux)
{
extern struct cfdriver com_cd;
@@ -600,7 +600,7 @@ com_xirc_match(struct device *parent __unused, struct cfdata *match __unused,
}
void
-com_xirc_attach(struct device *parent, struct device *self, void *aux __unused)
+com_xirc_attach(struct device *parent, struct device *self, void *aux)
{
struct com_softc *sc = (void *)self;
struct xirc_softc *msc = (void *)parent;
@@ -663,7 +663,7 @@ void xi_xirc_disable(struct xi_softc *);
int xi_xirc_lan_nid_ciscallback(struct pcmcia_tuple *, void *);
int
-xi_xirc_match(struct device *parent __unused, struct cfdata *match __unused,
+xi_xirc_match(struct device *parent, struct cfdata *match,
void *aux)
{
extern struct cfdriver xi_cd;
@@ -676,7 +676,7 @@ xi_xirc_match(struct device *parent __unused, struct cfdata *match __unused,
}
void
-xi_xirc_attach(struct device *parent, struct device *self, void *aux __unused)
+xi_xirc_attach(struct device *parent, struct device *self, void *aux)
{
struct xi_softc *sc = (void *)self;
struct xirc_softc *msc = (void *)parent;
diff --git a/sys/dev/radio.c b/sys/dev/radio.c
index befea9c8a84..693af05ceeb 100644
--- a/sys/dev/radio.c
+++ b/sys/dev/radio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: radio.c,v 1.18 2006/10/12 01:30:51 christos Exp $ */
+/* $NetBSD: radio.c,v 1.19 2006/11/16 01:32:45 christos Exp $ */
/* $OpenBSD: radio.c,v 1.2 2001/12/05 10:27:06 mickey Exp $ */
/* $RuOBSD: radio.c,v 1.7 2001/12/04 06:03:05 tm Exp $ */
@@ -30,7 +30,7 @@
/* This is the /dev/radio driver from OpenBSD */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radio.c,v 1.18 2006/10/12 01:30:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radio.c,v 1.19 2006/11/16 01:32:45 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -66,8 +66,8 @@ const struct cdevsw radio_cdevsw = {
extern struct cfdriver radio_cd;
int
-radioprobe(struct device *parent __unused, struct cfdata *match __unused,
- void *aux __unused)
+radioprobe(struct device *parent, struct cfdata *match,
+ void *aux)
{
return (1);
}
@@ -118,8 +118,8 @@ radioclose(dev_t dev, int flags, int fmt, struct lwp *l)
}
int
-radioioctl(dev_t dev, u_long cmd, caddr_t data, int flags __unused,
- struct lwp *l __unused)
+radioioctl(dev_t dev, u_long cmd, caddr_t data, int flags,
+ struct lwp *l)
{
struct radio_softc *sc;
int unit, error;
@@ -168,7 +168,7 @@ radio_attach_mi(const struct radio_hw_if *rhwp, void *hdlp, struct device *dev)
}
int
-radioprint(void *aux __unused, const char *pnp)
+radioprint(void *aux, const char *pnp)
{
if (pnp != NULL)
aprint_normal("radio at %s", pnp);
@@ -176,7 +176,7 @@ radioprint(void *aux __unused, const char *pnp)
}
int
-radiodetach(struct device *self, int flags __unused)
+radiodetach(struct device *self, int flags)
{
/*struct radio_softc *sc = (struct radio_softc *)self;*/
int maj, mn;
diff --git a/sys/dev/raidframe/rf_acctrace.c b/sys/dev/raidframe/rf_acctrace.c
index b66e2a02bac..c3eb173bcce 100644
--- a/sys/dev/raidframe/rf_acctrace.c
+++ b/sys/dev/raidframe/rf_acctrace.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_acctrace.c,v 1.22 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: rf_acctrace.c,v 1.23 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_acctrace.c,v 1.22 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_acctrace.c,v 1.23 2006/11/16 01:33:23 christos Exp $");
#include <sys/stat.h>
#include <sys/types.h>
@@ -55,7 +55,7 @@ static long numTracesSoFar;
RF_DECLARE_MUTEX(rf_tracing_mutex)
int
-rf_ConfigureAccessTrace(RF_ShutdownList_t **listp __unused)
+rf_ConfigureAccessTrace(RF_ShutdownList_t **listp)
{
numTracesSoFar = 0;
rf_mutex_init(&rf_tracing_mutex);
diff --git a/sys/dev/raidframe/rf_alloclist.c b/sys/dev/raidframe/rf_alloclist.c
index 54bb45652f2..842517e16d6 100644
--- a/sys/dev/raidframe/rf_alloclist.c
+++ b/sys/dev/raidframe/rf_alloclist.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_alloclist.c,v 1.24 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: rf_alloclist.c,v 1.25 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -37,7 +37,7 @@
***************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_alloclist.c,v 1.24 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_alloclist.c,v 1.25 2006/11/16 01:33:23 christos Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -57,7 +57,7 @@ __KERNEL_RCSID(0, "$NetBSD: rf_alloclist.c,v 1.24 2006/10/12 01:31:50 christos E
static void rf_ShutdownAllocList(void *);
-static void rf_ShutdownAllocList(void *ignored __unused)
+static void rf_ShutdownAllocList(void *ignored)
{
pool_destroy(&rf_pools.alloclist);
}
diff --git a/sys/dev/raidframe/rf_callback.c b/sys/dev/raidframe/rf_callback.c
index a14f537333e..f020922c11b 100644
--- a/sys/dev/raidframe/rf_callback.c
+++ b/sys/dev/raidframe/rf_callback.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_callback.c,v 1.19 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: rf_callback.c,v 1.20 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_callback.c,v 1.19 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_callback.c,v 1.20 2006/11/16 01:33:23 christos Exp $");
#include <dev/raidframe/raidframevar.h>
#include <sys/pool.h>
@@ -52,7 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: rf_callback.c,v 1.19 2006/10/12 01:31:50 christos Ex
static void rf_ShutdownCallback(void *);
static void
-rf_ShutdownCallback(void *ignored __unused)
+rf_ShutdownCallback(void *ignored)
{
pool_destroy(&rf_pools.callback);
}
diff --git a/sys/dev/raidframe/rf_chaindecluster.c b/sys/dev/raidframe/rf_chaindecluster.c
index 8aeb47a8921..3ec472e597c 100644
--- a/sys/dev/raidframe/rf_chaindecluster.c
+++ b/sys/dev/raidframe/rf_chaindecluster.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_chaindecluster.c,v 1.14 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: rf_chaindecluster.c,v 1.15 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_chaindecluster.c,v 1.14 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_chaindecluster.c,v 1.15 2006/11/16 01:33:23 christos Exp $");
#include "rf_archs.h"
@@ -61,8 +61,8 @@ typedef struct RF_ChaindeclusterConfigInfo_s {
} RF_ChaindeclusterConfigInfo_t;
int
-rf_ConfigureChainDecluster(RF_ShutdownList_t **listp __unused,
- RF_Raid_t *raidPtr, RF_Config_t *cfgPtr __unused)
+rf_ConfigureChainDecluster(RF_ShutdownList_t **listp,
+ RF_Raid_t *raidPtr, RF_Config_t *cfgPtr)
{
RF_RaidLayout_t *layoutPtr = &raidPtr->Layout;
RF_StripeCount_t num_used_stripeUnitsPerDisk;
@@ -218,7 +218,7 @@ rf_IdentifyStripeChainDecluster(RF_Raid_t *raidPtr, RF_RaidAddr_t addr,
}
void
-rf_MapSIDToPSIDChainDecluster(RF_RaidLayout_t *layoutPtr __unused,
+rf_MapSIDToPSIDChainDecluster(RF_RaidLayout_t *layoutPtr,
RF_StripeNum_t stripeID,
RF_StripeNum_t *psID,
RF_ReconUnitNum_t *which_ru)
diff --git a/sys/dev/raidframe/rf_copyback.c b/sys/dev/raidframe/rf_copyback.c
index c5e99367ed9..f4059d2a4e6 100644
--- a/sys/dev/raidframe/rf_copyback.c
+++ b/sys/dev/raidframe/rf_copyback.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_copyback.c,v 1.36 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: rf_copyback.c,v 1.37 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -38,7 +38,7 @@
****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_copyback.c,v 1.36 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_copyback.c,v 1.37 2006/11/16 01:33:23 christos Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -69,7 +69,7 @@ static void rf_CopybackOne(RF_CopybackDesc_t * desc, int typ,
static void rf_CopybackComplete(RF_CopybackDesc_t * desc, int status);
int
-rf_ConfigureCopyback(RF_ShutdownList_t **listp __unused)
+rf_ConfigureCopyback(RF_ShutdownList_t **listp)
{
rf_copyback_in_progress = 0;
return (0);
diff --git a/sys/dev/raidframe/rf_cvscan.c b/sys/dev/raidframe/rf_cvscan.c
index adac9122f24..6b7128239f9 100644
--- a/sys/dev/raidframe/rf_cvscan.c
+++ b/sys/dev/raidframe/rf_cvscan.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_cvscan.c,v 1.14 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: rf_cvscan.c,v 1.15 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -35,7 +35,7 @@
******************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_cvscan.c,v 1.14 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_cvscan.c,v 1.15 2006/11/16 01:33:23 christos Exp $");
#include <dev/raidframe/raidframevar.h>
#include "rf_alloclist.h"
@@ -205,7 +205,7 @@ RealEnqueue(RF_CvscanHeader_t *hdr, RF_DiskQueueData_t *req)
void
-rf_CvscanEnqueue(void *q_in, RF_DiskQueueData_t * elem, int priority __unused)
+rf_CvscanEnqueue(void *q_in, RF_DiskQueueData_t * elem, int priority)
{
RF_CvscanHeader_t *hdr = (RF_CvscanHeader_t *) q_in;
RealEnqueue(hdr, elem /* req */ );
@@ -322,7 +322,7 @@ rf_CvscanPeek(void *q_in)
void *
rf_CvscanCreate(RF_SectorCount_t sectPerDisk,
RF_AllocListElem_t *clList,
- RF_ShutdownList_t **listp __unused)
+ RF_ShutdownList_t **listp)
{
RF_CvscanHeader_t *hdr;
long range = 2; /* Currently no mechanism to change these */
diff --git a/sys/dev/raidframe/rf_dagdegrd.c b/sys/dev/raidframe/rf_dagdegrd.c
index f8779c3144b..75f27bcec40 100644
--- a/sys/dev/raidframe/rf_dagdegrd.c
+++ b/sys/dev/raidframe/rf_dagdegrd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_dagdegrd.c,v 1.26 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: rf_dagdegrd.c,v 1.27 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_dagdegrd.c,v 1.26 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_dagdegrd.c,v 1.27 2006/11/16 01:33:23 christos Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -114,8 +114,8 @@ void
rf_CreateRaidOneDegradedReadDAG(RF_Raid_t *raidPtr,
RF_AccessStripeMap_t *asmap,
RF_DagHeader_t *dag_h,
- void *bp __unused,
- RF_RaidAccessFlags_t flags __unused,
+ void *bp,
+ RF_RaidAccessFlags_t flags,
RF_AllocListElem_t *allocList)
{
RF_DagNode_t *rdNode, *blockNode, *commitNode, *termNode;
@@ -260,8 +260,8 @@ rf_CreateRaidOneDegradedReadDAG(RF_Raid_t *raidPtr,
void
rf_CreateDegradedReadDAG(RF_Raid_t *raidPtr, RF_AccessStripeMap_t *asmap,
- RF_DagHeader_t *dag_h, void *bp __unused,
- RF_RaidAccessFlags_t flags __unused,
+ RF_DagHeader_t *dag_h, void *bp,
+ RF_RaidAccessFlags_t flags,
RF_AllocListElem_t *allocList,
const RF_RedFuncs_t *recFunc)
{
@@ -575,8 +575,8 @@ rf_CreateDegradedReadDAG(RF_Raid_t *raidPtr, RF_AccessStripeMap_t *asmap,
void
rf_CreateRaidCDegradedReadDAG(RF_Raid_t *raidPtr, RF_AccessStripeMap_t *asmap,
- RF_DagHeader_t *dag_h, void *bp __unused,
- RF_RaidAccessFlags_t flags __unused,
+ RF_DagHeader_t *dag_h, void *bp,
+ RF_RaidAccessFlags_t flags,
RF_AllocListElem_t *allocList)
{
RF_DagNode_t *nodes, *rdNode, *blockNode, *commitNode, *termNode;
@@ -1031,8 +1031,8 @@ rf_InitNode(node, rf_wait, RF_FALSE, rf_DiskReadFunc, rf_DiskReadUndoFunc, rf_Ge
void
rf_DoubleDegRead(RF_Raid_t *raidPtr, RF_AccessStripeMap_t *asmap,
- RF_DagHeader_t *dag_h, void *bp __unused,
- RF_RaidAccessFlags_t flags __unused,
+ RF_DagHeader_t *dag_h, void *bp,
+ RF_RaidAccessFlags_t flags,
RF_AllocListElem_t *allocList,
const char *redundantReadNodeName,
const char *recoveryNodeName,
diff --git a/sys/dev/raidframe/rf_dagdegwr.c b/sys/dev/raidframe/rf_dagdegwr.c
index eb10ab1cec6..78bdc58aa7f 100644
--- a/sys/dev/raidframe/rf_dagdegwr.c
+++ b/sys/dev/raidframe/rf_dagdegwr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_dagdegwr.c,v 1.29 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: rf_dagdegwr.c,v 1.30 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_dagdegwr.c,v 1.29 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_dagdegwr.c,v 1.30 2006/11/16 01:33:23 christos Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -154,8 +154,8 @@ rf_CreateDegradedWriteDAG(RF_Raid_t *raidPtr, RF_AccessStripeMap_t *asmap,
void
rf_CommonCreateSimpleDegradedWriteDAG(RF_Raid_t *raidPtr,
RF_AccessStripeMap_t *asmap,
- RF_DagHeader_t *dag_h, void *bp __unused,
- RF_RaidAccessFlags_t flags __unused,
+ RF_DagHeader_t *dag_h, void *bp,
+ RF_RaidAccessFlags_t flags,
RF_AllocListElem_t *allocList,
int nfaults,
int (*redFunc) (RF_DagNode_t *),
@@ -711,11 +711,11 @@ rf_WriteGenerateFailedAccessASMs(
void
rf_DoubleDegSmallWrite(RF_Raid_t *raidPtr, RF_AccessStripeMap_t *asmap,
- RF_DagHeader_t *dag_h, void *bp __unused,
- RF_RaidAccessFlags_t flags __unused,
+ RF_DagHeader_t *dag_h, void *bp,
+ RF_RaidAccessFlags_t flags,
RF_AllocListElem_t *allocList,
const char *redundantReadNodeName,
- const char *redundantWriteNodeName __unused,
+ const char *redundantWriteNodeName,
const char *recoveryNodeName,
int (*recovFunc) (RF_DagNode_t *))
{
diff --git a/sys/dev/raidframe/rf_dagffrd.c b/sys/dev/raidframe/rf_dagffrd.c
index 70062391f21..b96c5e4c0cb 100644
--- a/sys/dev/raidframe/rf_dagffrd.c
+++ b/sys/dev/raidframe/rf_dagffrd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_dagffrd.c,v 1.17 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: rf_dagffrd.c,v 1.18 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_dagffrd.c,v 1.17 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_dagffrd.c,v 1.18 2006/11/16 01:33:23 christos Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -124,9 +124,9 @@ rf_CreateFaultFreeReadDAG(RF_Raid_t *raidPtr, RF_AccessStripeMap_t *asmap,
*****************************************************************************/
void
-rf_CreateNonredundantDAG(RF_Raid_t *raidPtr __unused,
- RF_AccessStripeMap_t *asmap, RF_DagHeader_t *dag_h, void *bp __unused,
- RF_RaidAccessFlags_t flags __unused, RF_AllocListElem_t *allocList,
+rf_CreateNonredundantDAG(RF_Raid_t *raidPtr,
+ RF_AccessStripeMap_t *asmap, RF_DagHeader_t *dag_h, void *bp,
+ RF_RaidAccessFlags_t flags, RF_AllocListElem_t *allocList,
RF_IoType_t type)
{
RF_DagNode_t *diskNodes, *blockNode, *commitNode, *termNode;
@@ -317,9 +317,9 @@ rf_CreateNonredundantDAG(RF_Raid_t *raidPtr __unused,
*****************************************************************************/
static void
-CreateMirrorReadDAG(RF_Raid_t *raidPtr __unused, RF_AccessStripeMap_t *asmap,
- RF_DagHeader_t *dag_h, void *bp __unused,
- RF_RaidAccessFlags_t flags __unused, RF_AllocListElem_t *allocList,
+CreateMirrorReadDAG(RF_Raid_t *raidPtr, RF_AccessStripeMap_t *asmap,
+ RF_DagHeader_t *dag_h, void *bp,
+ RF_RaidAccessFlags_t flags, RF_AllocListElem_t *allocList,
int (*readfunc) (RF_DagNode_t * node))
{
RF_DagNode_t *readNodes, *blockNode, *commitNode, *termNode;
diff --git a/sys/dev/raidframe/rf_dagffwr.c b/sys/dev/raidframe/rf_dagffwr.c
index 240eef7cf29..05087a2378e 100644
--- a/sys/dev/raidframe/rf_dagffwr.c
+++ b/sys/dev/raidframe/rf_dagffwr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_dagffwr.c,v 1.32 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: rf_dagffwr.c,v 1.33 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_dagffwr.c,v 1.32 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_dagffwr.c,v 1.33 2006/11/16 01:33:23 christos Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -81,7 +81,7 @@ rf_CreateNonRedundantWriteDAG(RF_Raid_t *raidPtr, RF_AccessStripeMap_t *asmap,
RF_DagHeader_t *dag_h, void *bp,
RF_RaidAccessFlags_t flags,
RF_AllocListElem_t *allocList,
- RF_IoType_t type __unused)
+ RF_IoType_t type)
{
rf_CreateNonredundantDAG(raidPtr, asmap, dag_h, bp, flags, allocList,
RF_IO_TYPE_WRITE);
@@ -92,7 +92,7 @@ rf_CreateRAID0WriteDAG(RF_Raid_t *raidPtr, RF_AccessStripeMap_t *asmap,
RF_DagHeader_t *dag_h, void *bp,
RF_RaidAccessFlags_t flags,
RF_AllocListElem_t *allocList,
- RF_IoType_t type __unused)
+ RF_IoType_t type)
{
rf_CreateNonredundantDAG(raidPtr, asmap, dag_h, bp, flags, allocList,
RF_IO_TYPE_WRITE);
@@ -160,8 +160,8 @@ rf_CreateLargeWriteDAG(RF_Raid_t *raidPtr, RF_AccessStripeMap_t *asmap,
void
rf_CommonCreateLargeWriteDAG(RF_Raid_t *raidPtr, RF_AccessStripeMap_t *asmap,
- RF_DagHeader_t *dag_h, void *bp __unused,
- RF_RaidAccessFlags_t flags __unused,
+ RF_DagHeader_t *dag_h, void *bp,
+ RF_RaidAccessFlags_t flags,
RF_AllocListElem_t *allocList,
int nfaults, int (*redFunc) (RF_DagNode_t *),
int allowBufferRecycle)
@@ -518,8 +518,8 @@ rf_CommonCreateLargeWriteDAG(RF_Raid_t *raidPtr, RF_AccessStripeMap_t *asmap,
void
rf_CommonCreateSmallWriteDAG(RF_Raid_t *raidPtr, RF_AccessStripeMap_t *asmap,
- RF_DagHeader_t *dag_h, void *bp __unused,
- RF_RaidAccessFlags_t flags __unused,
+ RF_DagHeader_t *dag_h, void *bp,
+ RF_RaidAccessFlags_t flags,
RF_AllocListElem_t *allocList,
const RF_RedFuncs_t *pfuncs,
const RF_RedFuncs_t *qfuncs)
@@ -1191,8 +1191,8 @@ rf_CommonCreateSmallWriteDAG(RF_Raid_t *raidPtr, RF_AccessStripeMap_t *asmap,
void
rf_CreateRaidOneWriteDAG(RF_Raid_t *raidPtr, RF_AccessStripeMap_t *asmap,
- RF_DagHeader_t *dag_h, void *bp __unused,
- RF_RaidAccessFlags_t flags __unused,
+ RF_DagHeader_t *dag_h, void *bp,
+ RF_RaidAccessFlags_t flags,
RF_AllocListElem_t *allocList)
{
RF_DagNode_t *unblockNode, *termNode, *commitNode;
diff --git a/sys/dev/raidframe/rf_dagfuncs.c b/sys/dev/raidframe/rf_dagfuncs.c
index 197fb255541..932de74fc24 100644
--- a/sys/dev/raidframe/rf_dagfuncs.c
+++ b/sys/dev/raidframe/rf_dagfuncs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_dagfuncs.c,v 1.27 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: rf_dagfuncs.c,v 1.28 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_dagfuncs.c,v 1.27 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_dagfuncs.c,v 1.28 2006/11/16 01:33:23 christos Exp $");
#include <sys/param.h>
#include <sys/ioctl.h>
@@ -83,7 +83,7 @@ int (*rf_RecoveryXorUndoFunc) (RF_DagNode_t *);
* main (only) configuration routine for this module
****************************************************************************/
int
-rf_ConfigureDAGFuncs(RF_ShutdownList_t **listp __unused)
+rf_ConfigureDAGFuncs(RF_ShutdownList_t **listp)
{
RF_ASSERT(((sizeof(long) == 8) && RF_LONGSHIFT == 3) ||
((sizeof(long) == 4) && RF_LONGSHIFT == 2));
@@ -111,7 +111,7 @@ rf_TerminateFunc(RF_DagNode_t *node)
}
int
-rf_TerminateUndoFunc(RF_DagNode_t *node __unused)
+rf_TerminateUndoFunc(RF_DagNode_t *node)
{
return (0);
}
@@ -153,7 +153,7 @@ rf_DiskReadMirrorPartitionFunc(RF_DagNode_t *node)
#endif
int
-rf_DiskReadMirrorUndoFunc(RF_DagNode_t *node __unused)
+rf_DiskReadMirrorUndoFunc(RF_DagNode_t *node)
{
return (0);
}
@@ -234,13 +234,13 @@ rf_ParityLogOverwriteFunc(RF_DagNode_t *node)
}
int
-rf_ParityLogUpdateUndoFunc(RF_DagNode_t *node __unused)
+rf_ParityLogUpdateUndoFunc(RF_DagNode_t *node)
{
return (0);
}
int
-rf_ParityLogOverwriteUndoFunc(RF_DagNode_t *node __unused)
+rf_ParityLogOverwriteUndoFunc(RF_DagNode_t *node)
{
return (0);
}
diff --git a/sys/dev/raidframe/rf_dagutils.c b/sys/dev/raidframe/rf_dagutils.c
index b73202aa6ae..dfc3ca27567 100644
--- a/sys/dev/raidframe/rf_dagutils.c
+++ b/sys/dev/raidframe/rf_dagutils.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_dagutils.c,v 1.49 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: rf_dagutils.c,v 1.50 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_dagutils.c,v 1.49 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_dagutils.c,v 1.50 2006/11/16 01:33:23 christos Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -225,7 +225,7 @@ rf_FreeDAG(RF_DagHeader_t *dag_h)
static void rf_ShutdownDAGs(void *);
static void
-rf_ShutdownDAGs(void *ignored __unused)
+rf_ShutdownDAGs(void *ignored)
{
pool_destroy(&rf_pools.dagh);
pool_destroy(&rf_pools.dagnode);
@@ -347,7 +347,7 @@ rf_FreeFuncList(RF_FuncList_t *funcList)
void *
rf_AllocStripeBuffer(RF_Raid_t *raidPtr, RF_DagHeader_t *dag_h,
- int size __unused)
+ int size)
{
RF_VoidPointerListElem_t *vple;
void *p;
@@ -426,7 +426,7 @@ rf_AllocBuffer(RF_Raid_t *raidPtr, RF_DagHeader_t *dag_h, int size)
}
void *
-rf_AllocIOBuffer(RF_Raid_t *raidPtr, int size __unused)
+rf_AllocIOBuffer(RF_Raid_t *raidPtr, int size)
{
RF_VoidPointerListElem_t *vple;
void *p;
@@ -993,7 +993,7 @@ rf_MapUnaccessedPortionOfStripe(RF_Raid_t *raidPtr,
RF_AccessStripeMapHeader_t **new_asm_h,
int *nRodNodes,
char **sosBuffer, char **eosBuffer,
- RF_AllocListElem_t *allocList __unused)
+ RF_AllocListElem_t *allocList)
{
RF_RaidAddr_t sosRaidAddress, eosRaidAddress;
RF_SectorNum_t sosNumSector, eosNumSector;
@@ -1086,7 +1086,7 @@ rf_GenerateFailedAccessASMs(RF_Raid_t *raidPtr, RF_AccessStripeMap_t *asmap,
RF_AccessStripeMapHeader_t **new_asm_h,
int *nXorBufs, char **rpBufPtr,
char *overlappingPDAs,
- RF_AllocListElem_t *allocList __unused)
+ RF_AllocListElem_t *allocList)
{
RF_RaidLayout_t *layoutPtr = &(raidPtr->Layout);
diff --git a/sys/dev/raidframe/rf_debugMem.c b/sys/dev/raidframe/rf_debugMem.c
index f9884fa5e76..33e289145b3 100644
--- a/sys/dev/raidframe/rf_debugMem.c
+++ b/sys/dev/raidframe/rf_debugMem.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_debugMem.c,v 1.17 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: rf_debugMem.c,v 1.18 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_debugMem.c,v 1.17 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_debugMem.c,v 1.18 2006/11/16 01:33:23 christos Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -115,7 +115,7 @@ rf_print_unfreed()
#endif /* RF_DEBUG_MEM */
int
-rf_ConfigureDebugMem(RF_ShutdownList_t **listp __unused)
+rf_ConfigureDebugMem(RF_ShutdownList_t **listp)
{
#if RF_DEBUG_MEM
int i, rc;
diff --git a/sys/dev/raidframe/rf_decluster.c b/sys/dev/raidframe/rf_decluster.c
index f157423cc67..4117736b8b8 100644
--- a/sys/dev/raidframe/rf_decluster.c
+++ b/sys/dev/raidframe/rf_decluster.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_decluster.c,v 1.20 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: rf_decluster.c,v 1.21 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -48,7 +48,7 @@
*--------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_decluster.c,v 1.20 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_decluster.c,v 1.21 2006/11/16 01:33:23 christos Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -68,7 +68,7 @@ __KERNEL_RCSID(0, "$NetBSD: rf_decluster.c,v 1.20 2006/10/12 01:31:50 christos E
/* configuration code */
int
-rf_ConfigureDeclustered(RF_ShutdownList_t **listp __unused, RF_Raid_t *raidPtr,
+rf_ConfigureDeclustered(RF_ShutdownList_t **listp, RF_Raid_t *raidPtr,
RF_Config_t *cfgPtr)
{
RF_RaidLayout_t *layoutPtr = &(raidPtr->Layout);
@@ -493,7 +493,7 @@ rf_GetDefaultHeadSepLimitDeclustered(RF_Raid_t *raidPtr)
* don't use up all your system memory with buffers.
*/
int
-rf_GetDefaultNumFloatingReconBuffersDeclustered(RF_Raid_t * raidPtr __unused)
+rf_GetDefaultNumFloatingReconBuffersDeclustered(RF_Raid_t * raidPtr)
{
return (100 * rf_numBufsToAccumulate);
}
@@ -612,7 +612,7 @@ rf_remap_to_spare_space(RF_RaidLayout_t *layoutPtr,
#if (RF_INCLUDE_PARITY_DECLUSTERING_DS > 0)
int
-rf_InstallSpareTable(RF_Raid_t *raidPtr, RF_RowCol_t frow __unused,
+rf_InstallSpareTable(RF_Raid_t *raidPtr, RF_RowCol_t frow,
RF_RowCol_t fcol)
{
RF_DeclusteredConfigInfo_t *info = (RF_DeclusteredConfigInfo_t *) raidPtr->Layout.layoutSpecificInfo;
diff --git a/sys/dev/raidframe/rf_declusterPQ.c b/sys/dev/raidframe/rf_declusterPQ.c
index c75d242e6ab..348936e6f26 100644
--- a/sys/dev/raidframe/rf_declusterPQ.c
+++ b/sys/dev/raidframe/rf_declusterPQ.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_declusterPQ.c,v 1.14 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: rf_declusterPQ.c,v 1.15 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -35,7 +35,7 @@
*--------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_declusterPQ.c,v 1.14 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_declusterPQ.c,v 1.15 2006/11/16 01:33:23 christos Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -52,7 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: rf_declusterPQ.c,v 1.14 2006/10/12 01:31:50 christos
/* configuration code */
int
-rf_ConfigureDeclusteredPQ(RF_ShutdownList_t **listp __unused, RF_Raid_t *raidPtr,
+rf_ConfigureDeclusteredPQ(RF_ShutdownList_t **listp, RF_Raid_t *raidPtr,
RF_Config_t *cfgPtr)
{
RF_RaidLayout_t *layoutPtr = &(raidPtr->Layout);
diff --git a/sys/dev/raidframe/rf_diskqueue.c b/sys/dev/raidframe/rf_diskqueue.c
index cb141f52ea2..f779fa45d0b 100644
--- a/sys/dev/raidframe/rf_diskqueue.c
+++ b/sys/dev/raidframe/rf_diskqueue.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_diskqueue.c,v 1.47 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: rf_diskqueue.c,v 1.48 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -66,7 +66,7 @@
****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_diskqueue.c,v 1.47 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_diskqueue.c,v 1.48 2006/11/16 01:33:23 christos Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -179,7 +179,7 @@ rf_ConfigureDiskQueue(RF_Raid_t *raidPtr, RF_DiskQueue_t *diskqueue,
}
static void
-rf_ShutdownDiskQueueSystem(void *ignored __unused)
+rf_ShutdownDiskQueueSystem(void *ignored)
{
pool_destroy(&rf_pools.dqd);
}
diff --git a/sys/dev/raidframe/rf_disks.c b/sys/dev/raidframe/rf_disks.c
index 9f903a847b1..c2955c7f0f8 100644
--- a/sys/dev/raidframe/rf_disks.c
+++ b/sys/dev/raidframe/rf_disks.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_disks.c,v 1.63 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: rf_disks.c,v 1.64 2006/11/16 01:33:23 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -67,7 +67,7 @@
***************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_disks.c,v 1.63 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_disks.c,v 1.64 2006/11/16 01:33:23 christos Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -111,7 +111,7 @@ static int rf_check_label_vitals( RF_Raid_t *, int, int, char *,
**************************************************************************/
int
-rf_ConfigureDisks(RF_ShutdownList_t **listp __unused, RF_Raid_t *raidPtr,
+rf_ConfigureDisks(RF_ShutdownList_t **listp, RF_Raid_t *raidPtr,
RF_Config_t *cfgPtr)
{
RF_RaidDisk_t *disks;
@@ -235,7 +235,7 @@ fail:
* in row zero, which is specially expanded to hold them.
****************************************************************************/
int
-rf_ConfigureSpareDisks(RF_ShutdownList_t **listp __unused, RF_Raid_t *raidPtr,
+rf_ConfigureSpareDisks(RF_ShutdownList_t **listp, RF_Raid_t *raidPtr,
RF_Config_t *cfgPtr)
{
int i, ret;
@@ -316,7 +316,7 @@ fail:
}
static int
-rf_AllocDiskStructures(RF_Raid_t *raidPtr, RF_Config_t *cfgPtr __unused)
+rf_AllocDiskStructures(RF_Raid_t *raidPtr, RF_Config_t *cfgPtr)
{
int ret;
@@ -1102,8 +1102,8 @@ rf_delete_component(RF_Raid_t *raidPtr, RF_SingleComponent_t *component)
}
int
-rf_incorporate_hot_spare(RF_Raid_t *raidPtr __unused,
- RF_SingleComponent_t *component __unused)
+rf_incorporate_hot_spare(RF_Raid_t *raidPtr,
+ RF_SingleComponent_t *component)
{
/* Issues here include how to 'move' this in if there is IO
diff --git a/sys/dev/raidframe/rf_driver.c b/sys/dev/raidframe/rf_driver.c
index 95f4f655d95..b89569b741e 100644
--- a/sys/dev/raidframe/rf_driver.c
+++ b/sys/dev/raidframe/rf_driver.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_driver.c,v 1.112 2006/10/12 01:31:51 christos Exp $ */
+/* $NetBSD: rf_driver.c,v 1.113 2006/11/16 01:33:23 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -73,7 +73,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_driver.c,v 1.112 2006/10/12 01:31:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_driver.c,v 1.113 2006/11/16 01:33:23 christos Exp $");
#include "opt_raid_diagnostic.h"
@@ -522,7 +522,7 @@ rf_FreeEmergBuffers(RF_Raid_t *raidPtr)
static void
-rf_ShutdownRDFreeList(void *ignored __unused)
+rf_ShutdownRDFreeList(void *ignored)
{
pool_destroy(&rf_pools.rad);
}
diff --git a/sys/dev/raidframe/rf_engine.c b/sys/dev/raidframe/rf_engine.c
index 66f78170ae1..b14342aee84 100644
--- a/sys/dev/raidframe/rf_engine.c
+++ b/sys/dev/raidframe/rf_engine.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_engine.c,v 1.38 2006/10/12 01:31:51 christos Exp $ */
+/* $NetBSD: rf_engine.c,v 1.39 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -55,7 +55,7 @@
****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_engine.c,v 1.38 2006/10/12 01:31:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_engine.c,v 1.39 2006/11/16 01:33:23 christos Exp $");
#include <sys/errno.h>
@@ -124,7 +124,7 @@ rf_ShutdownEngine(void *arg)
int
rf_ConfigureEngine(RF_ShutdownList_t **listp, RF_Raid_t *raidPtr,
- RF_Config_t *cfgPtr __unused)
+ RF_Config_t *cfgPtr)
{
rf_mutex_init(&raidPtr->node_queue_mutex);
diff --git a/sys/dev/raidframe/rf_evenodd.c b/sys/dev/raidframe/rf_evenodd.c
index 4262914920a..c3942416fe0 100644
--- a/sys/dev/raidframe/rf_evenodd.c
+++ b/sys/dev/raidframe/rf_evenodd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_evenodd.c,v 1.17 2006/10/12 01:31:51 christos Exp $ */
+/* $NetBSD: rf_evenodd.c,v 1.18 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
****************************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_evenodd.c,v 1.17 2006/10/12 01:31:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_evenodd.c,v 1.18 2006/11/16 01:33:23 christos Exp $");
#include "rf_archs.h"
@@ -68,8 +68,8 @@ typedef struct RF_EvenOddConfigInfo_s {
} RF_EvenOddConfigInfo_t;
int
-rf_ConfigureEvenOdd(RF_ShutdownList_t **listp __unused, RF_Raid_t *raidPtr,
- RF_Config_t *cfgPtr __unused)
+rf_ConfigureEvenOdd(RF_ShutdownList_t **listp, RF_Raid_t *raidPtr,
+ RF_Config_t *cfgPtr)
{
RF_RaidLayout_t *layoutPtr = &raidPtr->Layout;
RF_EvenOddConfigInfo_t *info;
@@ -119,13 +119,13 @@ rf_ConfigureEvenOdd(RF_ShutdownList_t **listp __unused, RF_Raid_t *raidPtr,
}
int
-rf_GetDefaultNumFloatingReconBuffersEvenOdd(RF_Raid_t *raidPtr __unused)
+rf_GetDefaultNumFloatingReconBuffersEvenOdd(RF_Raid_t *raidPtr)
{
return (20);
}
RF_HeadSepLimit_t
-rf_GetDefaultHeadSepLimitEvenOdd(RF_Raid_t *raidPtr __unused)
+rf_GetDefaultHeadSepLimitEvenOdd(RF_Raid_t *raidPtr)
{
return (10);
}
@@ -157,7 +157,7 @@ rf_IdentifyStripeEvenOdd(RF_Raid_t *raidPtr, RF_RaidAddr_t addr,
void
rf_MapParityEvenOdd(RF_Raid_t *raidPtr, RF_RaidAddr_t raidSector,
RF_RowCol_t *col,
- RF_SectorNum_t *diskSector, int remap __unused)
+ RF_SectorNum_t *diskSector, int remap)
{
RF_StripeNum_t SUID = raidSector / raidPtr->Layout.sectorsPerStripeUnit;
RF_StripeNum_t endSUIDofthisStrip = (SUID / raidPtr->Layout.numDataCol + 1) * raidPtr->Layout.numDataCol - 1;
@@ -170,7 +170,7 @@ rf_MapParityEvenOdd(RF_Raid_t *raidPtr, RF_RaidAddr_t raidSector,
void
rf_MapEEvenOdd(RF_Raid_t *raidPtr, RF_RaidAddr_t raidSector,
RF_RowCol_t *col, RF_SectorNum_t *diskSector,
- int remap __unused)
+ int remap)
{
RF_StripeNum_t SUID = raidSector / raidPtr->Layout.sectorsPerStripeUnit;
RF_StripeNum_t endSUIDofthisStrip = (SUID / raidPtr->Layout.numDataCol + 1) * raidPtr->Layout.numDataCol - 1;
diff --git a/sys/dev/raidframe/rf_fifo.c b/sys/dev/raidframe/rf_fifo.c
index 5d1881b707f..5968100ca38 100644
--- a/sys/dev/raidframe/rf_fifo.c
+++ b/sys/dev/raidframe/rf_fifo.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_fifo.c,v 1.14 2006/10/12 01:31:51 christos Exp $ */
+/* $NetBSD: rf_fifo.c,v 1.15 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -36,7 +36,7 @@
***************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_fifo.c,v 1.14 2006/10/12 01:31:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_fifo.c,v 1.15 2006/11/16 01:33:23 christos Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -53,8 +53,8 @@ __KERNEL_RCSID(0, "$NetBSD: rf_fifo.c,v 1.14 2006/10/12 01:31:51 christos Exp $"
/* just malloc a header, zero it (via calloc), and return it */
/*ARGSUSED*/
void *
-rf_FifoCreate(RF_SectorCount_t sectPerDisk __unused, RF_AllocListElem_t *clList,
- RF_ShutdownList_t **listp __unused)
+rf_FifoCreate(RF_SectorCount_t sectPerDisk, RF_AllocListElem_t *clList,
+ RF_ShutdownList_t **listp)
{
RF_FifoHeader_t *q;
diff --git a/sys/dev/raidframe/rf_interdecluster.c b/sys/dev/raidframe/rf_interdecluster.c
index 4986c09cf96..fc6604a4d25 100644
--- a/sys/dev/raidframe/rf_interdecluster.c
+++ b/sys/dev/raidframe/rf_interdecluster.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_interdecluster.c,v 1.13 2006/10/12 01:31:51 christos Exp $ */
+/* $NetBSD: rf_interdecluster.c,v 1.14 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_interdecluster.c,v 1.13 2006/10/12 01:31:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_interdecluster.c,v 1.14 2006/11/16 01:33:23 christos Exp $");
#include "rf_archs.h"
@@ -63,9 +63,9 @@ typedef struct RF_InterdeclusterConfigInfo_s {
int
rf_ConfigureInterDecluster(
- RF_ShutdownList_t ** listp __unused,
+ RF_ShutdownList_t ** listp,
RF_Raid_t * raidPtr,
- RF_Config_t * cfgPtr __unused)
+ RF_Config_t * cfgPtr)
{
RF_RaidLayout_t *layoutPtr = &raidPtr->Layout;
RF_StripeCount_t num_used_stripeUnitsPerDisk;
@@ -121,7 +121,7 @@ rf_ConfigureInterDecluster(
}
int
-rf_GetDefaultNumFloatingReconBuffersInterDecluster(RF_Raid_t * raidPtr __unused)
+rf_GetDefaultNumFloatingReconBuffersInterDecluster(RF_Raid_t * raidPtr)
{
return (30);
}
@@ -233,7 +233,7 @@ rf_IdentifyStripeInterDecluster(
void
rf_MapSIDToPSIDInterDecluster(
- RF_RaidLayout_t * layoutPtr __unused,
+ RF_RaidLayout_t * layoutPtr,
RF_StripeNum_t stripeID,
RF_StripeNum_t * psID,
RF_ReconUnitNum_t * which_ru)
@@ -252,7 +252,7 @@ rf_MapSIDToPSIDInterDecluster(
void
rf_RAIDIDagSelect(
- RF_Raid_t * raidPtr __unused,
+ RF_Raid_t * raidPtr,
RF_IoType_t type,
RF_AccessStripeMap_t * asmap,
RF_VoidFuncPtr * createFunc)
diff --git a/sys/dev/raidframe/rf_map.c b/sys/dev/raidframe/rf_map.c
index 62f349e5a92..94764bd78f0 100644
--- a/sys/dev/raidframe/rf_map.c
+++ b/sys/dev/raidframe/rf_map.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_map.c,v 1.41 2006/10/12 01:31:51 christos Exp $ */
+/* $NetBSD: rf_map.c,v 1.42 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
**************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_map.c,v 1.41 2006/10/12 01:31:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_map.c,v 1.42 2006/11/16 01:33:23 christos Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -339,7 +339,7 @@ rf_MarkFailuresInASMList(RF_Raid_t *raidPtr,
release all the free lists */
static void rf_ShutdownMapModule(void *);
static void
-rf_ShutdownMapModule(void *ignored __unused)
+rf_ShutdownMapModule(void *ignored)
{
pool_destroy(&rf_pools.asm_hdr);
pool_destroy(&rf_pools.asmap);
diff --git a/sys/dev/raidframe/rf_mcpair.c b/sys/dev/raidframe/rf_mcpair.c
index d550ba44281..23ab62cda9c 100644
--- a/sys/dev/raidframe/rf_mcpair.c
+++ b/sys/dev/raidframe/rf_mcpair.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_mcpair.c,v 1.20 2006/10/12 01:31:51 christos Exp $ */
+/* $NetBSD: rf_mcpair.c,v 1.21 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_mcpair.c,v 1.20 2006/10/12 01:31:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_mcpair.c,v 1.21 2006/11/16 01:33:23 christos Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -53,7 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: rf_mcpair.c,v 1.20 2006/10/12 01:31:51 christos Exp
static void rf_ShutdownMCPair(void *);
static void
-rf_ShutdownMCPair(void *ignored __unused)
+rf_ShutdownMCPair(void *ignored)
{
pool_destroy(&rf_pools.mcpair);
}
diff --git a/sys/dev/raidframe/rf_netbsdkintf.c b/sys/dev/raidframe/rf_netbsdkintf.c
index 4d843493f38..e321604d05d 100644
--- a/sys/dev/raidframe/rf_netbsdkintf.c
+++ b/sys/dev/raidframe/rf_netbsdkintf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_netbsdkintf.c,v 1.221 2006/10/12 01:31:51 christos Exp $ */
+/* $NetBSD: rf_netbsdkintf.c,v 1.222 2006/11/16 01:33:23 christos Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -146,7 +146,7 @@
***********************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.221 2006/10/12 01:31:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.222 2006/11/16 01:33:23 christos Exp $");
#include <sys/param.h>
#include <sys/errno.h>
@@ -409,7 +409,7 @@ raidattach(int num)
}
int
-rf_autoconfig(struct device *self __unused)
+rf_autoconfig(struct device *self)
{
RF_AutoConfig_t *ac_list;
RF_ConfigSet_t *config_sets;
@@ -536,16 +536,16 @@ raidsize(dev_t dev)
}
int
-raiddump(dev_t dev __unused, daddr_t blkno __unused, caddr_t va __unused,
- size_t size __unused)
+raiddump(dev_t dev, daddr_t blkno, caddr_t va,
+ size_t size)
{
/* Not implemented. */
return ENXIO;
}
/* ARGSUSED */
int
-raidopen(dev_t dev, int flags __unused, int fmt __unused,
- struct lwp *l __unused)
+raidopen(dev_t dev, int flags, int fmt,
+ struct lwp *l)
{
int unit = raidunit(dev);
struct raid_softc *rs;
@@ -624,7 +624,7 @@ bad:
}
/* ARGSUSED */
int
-raidclose(dev_t dev, int flags __unused, int fmt, struct lwp *l __unused)
+raidclose(dev_t dev, int flags, int fmt, struct lwp *l)
{
int unit = raidunit(dev);
struct cfdata *cf;
@@ -763,7 +763,7 @@ done:
}
/* ARGSUSED */
int
-raidread(dev_t dev, struct uio *uio, int flags __unused)
+raidread(dev_t dev, struct uio *uio, int flags)
{
int unit = raidunit(dev);
struct raid_softc *rs;
@@ -780,7 +780,7 @@ raidread(dev_t dev, struct uio *uio, int flags __unused)
}
/* ARGSUSED */
int
-raidwrite(dev_t dev, struct uio *uio, int flags __unused)
+raidwrite(dev_t dev, struct uio *uio, int flags)
{
int unit = raidunit(dev);
struct raid_softc *rs;
@@ -2271,7 +2271,7 @@ raidread_component_label(dev_t dev, struct vnode *b_vp,
}
/* ARGSUSED */
int
-raidwrite_component_label(dev_t dev, struct vnode *b_vp __unused,
+raidwrite_component_label(dev_t dev, struct vnode *b_vp,
RF_ComponentLabel_t *clabel)
{
struct buf *bp;
@@ -3084,7 +3084,7 @@ rf_have_enough_components(RF_ConfigSet_t *cset)
void
rf_create_configuration(RF_AutoConfig_t *ac, RF_Config_t *config,
- RF_Raid_t *raidPtr __unused)
+ RF_Raid_t *raidPtr)
{
RF_ComponentLabel_t *clabel;
int i;
@@ -3417,22 +3417,22 @@ rf_getdisksize(struct vnode *vp, struct lwp *l, RF_RaidDisk_t *diskPtr)
}
static int
-raid_match(struct device *self __unused, struct cfdata *cfdata __unused,
- void *aux __unused)
+raid_match(struct device *self, struct cfdata *cfdata,
+ void *aux)
{
return 1;
}
static void
-raid_attach(struct device *parent __unused, struct device *self __unused,
- void *aux __unused)
+raid_attach(struct device *parent, struct device *self,
+ void *aux)
{
}
static int
-raid_detach(struct device *self, int flags __unused)
+raid_detach(struct device *self, int flags)
{
struct raid_softc *rs = (struct raid_softc *)self;
diff --git a/sys/dev/raidframe/rf_nwayxor.c b/sys/dev/raidframe/rf_nwayxor.c
index 69bf70b4889..4322ad174a2 100644
--- a/sys/dev/raidframe/rf_nwayxor.c
+++ b/sys/dev/raidframe/rf_nwayxor.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_nwayxor.c,v 1.10 2006/10/12 01:31:51 christos Exp $ */
+/* $NetBSD: rf_nwayxor.c,v 1.11 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -36,7 +36,7 @@
************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_nwayxor.c,v 1.10 2006/10/12 01:31:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_nwayxor.c,v 1.11 2006/11/16 01:33:23 christos Exp $");
#include "rf_nwayxor.h"
#include "rf_shutdown.h"
@@ -45,7 +45,7 @@ static int callcount[10];
static void rf_ShutdownNWayXor(void *);
static void
-rf_ShutdownNWayXor(void *ignored __unused)
+rf_ShutdownNWayXor(void *ignored)
{
int i;
diff --git a/sys/dev/raidframe/rf_paritylogDiskMgr.c b/sys/dev/raidframe/rf_paritylogDiskMgr.c
index e22ceb1a631..e58b2a47956 100644
--- a/sys/dev/raidframe/rf_paritylogDiskMgr.c
+++ b/sys/dev/raidframe/rf_paritylogDiskMgr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_paritylogDiskMgr.c,v 1.20 2006/10/12 01:31:51 christos Exp $ */
+/* $NetBSD: rf_paritylogDiskMgr.c,v 1.21 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_paritylogDiskMgr.c,v 1.20 2006/10/12 01:31:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_paritylogDiskMgr.c,v 1.21 2006/11/16 01:33:23 christos Exp $");
#include "rf_archs.h"
@@ -376,7 +376,7 @@ static void
ReintegrateRegion(
RF_Raid_t * raidPtr,
RF_RegionId_t regionID,
- RF_ParityLog_t * coreLog __unused)
+ RF_ParityLog_t * coreLog)
{
RF_MCPair_t *rrd_mcpair = NULL, *prd_mcpair, *pwr_mcpair;
RF_DagHeader_t *rrd_dag_h = NULL, *prd_dag_h, *pwr_dag_h;
diff --git a/sys/dev/raidframe/rf_paritylogging.c b/sys/dev/raidframe/rf_paritylogging.c
index 11d9df2c1d1..26c16573c06 100644
--- a/sys/dev/raidframe/rf_paritylogging.c
+++ b/sys/dev/raidframe/rf_paritylogging.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_paritylogging.c,v 1.26 2006/10/12 01:31:52 christos Exp $ */
+/* $NetBSD: rf_paritylogging.c,v 1.27 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_paritylogging.c,v 1.26 2006/10/12 01:31:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_paritylogging.c,v 1.27 2006/11/16 01:33:23 christos Exp $");
#include "rf_archs.h"
@@ -74,7 +74,7 @@ int
rf_ConfigureParityLogging(
RF_ShutdownList_t ** listp,
RF_Raid_t * raidPtr,
- RF_Config_t * cfgPtr __unused)
+ RF_Config_t * cfgPtr)
{
int i, j, startdisk, rc;
RF_SectorCount_t totalLogCapacity, fragmentation, lastRegionCapacity;
@@ -518,7 +518,7 @@ FreeRegionInfo(
static void
FreeParityLogQueue(
- RF_Raid_t * raidPtr __unused,
+ RF_Raid_t * raidPtr,
RF_ParityLogQueue_t * queue)
{
RF_ParityLog_t *l1, *l2;
@@ -677,13 +677,13 @@ rf_ShutdownParityLogging(RF_ThreadArg_t arg)
}
int
-rf_GetDefaultNumFloatingReconBuffersParityLogging(RF_Raid_t * raidPtr __unused)
+rf_GetDefaultNumFloatingReconBuffersParityLogging(RF_Raid_t * raidPtr)
{
return (20);
}
RF_HeadSepLimit_t
-rf_GetDefaultHeadSepLimitParityLogging(RF_Raid_t * raidPtr __unused)
+rf_GetDefaultHeadSepLimitParityLogging(RF_Raid_t * raidPtr)
{
return (10);
}
@@ -716,7 +716,7 @@ rf_MapSectorParityLogging(
RF_RaidAddr_t raidSector,
RF_RowCol_t * col,
RF_SectorNum_t * diskSector,
- int remap __unused)
+ int remap)
{
RF_StripeNum_t SUID = raidSector /
raidPtr->Layout.sectorsPerStripeUnit;
@@ -736,7 +736,7 @@ rf_MapParityParityLogging(
RF_RaidAddr_t raidSector,
RF_RowCol_t * col,
RF_SectorNum_t * diskSector,
- int remap __unused)
+ int remap)
{
RF_StripeNum_t SUID = raidSector /
raidPtr->Layout.sectorsPerStripeUnit;
@@ -799,7 +799,7 @@ rf_IdentifyStripeParityLogging(
void
rf_MapSIDToPSIDParityLogging(
- RF_RaidLayout_t * layoutPtr __unused,
+ RF_RaidLayout_t * layoutPtr,
RF_StripeNum_t stripeID,
RF_StripeNum_t * psID,
RF_ReconUnitNum_t * which_ru)
diff --git a/sys/dev/raidframe/rf_parityloggingdags.c b/sys/dev/raidframe/rf_parityloggingdags.c
index 77ed63b2363..b6f13c20a5c 100644
--- a/sys/dev/raidframe/rf_parityloggingdags.c
+++ b/sys/dev/raidframe/rf_parityloggingdags.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_parityloggingdags.c,v 1.17 2006/10/12 01:31:52 christos Exp $ */
+/* $NetBSD: rf_parityloggingdags.c,v 1.18 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_parityloggingdags.c,v 1.17 2006/10/12 01:31:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_parityloggingdags.c,v 1.18 2006/11/16 01:33:23 christos Exp $");
#include "rf_archs.h"
#include "opt_raid_diagnostic.h"
@@ -75,10 +75,10 @@ rf_CommonCreateParityLoggingLargeWriteDAG(
RF_Raid_t * raidPtr,
RF_AccessStripeMap_t * asmap,
RF_DagHeader_t * dag_h,
- void *bp __unused,
- RF_RaidAccessFlags_t flags __unused,
+ void *bp,
+ RF_RaidAccessFlags_t flags,
RF_AllocListElem_t * allocList,
- int nfaults __unused,
+ int nfaults,
int (*redFunc) (RF_DagNode_t *))
{
RF_DagNode_t *nodes, *wndNodes, *rodNodes = NULL, *syncNode, *xorNode,
@@ -320,8 +320,8 @@ rf_CommonCreateParityLoggingSmallWriteDAG(
RF_Raid_t * raidPtr,
RF_AccessStripeMap_t * asmap,
RF_DagHeader_t * dag_h,
- void *bp __unused,
- RF_RaidAccessFlags_t flags __unused,
+ void *bp,
+ RF_RaidAccessFlags_t flags,
RF_AllocListElem_t * allocList,
const RF_RedFuncs_t * pfuncs,
const RF_RedFuncs_t * qfuncs)
@@ -626,8 +626,8 @@ rf_CreateParityLoggingSmallWriteDAG(
void *bp,
RF_RaidAccessFlags_t flags,
RF_AllocListElem_t * allocList,
- const RF_RedFuncs_t * pfuncs __unused,
- const RF_RedFuncs_t * qfuncs __unused)
+ const RF_RedFuncs_t * pfuncs,
+ const RF_RedFuncs_t * qfuncs)
{
dag_h->creator = "ParityLoggingSmallWriteDAG";
rf_CommonCreateParityLoggingSmallWriteDAG(raidPtr, asmap, dag_h, bp, flags, allocList, &rf_xorFuncs, NULL);
@@ -642,8 +642,8 @@ rf_CreateParityLoggingLargeWriteDAG(
void *bp,
RF_RaidAccessFlags_t flags,
RF_AllocListElem_t * allocList,
- int nfaults __unused,
- int (*redFunc) (RF_DagNode_t *) __unused)
+ int nfaults,
+ int (*redFunc) (RF_DagNode_t *))
{
dag_h->creator = "ParityLoggingSmallWriteDAG";
rf_CommonCreateParityLoggingLargeWriteDAG(raidPtr, asmap, dag_h, bp, flags, allocList, 1, rf_RegularXorFunc);
diff --git a/sys/dev/raidframe/rf_parityscan.c b/sys/dev/raidframe/rf_parityscan.c
index c820e64eb44..fb423cde3f3 100644
--- a/sys/dev/raidframe/rf_parityscan.c
+++ b/sys/dev/raidframe/rf_parityscan.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_parityscan.c,v 1.31 2006/10/12 01:31:52 christos Exp $ */
+/* $NetBSD: rf_parityscan.c,v 1.32 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_parityscan.c,v 1.31 2006/10/12 01:31:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_parityscan.c,v 1.32 2006/11/16 01:33:23 christos Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -322,7 +322,7 @@ out:
int
rf_TryToRedirectPDA(RF_Raid_t *raidPtr, RF_PhysDiskAddr_t *pda,
- int parity __unused)
+ int parity)
{
if (raidPtr->Disks[pda->col].status == rf_ds_reconstructing) {
if (rf_CheckRUReconstructed(raidPtr->reconControl->reconMap, pda->startSector)) {
@@ -404,7 +404,7 @@ rf_MakeSimpleDAG(RF_Raid_t *raidPtr, int nNodes, int bytesPerSU, char *databuf,
int (*doFunc) (RF_DagNode_t * node),
int (*undoFunc) (RF_DagNode_t * node),
const char *name, RF_AllocListElem_t *alloclist,
- RF_RaidAccessFlags_t flags __unused, int priority __unused)
+ RF_RaidAccessFlags_t flags, int priority)
{
RF_DagHeader_t *dag_h;
RF_DagNode_t *nodes, *termNode, *blockNode, *unblockNode, *tmpNode;
diff --git a/sys/dev/raidframe/rf_psstatus.c b/sys/dev/raidframe/rf_psstatus.c
index 30aff8884a0..3c77aec6355 100644
--- a/sys/dev/raidframe/rf_psstatus.c
+++ b/sys/dev/raidframe/rf_psstatus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_psstatus.c,v 1.32 2006/10/12 01:31:52 christos Exp $ */
+/* $NetBSD: rf_psstatus.c,v 1.33 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -37,7 +37,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_psstatus.c,v 1.32 2006/10/12 01:31:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_psstatus.c,v 1.33 2006/11/16 01:33:23 christos Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -67,7 +67,7 @@ RealPrintPSStatusTable(RF_Raid_t * raidPtr,
static void rf_ShutdownPSStatus(void *);
static void
-rf_ShutdownPSStatus(void *arg __unused)
+rf_ShutdownPSStatus(void *arg)
{
pool_destroy(&rf_pools.pss);
@@ -112,7 +112,7 @@ rf_MakeParityStripeStatusTable(RF_Raid_t *raidPtr)
}
void
-rf_FreeParityStripeStatusTable(RF_Raid_t *raidPtr __unused,
+rf_FreeParityStripeStatusTable(RF_Raid_t *raidPtr,
RF_PSStatusHeader_t *pssTable)
{
#if RF_DEBUG_PSS
@@ -262,7 +262,7 @@ rf_RemoveFromActiveReconTable(RF_Raid_t *raidPtr, RF_StripeNum_t psid,
}
RF_ReconParityStripeStatus_t *
-rf_AllocPSStatus(RF_Raid_t *raidPtr __unused)
+rf_AllocPSStatus(RF_Raid_t *raidPtr)
{
RF_ReconParityStripeStatus_t *p;
@@ -272,7 +272,7 @@ rf_AllocPSStatus(RF_Raid_t *raidPtr __unused)
}
void
-rf_FreePSStatus(RF_Raid_t *raidPtr __unused, RF_ReconParityStripeStatus_t *p)
+rf_FreePSStatus(RF_Raid_t *raidPtr, RF_ReconParityStripeStatus_t *p)
{
RF_ASSERT(p->procWaitList == NULL);
RF_ASSERT(p->blockWaitList == NULL);
diff --git a/sys/dev/raidframe/rf_raid0.c b/sys/dev/raidframe/rf_raid0.c
index f0cc136a322..8259b6bd94f 100644
--- a/sys/dev/raidframe/rf_raid0.c
+++ b/sys/dev/raidframe/rf_raid0.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_raid0.c,v 1.14 2006/10/12 01:31:52 christos Exp $ */
+/* $NetBSD: rf_raid0.c,v 1.15 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
***************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_raid0.c,v 1.14 2006/10/12 01:31:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_raid0.c,v 1.15 2006/11/16 01:33:23 christos Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -52,8 +52,8 @@ typedef struct RF_Raid0ConfigInfo_s {
} RF_Raid0ConfigInfo_t;
int
-rf_ConfigureRAID0(RF_ShutdownList_t **listp __unused, RF_Raid_t *raidPtr,
- RF_Config_t *cfgPtr __unused)
+rf_ConfigureRAID0(RF_ShutdownList_t **listp, RF_Raid_t *raidPtr,
+ RF_Config_t *cfgPtr)
{
RF_RaidLayout_t *layoutPtr = &raidPtr->Layout;
RF_Raid0ConfigInfo_t *info;
@@ -81,7 +81,7 @@ rf_ConfigureRAID0(RF_ShutdownList_t **listp __unused, RF_Raid_t *raidPtr,
void
rf_MapSectorRAID0(RF_Raid_t *raidPtr, RF_RaidAddr_t raidSector,
- RF_RowCol_t *col, RF_SectorNum_t *diskSector, int remap __unused)
+ RF_RowCol_t *col, RF_SectorNum_t *diskSector, int remap)
{
RF_StripeNum_t SUID = raidSector / raidPtr->Layout.sectorsPerStripeUnit;
*col = SUID % raidPtr->numCol;
@@ -90,16 +90,16 @@ rf_MapSectorRAID0(RF_Raid_t *raidPtr, RF_RaidAddr_t raidSector,
}
void
-rf_MapParityRAID0(RF_Raid_t *raidPtr __unused,
- RF_RaidAddr_t raidSector __unused, RF_RowCol_t *col,
- RF_SectorNum_t *diskSector, int remap __unused)
+rf_MapParityRAID0(RF_Raid_t *raidPtr,
+ RF_RaidAddr_t raidSector, RF_RowCol_t *col,
+ RF_SectorNum_t *diskSector, int remap)
{
*col = 0;
*diskSector = 0;
}
void
-rf_IdentifyStripeRAID0(RF_Raid_t *raidPtr, RF_RaidAddr_t addr __unused,
+rf_IdentifyStripeRAID0(RF_Raid_t *raidPtr, RF_RaidAddr_t addr,
RF_RowCol_t **diskids)
{
RF_Raid0ConfigInfo_t *info;
@@ -109,7 +109,7 @@ rf_IdentifyStripeRAID0(RF_Raid_t *raidPtr, RF_RaidAddr_t addr __unused,
}
void
-rf_MapSIDToPSIDRAID0(RF_RaidLayout_t *layoutPtr __unused,
+rf_MapSIDToPSIDRAID0(RF_RaidLayout_t *layoutPtr,
RF_StripeNum_t stripeID, RF_StripeNum_t *psID, RF_ReconUnitNum_t *which_ru)
{
*which_ru = 0;
@@ -120,7 +120,7 @@ void
rf_RAID0DagSelect(
RF_Raid_t * raidPtr,
RF_IoType_t type,
- RF_AccessStripeMap_t * asmap __unused,
+ RF_AccessStripeMap_t * asmap,
RF_VoidFuncPtr * createFunc)
{
if (raidPtr->numFailures > 0) {
@@ -132,9 +132,9 @@ rf_RAID0DagSelect(
}
int
-rf_VerifyParityRAID0(RF_Raid_t *raidPtr __unused,
- RF_RaidAddr_t raidAddr __unused, RF_PhysDiskAddr_t *parityPDA __unused,
- int correct_it __unused, RF_RaidAccessFlags_t flags __unused)
+rf_VerifyParityRAID0(RF_Raid_t *raidPtr,
+ RF_RaidAddr_t raidAddr, RF_PhysDiskAddr_t *parityPDA,
+ int correct_it, RF_RaidAccessFlags_t flags)
{
/*
* No parity is always okay.
diff --git a/sys/dev/raidframe/rf_raid1.c b/sys/dev/raidframe/rf_raid1.c
index 13a2a086234..abe5aeed745 100644
--- a/sys/dev/raidframe/rf_raid1.c
+++ b/sys/dev/raidframe/rf_raid1.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_raid1.c,v 1.28 2006/10/12 01:31:52 christos Exp $ */
+/* $NetBSD: rf_raid1.c,v 1.29 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_raid1.c,v 1.28 2006/10/12 01:31:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_raid1.c,v 1.29 2006/11/16 01:33:23 christos Exp $");
#include "rf_raid.h"
#include "rf_raid1.h"
@@ -58,8 +58,8 @@ typedef struct RF_Raid1ConfigInfo_s {
} RF_Raid1ConfigInfo_t;
/* start of day code specific to RAID level 1 */
int
-rf_ConfigureRAID1(RF_ShutdownList_t **listp __unused, RF_Raid_t *raidPtr,
- RF_Config_t *cfgPtr __unused)
+rf_ConfigureRAID1(RF_ShutdownList_t **listp, RF_Raid_t *raidPtr,
+ RF_Config_t *cfgPtr)
{
RF_RaidLayout_t *layoutPtr = &raidPtr->Layout;
RF_Raid1ConfigInfo_t *info;
@@ -97,7 +97,7 @@ rf_ConfigureRAID1(RF_ShutdownList_t **listp __unused, RF_Raid_t *raidPtr,
void
rf_MapSectorRAID1(RF_Raid_t *raidPtr, RF_RaidAddr_t raidSector,
RF_RowCol_t *col, RF_SectorNum_t *diskSector,
- int remap __unused)
+ int remap)
{
RF_StripeNum_t SUID = raidSector / raidPtr->Layout.sectorsPerStripeUnit;
RF_RowCol_t mirrorPair = SUID % (raidPtr->numCol / 2);
@@ -115,7 +115,7 @@ rf_MapSectorRAID1(RF_Raid_t *raidPtr, RF_RaidAddr_t raidSector,
void
rf_MapParityRAID1(RF_Raid_t *raidPtr, RF_RaidAddr_t raidSector,
RF_RowCol_t *col, RF_SectorNum_t *diskSector,
- int remap __unused)
+ int remap)
{
RF_StripeNum_t SUID = raidSector / raidPtr->Layout.sectorsPerStripeUnit;
RF_RowCol_t mirrorPair = SUID % (raidPtr->numCol / 2);
@@ -148,7 +148,7 @@ rf_IdentifyStripeRAID1(RF_Raid_t *raidPtr, RF_RaidAddr_t addr,
* maps a logical stripe to a stripe in the redundant array
*/
void
-rf_MapSIDToPSIDRAID1(RF_RaidLayout_t *layoutPtr __unused,
+rf_MapSIDToPSIDRAID1(RF_RaidLayout_t *layoutPtr,
RF_StripeNum_t stripeID,
RF_StripeNum_t *psID, RF_ReconUnitNum_t *which_ru)
{
diff --git a/sys/dev/raidframe/rf_raid4.c b/sys/dev/raidframe/rf_raid4.c
index 8826d0380b5..5d66cc8fe85 100644
--- a/sys/dev/raidframe/rf_raid4.c
+++ b/sys/dev/raidframe/rf_raid4.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_raid4.c,v 1.11 2006/10/12 01:31:52 christos Exp $ */
+/* $NetBSD: rf_raid4.c,v 1.12 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
***************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_raid4.c,v 1.11 2006/10/12 01:31:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_raid4.c,v 1.12 2006/11/16 01:33:23 christos Exp $");
#include "rf_raid.h"
#include "rf_dag.h"
@@ -54,8 +54,8 @@ typedef struct RF_Raid4ConfigInfo_s {
int
-rf_ConfigureRAID4(RF_ShutdownList_t **listp __unused, RF_Raid_t *raidPtr,
- RF_Config_t *cfgPtr __unused)
+rf_ConfigureRAID4(RF_ShutdownList_t **listp, RF_Raid_t *raidPtr,
+ RF_Config_t *cfgPtr)
{
RF_RaidLayout_t *layoutPtr = &raidPtr->Layout;
RF_Raid4ConfigInfo_t *info;
@@ -85,13 +85,13 @@ rf_ConfigureRAID4(RF_ShutdownList_t **listp __unused, RF_Raid_t *raidPtr,
}
int
-rf_GetDefaultNumFloatingReconBuffersRAID4(RF_Raid_t *raidPtr __unused)
+rf_GetDefaultNumFloatingReconBuffersRAID4(RF_Raid_t *raidPtr)
{
return (20);
}
RF_HeadSepLimit_t
-rf_GetDefaultHeadSepLimitRAID4(RF_Raid_t *raidPtr __unused)
+rf_GetDefaultHeadSepLimitRAID4(RF_Raid_t *raidPtr)
{
return (20);
}
@@ -99,7 +99,7 @@ rf_GetDefaultHeadSepLimitRAID4(RF_Raid_t *raidPtr __unused)
void
rf_MapSectorRAID4(RF_Raid_t *raidPtr, RF_RaidAddr_t raidSector,
RF_RowCol_t *col, RF_SectorNum_t *diskSector,
- int remap __unused)
+ int remap)
{
RF_StripeNum_t SUID = raidSector / raidPtr->Layout.sectorsPerStripeUnit;
*col = SUID % raidPtr->Layout.numDataCol;
@@ -110,7 +110,7 @@ rf_MapSectorRAID4(RF_Raid_t *raidPtr, RF_RaidAddr_t raidSector,
void
rf_MapParityRAID4(RF_Raid_t *raidPtr, RF_RaidAddr_t raidSector,
RF_RowCol_t *col, RF_SectorNum_t *diskSector,
- int remap __unused)
+ int remap)
{
RF_StripeNum_t SUID = raidSector / raidPtr->Layout.sectorsPerStripeUnit;
@@ -120,7 +120,7 @@ rf_MapParityRAID4(RF_Raid_t *raidPtr, RF_RaidAddr_t raidSector,
}
void
-rf_IdentifyStripeRAID4(RF_Raid_t *raidPtr, RF_RaidAddr_t addr __unused,
+rf_IdentifyStripeRAID4(RF_Raid_t *raidPtr, RF_RaidAddr_t addr,
RF_RowCol_t **diskids)
{
RF_Raid4ConfigInfo_t *info = raidPtr->Layout.layoutSpecificInfo;
@@ -129,7 +129,7 @@ rf_IdentifyStripeRAID4(RF_Raid_t *raidPtr, RF_RaidAddr_t addr __unused,
}
void
-rf_MapSIDToPSIDRAID4(RF_RaidLayout_t *layoutPtr __unused,
+rf_MapSIDToPSIDRAID4(RF_RaidLayout_t *layoutPtr,
RF_StripeNum_t stripeID,
RF_StripeNum_t *psID, RF_ReconUnitNum_t *which_ru)
{
diff --git a/sys/dev/raidframe/rf_raid5.c b/sys/dev/raidframe/rf_raid5.c
index ae3f5d5a520..5e5c984f4b7 100644
--- a/sys/dev/raidframe/rf_raid5.c
+++ b/sys/dev/raidframe/rf_raid5.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_raid5.c,v 1.18 2006/10/12 01:31:52 christos Exp $ */
+/* $NetBSD: rf_raid5.c,v 1.19 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_raid5.c,v 1.18 2006/10/12 01:31:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_raid5.c,v 1.19 2006/11/16 01:33:23 christos Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -55,8 +55,8 @@ typedef struct RF_Raid5ConfigInfo_s {
} RF_Raid5ConfigInfo_t;
int
-rf_ConfigureRAID5(RF_ShutdownList_t **listp __unused, RF_Raid_t *raidPtr,
- RF_Config_t *cfgPtr __unused)
+rf_ConfigureRAID5(RF_ShutdownList_t **listp, RF_Raid_t *raidPtr,
+ RF_Config_t *cfgPtr)
{
RF_RaidLayout_t *layoutPtr = &raidPtr->Layout;
RF_Raid5ConfigInfo_t *info;
@@ -95,13 +95,13 @@ rf_ConfigureRAID5(RF_ShutdownList_t **listp __unused, RF_Raid_t *raidPtr,
}
int
-rf_GetDefaultNumFloatingReconBuffersRAID5(RF_Raid_t *raidPtr __unused)
+rf_GetDefaultNumFloatingReconBuffersRAID5(RF_Raid_t *raidPtr)
{
return (20);
}
RF_HeadSepLimit_t
-rf_GetDefaultHeadSepLimitRAID5(RF_Raid_t *raidPtr __unused)
+rf_GetDefaultHeadSepLimitRAID5(RF_Raid_t *raidPtr)
{
return (10);
}
@@ -117,7 +117,7 @@ rf_ShutdownRAID5(RF_Raid_t *raidPtr)
void
rf_MapSectorRAID5(RF_Raid_t *raidPtr, RF_RaidAddr_t raidSector,
RF_RowCol_t *col, RF_SectorNum_t *diskSector,
- int remap __unused)
+ int remap)
{
RF_StripeNum_t SUID = raidSector / raidPtr->Layout.sectorsPerStripeUnit;
*col = (SUID % raidPtr->numCol);
@@ -128,7 +128,7 @@ rf_MapSectorRAID5(RF_Raid_t *raidPtr, RF_RaidAddr_t raidSector,
void
rf_MapParityRAID5(RF_Raid_t *raidPtr, RF_RaidAddr_t raidSector,
RF_RowCol_t *col, RF_SectorNum_t *diskSector,
- int remap __unused)
+ int remap)
{
RF_StripeNum_t SUID = raidSector / raidPtr->Layout.sectorsPerStripeUnit;
@@ -148,7 +148,7 @@ rf_IdentifyStripeRAID5(RF_Raid_t *raidPtr, RF_RaidAddr_t addr,
}
void
-rf_MapSIDToPSIDRAID5(RF_RaidLayout_t *layoutPtr __unused,
+rf_MapSIDToPSIDRAID5(RF_RaidLayout_t *layoutPtr,
RF_StripeNum_t stripeID,
RF_StripeNum_t *psID, RF_ReconUnitNum_t *which_ru)
{
diff --git a/sys/dev/raidframe/rf_raid5_rotatedspare.c b/sys/dev/raidframe/rf_raid5_rotatedspare.c
index 45762890ea1..e0ef2822a32 100644
--- a/sys/dev/raidframe/rf_raid5_rotatedspare.c
+++ b/sys/dev/raidframe/rf_raid5_rotatedspare.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_raid5_rotatedspare.c,v 1.11 2006/10/12 01:31:52 christos Exp $ */
+/* $NetBSD: rf_raid5_rotatedspare.c,v 1.12 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
**************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_raid5_rotatedspare.c,v 1.11 2006/10/12 01:31:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_raid5_rotatedspare.c,v 1.12 2006/11/16 01:33:23 christos Exp $");
#include "rf_archs.h"
@@ -55,9 +55,9 @@ typedef struct RF_Raid5RSConfigInfo_s {
int
rf_ConfigureRAID5_RS(
- RF_ShutdownList_t ** listp __unused,
+ RF_ShutdownList_t ** listp,
RF_Raid_t * raidPtr,
- RF_Config_t * cfgPtr __unused)
+ RF_Config_t * cfgPtr)
{
RF_RaidLayout_t *layoutPtr = &raidPtr->Layout;
RF_Raid5RSConfigInfo_t *info;
@@ -158,7 +158,7 @@ rf_IdentifyStripeRAID5_RS(
void
rf_MapSIDToPSIDRAID5_RS(
- RF_RaidLayout_t * layoutPtr __unused,
+ RF_RaidLayout_t * layoutPtr,
RF_StripeNum_t stripeID,
RF_StripeNum_t * psID,
RF_ReconUnitNum_t * which_ru)
diff --git a/sys/dev/raidframe/rf_reconmap.c b/sys/dev/raidframe/rf_reconmap.c
index 2104355ab9b..4522494c64e 100644
--- a/sys/dev/raidframe/rf_reconmap.c
+++ b/sys/dev/raidframe/rf_reconmap.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_reconmap.c,v 1.28 2006/10/12 01:31:52 christos Exp $ */
+/* $NetBSD: rf_reconmap.c,v 1.29 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -34,7 +34,7 @@
*************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_reconmap.c,v 1.28 2006/10/12 01:31:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_reconmap.c,v 1.29 2006/11/16 01:33:23 christos Exp $");
#include "rf_raid.h"
#include <sys/time.h>
@@ -200,7 +200,7 @@ rf_ReconMapUpdate(RF_Raid_t *raidPtr, RF_ReconMap_t *mapPtr,
*-------------------------------------------------------------------------*/
static void
-compact_stat_entry(RF_Raid_t *raidPtr __unused, RF_ReconMap_t *mapPtr, int i)
+compact_stat_entry(RF_Raid_t *raidPtr, RF_ReconMap_t *mapPtr, int i)
{
RF_SectorCount_t sectorsPerReconUnit = mapPtr->sectorsPerReconUnit;
RF_ReconMapListElem_t *p = mapPtr->status[i];
diff --git a/sys/dev/raidframe/rf_reconstruct.c b/sys/dev/raidframe/rf_reconstruct.c
index a7e239ea9cf..0d5ad1084f9 100644
--- a/sys/dev/raidframe/rf_reconstruct.c
+++ b/sys/dev/raidframe/rf_reconstruct.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_reconstruct.c,v 1.94 2006/10/12 01:31:52 christos Exp $ */
+/* $NetBSD: rf_reconstruct.c,v 1.95 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_reconstruct.c,v 1.94 2006/10/12 01:31:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_reconstruct.c,v 1.95 2006/11/16 01:33:23 christos Exp $");
#include <sys/time.h>
#include <sys/buf.h>
@@ -142,7 +142,7 @@ struct RF_ReconDoneProc_s {
*
**************************************************************************/
static void
-rf_ShutdownReconstruction(void *ignored __unused)
+rf_ShutdownReconstruction(void *ignored)
{
pool_destroy(&rf_pools.reconbuffer);
}
@@ -1464,7 +1464,7 @@ ReconWriteDoneProc(void *arg, int status)
* be woken as a result
*/
static void
-CheckForNewMinHeadSep(RF_Raid_t *raidPtr, RF_HeadSepLimit_t hsCtr __unused)
+CheckForNewMinHeadSep(RF_Raid_t *raidPtr, RF_HeadSepLimit_t hsCtr)
{
RF_ReconCtrl_t *reconCtrlPtr = raidPtr->reconControl;
RF_HeadSepLimit_t new_min;
@@ -1522,8 +1522,8 @@ CheckForNewMinHeadSep(RF_Raid_t *raidPtr, RF_HeadSepLimit_t hsCtr __unused)
*/
static int
CheckHeadSeparation(RF_Raid_t *raidPtr, RF_PerDiskReconCtrl_t *ctrl,
- RF_RowCol_t col, RF_HeadSepLimit_t hsCtr __unused,
- RF_ReconUnitNum_t which_ru __unused)
+ RF_RowCol_t col, RF_HeadSepLimit_t hsCtr,
+ RF_ReconUnitNum_t which_ru)
{
RF_ReconCtrl_t *reconCtrlPtr = raidPtr->reconControl;
RF_CallbackDesc_t *cb, *p, *pt;
@@ -1590,12 +1590,12 @@ CheckHeadSeparation(RF_Raid_t *raidPtr, RF_PerDiskReconCtrl_t *ctrl,
* ASSUMES THE PSS MUTEX IS LOCKED UPON ENTRY
*/
static int
-CheckForcedOrBlockedReconstruction(RF_Raid_t *raidPtr __unused,
+CheckForcedOrBlockedReconstruction(RF_Raid_t *raidPtr,
RF_ReconParityStripeStatus_t *pssPtr,
- RF_PerDiskReconCtrl_t *ctrl __unused,
+ RF_PerDiskReconCtrl_t *ctrl,
RF_RowCol_t col,
- RF_StripeNum_t psid __unused,
- RF_ReconUnitNum_t which_ru __unused)
+ RF_StripeNum_t psid,
+ RF_ReconUnitNum_t which_ru)
{
RF_CallbackDesc_t *cb;
int retcode = 0;
diff --git a/sys/dev/raidframe/rf_revent.c b/sys/dev/raidframe/rf_revent.c
index 39748d23dd2..cb2622b0d4c 100644
--- a/sys/dev/raidframe/rf_revent.c
+++ b/sys/dev/raidframe/rf_revent.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_revent.c,v 1.23 2006/10/12 01:31:52 christos Exp $ */
+/* $NetBSD: rf_revent.c,v 1.24 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_revent.c,v 1.23 2006/10/12 01:31:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_revent.c,v 1.24 2006/11/16 01:33:23 christos Exp $");
#include <sys/errno.h>
@@ -52,7 +52,7 @@ static void rf_ShutdownReconEvent(void *);
static RF_ReconEvent_t *
GetReconEventDesc(RF_RowCol_t col, void *arg, RF_Revent_t type);
-static void rf_ShutdownReconEvent(void *ignored __unused)
+static void rf_ShutdownReconEvent(void *ignored)
{
pool_destroy(&rf_pools.revent);
}
diff --git a/sys/dev/raidframe/rf_sstf.c b/sys/dev/raidframe/rf_sstf.c
index 3e1ac954b32..63c724bc563 100644
--- a/sys/dev/raidframe/rf_sstf.c
+++ b/sys/dev/raidframe/rf_sstf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_sstf.c,v 1.14 2006/10/12 01:31:52 christos Exp $ */
+/* $NetBSD: rf_sstf.c,v 1.15 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
******************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_sstf.c,v 1.14 2006/10/12 01:31:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_sstf.c,v 1.15 2006/11/16 01:33:23 christos Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -247,9 +247,9 @@ closest_to_arm(queue, arm_pos, dir, allow_reverse)
void *
rf_SstfCreate(
- RF_SectorCount_t sect_per_disk __unused,
+ RF_SectorCount_t sect_per_disk,
RF_AllocListElem_t *cl_list,
- RF_ShutdownList_t **listp __unused)
+ RF_ShutdownList_t **listp)
{
RF_Sstf_t *sstfq;
@@ -261,9 +261,9 @@ rf_SstfCreate(
void *
rf_ScanCreate(
- RF_SectorCount_t sect_per_disk __unused,
+ RF_SectorCount_t sect_per_disk,
RF_AllocListElem_t *cl_list,
- RF_ShutdownList_t **listp __unused)
+ RF_ShutdownList_t **listp)
{
RF_Sstf_t *scanq;
@@ -275,9 +275,9 @@ rf_ScanCreate(
void *
rf_CscanCreate(
- RF_SectorCount_t sect_per_disk __unused,
+ RF_SectorCount_t sect_per_disk,
RF_AllocListElem_t *cl_list,
- RF_ShutdownList_t **listp __unused)
+ RF_ShutdownList_t **listp)
{
RF_Sstf_t *cscanq;
diff --git a/sys/dev/raidframe/rf_stripelocks.c b/sys/dev/raidframe/rf_stripelocks.c
index a8c667e114c..de1f797fbbc 100644
--- a/sys/dev/raidframe/rf_stripelocks.c
+++ b/sys/dev/raidframe/rf_stripelocks.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_stripelocks.c,v 1.28 2006/10/12 01:31:52 christos Exp $ */
+/* $NetBSD: rf_stripelocks.c,v 1.29 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_stripelocks.c,v 1.28 2006/10/12 01:31:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_stripelocks.c,v 1.29 2006/11/16 01:33:23 christos Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -158,7 +158,7 @@ static void rf_ShutdownStripeLockFreeList(void *);
static void rf_RaidShutdownStripeLocks(void *);
static void
-rf_ShutdownStripeLockFreeList(void *ignored __unused)
+rf_ShutdownStripeLockFreeList(void *ignored)
{
pool_destroy(&rf_pools.stripelock);
}
@@ -220,7 +220,7 @@ rf_RaidShutdownStripeLocks(void *arg)
int
rf_ConfigureStripeLocks(RF_ShutdownList_t **listp, RF_Raid_t *raidPtr,
- RF_Config_t *cfgPtr __unused)
+ RF_Config_t *cfgPtr)
{
raidPtr->lockTable = rf_MakeLockTable();
diff --git a/sys/dev/raidframe/rf_utils.c b/sys/dev/raidframe/rf_utils.c
index ff3bd61394c..015bd8525aa 100644
--- a/sys/dev/raidframe/rf_utils.c
+++ b/sys/dev/raidframe/rf_utils.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_utils.c,v 1.15 2006/10/12 01:31:52 christos Exp $ */
+/* $NetBSD: rf_utils.c,v 1.16 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
****************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_utils.c,v 1.15 2006/10/12 01:31:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_utils.c,v 1.16 2006/11/16 01:33:23 christos Exp $");
#include "rf_archs.h"
#include "rf_utils.h"
@@ -57,7 +57,7 @@ rf_make_2d_array(int b, int k, RF_AllocListElem_t *allocList)
#if (RF_INCLUDE_PARITY_DECLUSTERING > 0) || (RF_INCLUDE_PARITY_DECLUSTERING_PQ > 0)
void
-rf_free_2d_array(RF_RowCol_t **a, int b, int k __unused)
+rf_free_2d_array(RF_RowCol_t **a, int b, int k)
{
RF_RowCol_t i;
@@ -79,7 +79,7 @@ rf_make_1d_array(int c, RF_AllocListElem_t *allocList)
}
void
-rf_free_1d_array(RF_RowCol_t *a, int n __unused)
+rf_free_1d_array(RF_RowCol_t *a, int n)
{
RF_Free(a, n * sizeof(RF_RowCol_t));
}
diff --git a/sys/dev/rasops/rasops.c b/sys/dev/rasops/rasops.c
index e5ae5e91802..fdb3f63aff3 100644
--- a/sys/dev/rasops/rasops.c
+++ b/sys/dev/rasops/rasops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rasops.c,v 1.53 2006/10/12 01:31:56 christos Exp $ */
+/* $NetBSD: rasops.c,v 1.54 2006/11/16 01:33:26 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rasops.c,v 1.53 2006/10/12 01:31:56 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rasops.c,v 1.54 2006/11/16 01:33:26 christos Exp $");
#include "opt_rasops.h"
#include "rasops_glue.h"
@@ -383,7 +383,7 @@ rasops_mapchar(cookie, c, cp)
* Allocate a color attribute.
*/
static int
-rasops_allocattr_color(void *cookie __unused, int fg, int bg, int flg,
+rasops_allocattr_color(void *cookie, int fg, int bg, int flg,
long *attr)
{
int swap;
@@ -433,7 +433,7 @@ rasops_allocattr_color(void *cookie __unused, int fg, int bg, int flg,
* Allocate a mono attribute.
*/
static int
-rasops_allocattr_mono(void *cookie __unused, int fg, int bg, int flg,
+rasops_allocattr_mono(void *cookie, int fg, int bg, int flg,
long *attr)
{
int swap;
diff --git a/sys/dev/rnd.c b/sys/dev/rnd.c
index e2cf4dbe253..d30f240965a 100644
--- a/sys/dev/rnd.c
+++ b/sys/dev/rnd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rnd.c,v 1.56 2006/10/12 01:30:51 christos Exp $ */
+/* $NetBSD: rnd.c,v 1.57 2006/11/16 01:32:45 christos Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rnd.c,v 1.56 2006/10/12 01:30:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rnd.c,v 1.57 2006/11/16 01:32:45 christos Exp $");
#include <sys/param.h>
#include <sys/ioctl.h>
@@ -285,7 +285,7 @@ rnd_estimate_entropy(rndsource_t *rs, u_int32_t t)
* as another potential source of initial entropy.
*/
void
-rndattach(int num __unused)
+rndattach(int num)
{
u_int32_t c;
@@ -341,8 +341,8 @@ rnd_init(void)
}
int
-rndopen(dev_t dev, int flags __unused, int ifmt __unused,
- struct lwp *l __unused)
+rndopen(dev_t dev, int flags, int ifmt,
+ struct lwp *l)
{
if (rnd_ready == 0)
@@ -445,7 +445,7 @@ out:
}
int
-rndwrite(dev_t dev __unused, struct uio *uio, int ioflag __unused)
+rndwrite(dev_t dev, struct uio *uio, int ioflag)
{
u_int8_t *bf;
int n, ret, s;
@@ -482,7 +482,7 @@ rndwrite(dev_t dev __unused, struct uio *uio, int ioflag __unused)
}
int
-rndioctl(dev_t dev __unused, u_long cmd, caddr_t addr, int flag __unused,
+rndioctl(dev_t dev, u_long cmd, caddr_t addr, int flag,
struct lwp *l)
{
rndsource_element_t *rse;
@@ -708,7 +708,7 @@ filt_rnddetach(struct knote *kn)
}
static int
-filt_rndread(struct knote *kn, long hint __unused)
+filt_rndread(struct knote *kn, long hint)
{
uint32_t entcnt;
@@ -1005,7 +1005,7 @@ rnd_add_data(rndsource_element_t *rs, void *data, u_int32_t len,
* can possibly be running at a time, run at splsoftclock().
*/
static void
-rnd_timeout(void *arg __unused)
+rnd_timeout(void *arg)
{
rnd_sample_t *sample;
rndsource_t *source;
diff --git a/sys/dev/scsipi/atapiconf.c b/sys/dev/scsipi/atapiconf.c
index e78fb1099a7..8946dbf412e 100644
--- a/sys/dev/scsipi/atapiconf.c
+++ b/sys/dev/scsipi/atapiconf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: atapiconf.c,v 1.71 2006/10/12 01:31:57 christos Exp $ */
+/* $NetBSD: atapiconf.c,v 1.72 2006/11/16 01:33:26 christos Exp $ */
/*
* Copyright (c) 1996, 2001 Manuel Bouyer. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atapiconf.c,v 1.71 2006/10/12 01:31:57 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atapiconf.c,v 1.72 2006/11/16 01:33:26 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -107,7 +107,7 @@ static const struct scsi_quirk_inquiry_pattern atapi_quirk_patterns[] = {
};
int
-atapiprint(void *aux __unused, const char *pnp)
+atapiprint(void *aux, const char *pnp)
{
if (pnp)
aprint_normal("atapibus at %s", pnp);
@@ -115,7 +115,7 @@ atapiprint(void *aux __unused, const char *pnp)
}
static int
-atapibusmatch(struct device *parent __unused, struct cfdata *cf __unused,
+atapibusmatch(struct device *parent, struct cfdata *cf,
void *aux)
{
struct scsipi_channel *chan = aux;
@@ -131,7 +131,7 @@ atapibusmatch(struct device *parent __unused, struct cfdata *cf __unused,
static int
atapibussubmatch(struct device *parent, struct cfdata *cf,
- const int *ldesc __unused, void *aux)
+ const int *ldesc, void *aux)
{
struct scsipibus_attach_args *sa = aux;
struct scsipi_periph *periph = sa->sa_periph;
@@ -143,7 +143,7 @@ atapibussubmatch(struct device *parent, struct cfdata *cf,
}
static void
-atapibusattach(struct device *parent __unused, struct device *self, void *aux)
+atapibusattach(struct device *parent, struct device *self, void *aux)
{
struct atapibus_softc *sc = device_private(self);
struct scsipi_channel *chan = aux;
@@ -252,7 +252,7 @@ atapi_probe_bus(struct atapibus_softc *sc, int target)
}
void *
-atapi_probe_device(struct atapibus_softc *sc, int target __unused,
+atapi_probe_device(struct atapibus_softc *sc, int target,
struct scsipi_periph *periph, struct scsipibus_attach_args *sa)
{
struct scsipi_channel *chan = sc->sc_channel;
diff --git a/sys/dev/scsipi/cd.c b/sys/dev/scsipi/cd.c
index a0e7d7107d2..1498b889b42 100644
--- a/sys/dev/scsipi/cd.c
+++ b/sys/dev/scsipi/cd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cd.c,v 1.257 2006/11/14 14:56:55 reinoud Exp $ */
+/* $NetBSD: cd.c,v 1.258 2006/11/16 01:33:26 christos Exp $ */
/*-
* Copyright (c) 1998, 2001, 2003, 2004, 2005 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.257 2006/11/14 14:56:55 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.258 2006/11/16 01:33:26 christos Exp $");
#include "rnd.h"
@@ -217,7 +217,7 @@ static const struct scsipi_periphsw cd_switch = {
* A device suitable for this driver
*/
static int
-cdmatch(struct device *parent __unused, struct cfdata *match __unused,
+cdmatch(struct device *parent, struct cfdata *match,
void *aux)
{
struct scsipibus_attach_args *sa = aux;
@@ -231,7 +231,7 @@ cdmatch(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-cdattach(struct device *parent __unused, struct device *self, void *aux)
+cdattach(struct device *parent, struct device *self, void *aux)
{
struct cd_softc *cd = device_private(self);
struct scsipibus_attach_args *sa = aux;
@@ -282,7 +282,7 @@ cdattach(struct device *parent __unused, struct device *self, void *aux)
}
static int
-cdactivate(struct device *self __unused, enum devact act)
+cdactivate(struct device *self, enum devact act)
{
int rv = 0;
@@ -301,7 +301,7 @@ cdactivate(struct device *self __unused, enum devact act)
}
static int
-cddetach(struct device *self, int flags __unused)
+cddetach(struct device *self, int flags)
{
struct cd_softc *cd = device_private(self);
int s, bmaj, cmaj, i, mn;
@@ -355,7 +355,7 @@ cddetach(struct device *self, int flags __unused)
* open the device. Make sure the partition info is a up-to-date as can be.
*/
static int
-cdopen(dev_t dev, int flag __unused, int fmt, struct lwp *l __unused)
+cdopen(dev_t dev, int flag, int fmt, struct lwp *l)
{
struct cd_softc *cd;
struct scsipi_periph *periph;
@@ -517,7 +517,7 @@ bad4:
* occurence of an open device
*/
static int
-cdclose(dev_t dev, int flag __unused, int fmt, struct lwp *l __unused)
+cdclose(dev_t dev, int flag, int fmt, struct lwp *l)
{
struct cd_softc *cd = cd_cd.cd_devs[CDUNIT(dev)];
struct scsipi_periph *periph = cd->sc_periph;
@@ -1084,13 +1084,13 @@ cdminphys(struct buf *bp)
}
static int
-cdread(dev_t dev, struct uio *uio, int ioflag __unused)
+cdread(dev_t dev, struct uio *uio, int ioflag)
{
return (physio(cdstrategy, NULL, dev, B_READ, cdminphys, uio));
}
static int
-cdwrite(dev_t dev, struct uio *uio, int ioflag __unused)
+cdwrite(dev_t dev, struct uio *uio, int ioflag)
{
return (physio(cdstrategy, NULL, dev, B_WRITE, cdminphys, uio));
}
@@ -1794,7 +1794,7 @@ read_cd_capacity(struct scsipi_periph *periph, u_int *blksize, u_long *size)
* Find out from the device what it's capacity is
*/
static u_long
-cd_size(struct cd_softc *cd, int flags __unused)
+cd_size(struct cd_softc *cd, int flags)
{
u_int blksize;
u_long size;
@@ -1844,8 +1844,8 @@ cd_play(struct cd_softc *cd, int blkno, int nblks)
* Get scsi driver to send a "start playing" command
*/
static int
-cd_play_tracks(struct cd_softc *cd, int strack, int sindex __unused, int etrack,
- int eindex __unused)
+cd_play_tracks(struct cd_softc *cd, int strack, int sindex, int etrack,
+ int eindex)
{
struct cd_formatted_toc toc;
int error;
@@ -2015,7 +2015,7 @@ cd_get_parms(struct cd_softc *cd, int flags)
}
static int
-cdsize(dev_t dev __unused)
+cdsize(dev_t dev)
{
/* CD-ROMs are read-only. */
@@ -2023,8 +2023,8 @@ cdsize(dev_t dev __unused)
}
static int
-cddump(dev_t dev __unused, daddr_t blkno __unused, caddr_t va __unused,
- size_t size __unused)
+cddump(dev_t dev, daddr_t blkno, caddr_t va,
+ size_t size)
{
/* Not implemented. */
diff --git a/sys/dev/scsipi/ch.c b/sys/dev/scsipi/ch.c
index 61d706a731e..6849751a33d 100644
--- a/sys/dev/scsipi/ch.c
+++ b/sys/dev/scsipi/ch.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ch.c,v 1.75 2006/10/12 01:31:57 christos Exp $ */
+/* $NetBSD: ch.c,v 1.76 2006/11/16 01:33:26 christos Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999, 2004 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ch.c,v 1.75 2006/10/12 01:31:57 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ch.c,v 1.76 2006/11/16 01:33:26 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -180,7 +180,7 @@ static const struct chquirk chquirks[] = {
};
static int
-chmatch(struct device *parent __unused, struct cfdata *match __unused,
+chmatch(struct device *parent, struct cfdata *match,
void *aux)
{
struct scsipibus_attach_args *sa = aux;
@@ -194,7 +194,7 @@ chmatch(struct device *parent __unused, struct cfdata *match __unused,
}
static void
-chattach(struct device *parent __unused, struct device *self, void *aux)
+chattach(struct device *parent, struct device *self, void *aux)
{
struct ch_softc *sc = device_private(self);
struct scsipibus_attach_args *sa = aux;
@@ -254,7 +254,7 @@ chattach(struct device *parent __unused, struct device *self, void *aux)
}
static int
-chopen(dev_t dev, int flags __unused, int fmt __unused, struct lwp *l __unused)
+chopen(dev_t dev, int flags, int fmt, struct lwp *l)
{
struct ch_softc *sc;
struct scsipi_periph *periph;
@@ -307,7 +307,7 @@ chopen(dev_t dev, int flags __unused, int fmt __unused, struct lwp *l __unused)
}
static int
-chclose(dev_t dev, int flags __unused, int fmt __unused, struct lwp *l __unused)
+chclose(dev_t dev, int flags, int fmt, struct lwp *l)
{
struct ch_softc *sc = ch_cd.cd_devs[CHUNIT(dev)];
struct scsipi_periph *periph = sc->sc_periph;
@@ -324,7 +324,7 @@ chclose(dev_t dev, int flags __unused, int fmt __unused, struct lwp *l __unused)
}
static int
-chread(dev_t dev, struct uio *uio, int flags __unused)
+chread(dev_t dev, struct uio *uio, int flags)
{
struct ch_softc *sc = ch_cd.cd_devs[CHUNIT(dev)];
int error;
@@ -470,7 +470,7 @@ filt_chdetach(struct knote *kn)
}
static int
-filt_chread(struct knote *kn, long hint __unused)
+filt_chread(struct knote *kn, long hint)
{
struct ch_softc *sc = kn->kn_hook;
diff --git a/sys/dev/scsipi/scsi_base.c b/sys/dev/scsipi/scsi_base.c
index 9e80ff8e961..272f8350720 100644
--- a/sys/dev/scsipi/scsi_base.c
+++ b/sys/dev/scsipi/scsi_base.c
@@ -1,4 +1,4 @@
-/* $NetBSD: scsi_base.c,v 1.86 2006/10/12 01:31:57 christos Exp $ */
+/* $NetBSD: scsi_base.c,v 1.87 2006/11/16 01:33:26 christos Exp $ */
/*-
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsi_base.c,v 1.86 2006/10/12 01:31:57 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsi_base.c,v 1.87 2006/11/16 01:33:26 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -120,6 +120,6 @@ scsi_print_addr(struct scsipi_periph *periph)
* Must be called at splbio().
*/
void
-scsi_kill_pending(struct scsipi_periph *periph __unused)
+scsi_kill_pending(struct scsipi_periph *periph)
{
}
diff --git a/sys/dev/scsipi/scsiconf.c b/sys/dev/scsipi/scsiconf.c
index 66fd30a582f..f01902d8114 100644
--- a/sys/dev/scsipi/scsiconf.c
+++ b/sys/dev/scsipi/scsiconf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: scsiconf.c,v 1.239 2006/10/12 01:31:57 christos Exp $ */
+/* $NetBSD: scsiconf.c,v 1.240 2006/11/16 01:33:26 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2004 The NetBSD Foundation, Inc.
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsiconf.c,v 1.239 2006/10/12 01:31:57 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsiconf.c,v 1.240 2006/11/16 01:33:26 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -145,7 +145,7 @@ scsiprint(void *aux, const char *pnp)
}
static int
-scsibusmatch(struct device *parent __unused, struct cfdata *cf, void *aux)
+scsibusmatch(struct device *parent, struct cfdata *cf, void *aux)
{
struct scsipi_channel *chan = aux;
@@ -160,7 +160,7 @@ scsibusmatch(struct device *parent __unused, struct cfdata *cf, void *aux)
}
static void
-scsibusattach(struct device *parent __unused, struct device *self, void *aux)
+scsibusattach(struct device *parent, struct device *self, void *aux)
{
struct scsibus_softc *sc = device_private(self);
struct scsipi_channel *chan = aux;
@@ -381,7 +381,7 @@ scsi_probe_bus(struct scsibus_softc *sc, int target, int lun)
}
static int
-scsibusrescan(struct device *sc, const char *ifattr __unused,
+scsibusrescan(struct device *sc, const char *ifattr,
const int *locators)
{
@@ -968,8 +968,8 @@ bad:
/****** Entry points for user control of the SCSI bus. ******/
static int
-scsibusopen(dev_t dev, int flag __unused, int fmt __unused,
- struct lwp *l __unused)
+scsibusopen(dev_t dev, int flag, int fmt,
+ struct lwp *l)
{
struct scsibus_softc *sc;
int error, unit = minor(dev);
@@ -990,8 +990,8 @@ scsibusopen(dev_t dev, int flag __unused, int fmt __unused,
}
static int
-scsibusclose(dev_t dev, int flag __unused, int fmt __unused,
- struct lwp *l __unused)
+scsibusclose(dev_t dev, int flag, int fmt,
+ struct lwp *l)
{
struct scsibus_softc *sc = scsibus_cd.cd_devs[minor(dev)];
diff --git a/sys/dev/scsipi/scsipi_base.c b/sys/dev/scsipi/scsipi_base.c
index a7c4f23c904..6dbc6433c37 100644
--- a/sys/dev/scsipi/scsipi_base.c
+++ b/sys/dev/scsipi/scsipi_base.c
@@ -1,4 +1,4 @@
-/* $NetBSD: scsipi_base.c,v 1.140 2006/10/20 07:11:50 scw Exp $ */
+/* $NetBSD: scsipi_base.c,v 1.141 2006/11/16 01:33:26 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2002, 2003, 2004 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsipi_base.c,v 1.140 2006/10/20 07:11:50 scw Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsipi_base.c,v 1.141 2006/11/16 01:33:26 christos Exp $");
#include "opt_scsi.h"
@@ -196,7 +196,7 @@ scsipi_insert_periph(struct scsipi_channel *chan, struct scsipi_periph *periph)
* Remove a periph from the channel.
*/
void
-scsipi_remove_periph(struct scsipi_channel *chan __unused,
+scsipi_remove_periph(struct scsipi_channel *chan,
struct scsipi_periph *periph)
{
int s;
diff --git a/sys/dev/scsipi/scsipi_base.h b/sys/dev/scsipi/scsipi_base.h
index 88143d34dd1..ebc106fdacd 100644
--- a/sys/dev/scsipi/scsipi_base.h
+++ b/sys/dev/scsipi/scsipi_base.h
@@ -1,4 +1,4 @@
-/* $NetBSD: scsipi_base.h,v 1.20 2006/02/16 20:17:19 perry Exp $ */
+/* $NetBSD: scsipi_base.h,v 1.21 2006/11/16 01:33:26 christos Exp $ */
/*-
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -51,7 +51,7 @@ static __inline struct scsipi_xfer *scsipi_make_xs(struct scsipi_periph *,
* Make a scsipi_xfer, and return a pointer to it.
*/
-static __inline struct scsipi_xfer * __unused
+static __inline struct scsipi_xfer *
scsipi_make_xs(struct scsipi_periph *periph, struct scsipi_generic *cmd,
int cmdlen, u_char *data_addr, int datalen, int retries, int timeout,
struct buf *bp, int flags)
diff --git a/sys/dev/scsipi/scsipiconf.h b/sys/dev/scsipi/scsipiconf.h
index 4fc7ec8792f..b4103533c94 100644
--- a/sys/dev/scsipi/scsipiconf.h
+++ b/sys/dev/scsipi/scsipiconf.h
@@ -1,4 +1,4 @@
-/* $NetBSD: scsipiconf.h,v 1.106 2006/10/30 16:15:56 skrll Exp $ */
+/* $NetBSD: scsipiconf.h,v 1.107 2006/11/16 01:33:26 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2004 The NetBSD Foundation, Inc.
@@ -701,7 +701,7 @@ void show_scsipi_cmd(struct scsipi_xfer *);
void show_mem(u_char *, int);
#endif /* _KERNEL */
-static __inline void __unused
+static __inline void
_lto2b(u_int32_t val, u_int8_t *bytes)
{
@@ -709,7 +709,7 @@ _lto2b(u_int32_t val, u_int8_t *bytes)
bytes[1] = val & 0xff;
}
-static __inline void __unused
+static __inline void
_lto3b(u_int32_t val, u_int8_t *bytes)
{
@@ -718,7 +718,7 @@ _lto3b(u_int32_t val, u_int8_t *bytes)
bytes[2] = val & 0xff;
}
-static __inline void __unused
+static __inline void
_lto4b(u_int32_t val, u_int8_t *bytes)
{
@@ -728,7 +728,7 @@ _lto4b(u_int32_t val, u_int8_t *bytes)
bytes[3] = val & 0xff;
}
-static __inline void __unused
+static __inline void
_lto8b(u_int64_t val, u_int8_t *bytes)
{
@@ -742,7 +742,7 @@ _lto8b(u_int64_t val, u_int8_t *bytes)
bytes[7] = val & 0xff;
}
-static __inline u_int32_t __unused
+static __inline u_int32_t
_2btol(const u_int8_t *bytes)
{
u_int32_t rv;
@@ -752,7 +752,7 @@ _2btol(const u_int8_t *bytes)
return (rv);
}
-static __inline u_int32_t __unused
+static __inline u_int32_t
_3btol(const u_int8_t *bytes)
{
u_int32_t rv;
@@ -763,7 +763,7 @@ _3btol(const u_int8_t *bytes)
return (rv);
}
-static __inline u_int32_t __unused
+static __inline u_int32_t
_4btol(const u_int8_t *bytes)
{
u_int32_t rv;
@@ -775,7 +775,7 @@ _4btol(const u_int8_t *bytes)
return (rv);
}
-static __inline u_int64_t __unused
+static __inline u_int64_t
_5btol(const u_int8_t *bytes)
{
u_int64_t rv;
@@ -788,7 +788,7 @@ _5btol(const u_int8_t *bytes)
return (rv);
}
-static __inline u_int64_t __unused
+static __inline u_int64_t
_8btol(const u_int8_t *bytes)
{
u_int64_t rv;
@@ -804,7 +804,7 @@ _8btol(const u_int8_t *bytes)
return (rv);
}
-static __inline void __unused
+static __inline void
_lto2l(u_int32_t val, u_int8_t *bytes)
{
@@ -812,7 +812,7 @@ _lto2l(u_int32_t val, u_int8_t *bytes)
bytes[1] = (val >> 8) & 0xff;
}
-static __inline void __unused
+static __inline void
_lto3l(u_int32_t val, u_int8_t *bytes)
{
@@ -821,7 +821,7 @@ _lto3l(u_int32_t val, u_int8_t *bytes)
bytes[2] = (val >> 16) & 0xff;
}
-static __inline void __unused
+static __inline void
_lto4l(u_int32_t val, u_int8_t *bytes)
{
@@ -831,7 +831,7 @@ _lto4l(u_int32_t val, u_int8_t *bytes)
bytes[3] = (val >> 24) & 0xff;
}
-static __inline u_int32_t __unused
+static __inline u_int32_t
_2ltol(const u_int8_t *bytes)
{
u_int32_t rv;
@@ -841,7 +841,7 @@ _2ltol(const u_int8_t *bytes)
return (rv);
}
-static __inline u_int32_t __unused
+static __inline u_int32_t
_3ltol(const u_int8_t *bytes)
{
u_int32_t rv;
@@ -852,7 +852,7 @@ _3ltol(const u_int8_t *bytes)
return (rv);
}
-static __inline u_int32_t __unused
+static __inline u_int32_t
_4ltol(const u_int8_t *bytes)
{
u_int32_t rv;
diff --git a/sys/dev/scsipi/sd.c b/sys/dev/scsipi/sd.c
index 5b41db63a99..d9420da619c 100644
--- a/sys/dev/scsipi/sd.c
+++ b/sys/dev/scsipi/sd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sd.c,v 1.253 2006/10/20 07:11:50 scw Exp $ */
+/* $NetBSD: sd.c,v 1.254 2006/11/16 01:33:26 christos Exp $ */
/*-
* Copyright (c) 1998, 2003, 2004 The NetBSD Foundation, Inc.
@@ -54,7 +54,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.253 2006/10/20 07:11:50 scw Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.254 2006/11/16 01:33:26 christos Exp $");
#include "opt_scsi.h"
#include "rnd.h"
@@ -194,7 +194,7 @@ struct sd_mode_sense_data {
* A device suitable for this driver
*/
static int
-sdmatch(struct device *parent __unused, struct cfdata *match __unused,
+sdmatch(struct device *parent, struct cfdata *match,
void *aux)
{
struct scsipibus_attach_args *sa = aux;
@@ -211,7 +211,7 @@ sdmatch(struct device *parent __unused, struct cfdata *match __unused,
* Attach routine common to atapi & scsi.
*/
static void
-sdattach(struct device *parent __unused, struct device *self, void *aux)
+sdattach(struct device *parent, struct device *self, void *aux)
{
struct sd_softc *sd = device_private(self);
struct scsipibus_attach_args *sa = aux;
@@ -325,7 +325,7 @@ sdattach(struct device *parent __unused, struct device *self, void *aux)
}
static int
-sdactivate(struct device *self __unused, enum devact act)
+sdactivate(struct device *self, enum devact act)
{
int rv = 0;
@@ -344,7 +344,7 @@ sdactivate(struct device *self __unused, enum devact act)
}
static int
-sddetach(struct device *self, int flags __unused)
+sddetach(struct device *self, int flags)
{
struct sd_softc *sd = device_private(self);
int s, bmaj, cmaj, i, mn;
@@ -396,7 +396,7 @@ sddetach(struct device *self, int flags __unused)
* open the device. Make sure the partition info is a up-to-date as can be.
*/
static int
-sdopen(dev_t dev, int flag __unused, int fmt, struct lwp *l __unused)
+sdopen(dev_t dev, int flag, int fmt, struct lwp *l)
{
struct sd_softc *sd;
struct scsipi_periph *periph;
@@ -585,7 +585,7 @@ sdopen(dev_t dev, int flag __unused, int fmt, struct lwp *l __unused)
* device. Convenient now but usually a pain.
*/
static int
-sdclose(dev_t dev, int flag __unused, int fmt, struct lwp *l __unused)
+sdclose(dev_t dev, int flag, int fmt, struct lwp *l)
{
struct sd_softc *sd = sd_cd.cd_devs[SDUNIT(dev)];
struct scsipi_periph *periph = sd->sc_periph;
@@ -982,14 +982,14 @@ sdminphys(struct buf *bp)
}
static int
-sdread(dev_t dev, struct uio *uio, int ioflag __unused)
+sdread(dev_t dev, struct uio *uio, int ioflag)
{
return (physio(sdstrategy, NULL, dev, B_READ, sdminphys, uio));
}
static int
-sdwrite(dev_t dev, struct uio *uio, int ioflag __unused)
+sdwrite(dev_t dev, struct uio *uio, int ioflag)
{
return (physio(sdstrategy, NULL, dev, B_WRITE, sdminphys, uio));
diff --git a/sys/dev/scsipi/ses.c b/sys/dev/scsipi/ses.c
index ac67a77185c..1faa867d6ab 100644
--- a/sys/dev/scsipi/ses.c
+++ b/sys/dev/scsipi/ses.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ses.c,v 1.36 2006/10/12 01:31:57 christos Exp $ */
+/* $NetBSD: ses.c,v 1.37 2006/11/16 01:33:26 christos Exp $ */
/*
* Copyright (C) 2000 National Aeronautics & Space Administration
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ses.c,v 1.36 2006/10/12 01:31:57 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ses.c,v 1.37 2006/11/16 01:33:26 christos Exp $");
#include "opt_scsi.h"
@@ -184,7 +184,7 @@ static const struct scsipi_periphsw ses_switch = {
};
static int
-ses_match(struct device *parent __unused, struct cfdata *match __unused,
+ses_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct scsipibus_attach_args *sa = aux;
@@ -213,7 +213,7 @@ ses_match(struct device *parent __unused, struct cfdata *match __unused,
* the softc available to set stuff in.
*/
static void
-ses_attach(struct device *parent __unused, struct device *self, void *aux)
+ses_attach(struct device *parent, struct device *self, void *aux)
{
const char *tname;
struct ses_softc *softc = device_private(self);
@@ -290,7 +290,7 @@ ses_device_type(struct scsipibus_attach_args *sa)
}
static int
-sesopen(dev_t dev, int flags __unused, int fmt __unused, struct lwp *l __unused)
+sesopen(dev_t dev, int flags, int fmt, struct lwp *l)
{
struct ses_softc *softc;
int error, unit;
@@ -334,8 +334,8 @@ out:
}
static int
-sesclose(dev_t dev, int flags __unused, int fmt __unused,
- struct lwp *l __unused)
+sesclose(dev_t dev, int flags, int fmt,
+ struct lwp *l)
{
struct ses_softc *softc;
int unit;
@@ -816,7 +816,7 @@ ses_softc_init(ses_softc_t *ssc, int doinit)
}
static int
-ses_init_enc(ses_softc_t *ssc __unused)
+ses_init_enc(ses_softc_t *ssc)
{
return (0);
}
@@ -1040,7 +1040,7 @@ ses_getconfig(ses_softc_t *ssc)
}
static int
-ses_getputstat(ses_softc_t *ssc, int objid, SesComStat *sp, int slp __unused,
+ses_getputstat(ses_softc_t *ssc, int objid, SesComStat *sp, int slp,
int in)
{
struct sscfg *cc;
@@ -1805,7 +1805,7 @@ safte_getconfig(ses_softc_t *ssc)
}
static int
-safte_rdstat(ses_softc_t *ssc, int slpflg __unused)
+safte_rdstat(ses_softc_t *ssc, int slpflg)
{
int err, oid, r, i, hiwater, nitems, amt;
uint16_t tempflags;
@@ -2276,7 +2276,7 @@ set_objstat_sel(ses_softc_t *ssc, ses_objstat *obp, int slp)
*/
static int
wrbuf16(ses_softc_t *ssc, uint8_t op, uint8_t b1, uint8_t b2,
- uint8_t b3, int slp __unused)
+ uint8_t b3, int slp)
{
int err, amt;
char *sdata;
@@ -2310,7 +2310,7 @@ wrbuf16(ses_softc_t *ssc, uint8_t op, uint8_t b1, uint8_t b2,
* returning an error.
*/
static void
-wrslot_stat(ses_softc_t *ssc, int slp __unused)
+wrslot_stat(ses_softc_t *ssc, int slp)
{
int i, amt;
encobj *ep;
@@ -2352,7 +2352,7 @@ wrslot_stat(ses_softc_t *ssc, int slp __unused)
* This function issues the "PERFORM SLOT OPERATION" command.
*/
static int
-perf_slotop(ses_softc_t *ssc, uint8_t slot, uint8_t opflag, int slp __unused)
+perf_slotop(ses_softc_t *ssc, uint8_t slot, uint8_t opflag, int slp)
{
int err, amt;
char *sdata;
diff --git a/sys/dev/scsipi/ss.c b/sys/dev/scsipi/ss.c
index 58ee66aeaea..d676b22f2a4 100644
--- a/sys/dev/scsipi/ss.c
+++ b/sys/dev/scsipi/ss.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ss.c,v 1.68 2006/10/12 01:31:57 christos Exp $ */
+/* $NetBSD: ss.c,v 1.69 2006/11/16 01:33:26 christos Exp $ */
/*
* Copyright (c) 1995 Kenneth Stailey. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ss.c,v 1.68 2006/10/12 01:31:57 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ss.c,v 1.69 2006/11/16 01:33:26 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -123,7 +123,7 @@ static const struct scsipi_inquiry_pattern ss_patterns[] = {
};
static int
-ssmatch(struct device *parent __unused, struct cfdata *match __unused,
+ssmatch(struct device *parent, struct cfdata *match,
void *aux)
{
struct scsipibus_attach_args *sa = aux;
@@ -142,7 +142,7 @@ ssmatch(struct device *parent __unused, struct cfdata *match __unused,
* special handlers into the ss_softc structure
*/
static void
-ssattach(struct device *parent __unused, struct device *self, void *aux)
+ssattach(struct device *parent, struct device *self, void *aux)
{
struct ss_softc *ss = device_private(self);
struct scsipibus_attach_args *sa = aux;
@@ -186,7 +186,7 @@ ssattach(struct device *parent __unused, struct device *self, void *aux)
}
static int
-ssdetach(struct device *self, int flags __unused)
+ssdetach(struct device *self, int flags)
{
struct ss_softc *ss = device_private(self);
int s, cmaj, mn;
@@ -217,7 +217,7 @@ ssdetach(struct device *self, int flags __unused)
}
static int
-ssactivate(struct device *self __unused, enum devact act)
+ssactivate(struct device *self, enum devact act)
{
int rv = 0;
@@ -239,7 +239,7 @@ ssactivate(struct device *self __unused, enum devact act)
* open the device.
*/
static int
-ssopen(dev_t dev, int flag __unused, int mode __unused, struct lwp *l __unused)
+ssopen(dev_t dev, int flag, int mode, struct lwp *l)
{
int unit;
u_int ssmode;
@@ -311,7 +311,7 @@ bad:
* occurence of an open device
*/
static int
-ssclose(dev_t dev, int flag __unused, int mode __unused, struct lwp *l __unused)
+ssclose(dev_t dev, int flag, int mode, struct lwp *l)
{
struct ss_softc *ss = ss_cd.cd_devs[SSUNIT(dev)];
struct scsipi_periph *periph = ss->sc_periph;
@@ -371,7 +371,7 @@ ssminphys(struct buf *bp)
* via physio for the actual transfer.
*/
static int
-ssread(dev_t dev, struct uio *uio, int flag __unused)
+ssread(dev_t dev, struct uio *uio, int flag)
{
struct ss_softc *ss = ss_cd.cd_devs[SSUNIT(dev)];
int error;
diff --git a/sys/dev/scsipi/ss_mustek.c b/sys/dev/scsipi/ss_mustek.c
index 5cbdeee6376..d637585b3ae 100644
--- a/sys/dev/scsipi/ss_mustek.c
+++ b/sys/dev/scsipi/ss_mustek.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ss_mustek.c,v 1.34 2006/10/12 01:31:58 christos Exp $ */
+/* $NetBSD: ss_mustek.c,v 1.35 2006/11/16 01:33:26 christos Exp $ */
/*
* Copyright (c) 1995 Joachim Koenig-Baltes. All rights reserved.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ss_mustek.c,v 1.34 2006/10/12 01:31:58 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ss_mustek.c,v 1.35 2006/11/16 01:33:26 christos Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -148,7 +148,7 @@ mustek_attach(struct ss_softc *ss, struct scsipibus_attach_args *sa)
}
static int
-mustek_get_params (struct ss_softc *ss __unused)
+mustek_get_params (struct ss_softc *ss)
{
return (0);
diff --git a/sys/dev/scsipi/ss_scanjet.c b/sys/dev/scsipi/ss_scanjet.c
index 720b4297f11..762f3cc44a9 100644
--- a/sys/dev/scsipi/ss_scanjet.c
+++ b/sys/dev/scsipi/ss_scanjet.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ss_scanjet.c,v 1.46 2006/10/12 01:31:58 christos Exp $ */
+/* $NetBSD: ss_scanjet.c,v 1.47 2006/11/16 01:33:26 christos Exp $ */
/*
* Copyright (c) 1995 Kenneth Stailey. All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ss_scanjet.c,v 1.46 2006/10/12 01:31:58 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ss_scanjet.c,v 1.47 2006/11/16 01:33:26 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -156,7 +156,7 @@ scanjet_attach(struct ss_softc *ss, struct scsipibus_attach_args *sa)
}
static int
-scanjet_get_params(struct ss_softc *ss __unused)
+scanjet_get_params(struct ss_softc *ss)
{
return (0);
diff --git a/sys/dev/scsipi/st.c b/sys/dev/scsipi/st.c
index 13abf3fc073..21005000b26 100644
--- a/sys/dev/scsipi/st.c
+++ b/sys/dev/scsipi/st.c
@@ -1,4 +1,4 @@
-/* $NetBSD: st.c,v 1.193 2006/10/12 01:31:58 christos Exp $ */
+/* $NetBSD: st.c,v 1.194 2006/11/16 01:33:26 christos Exp $ */
/*-
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: st.c,v 1.193 2006/10/12 01:31:58 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: st.c,v 1.194 2006/11/16 01:33:26 christos Exp $");
#include "opt_scsi.h"
@@ -421,7 +421,7 @@ stattach(struct device *parent, struct st_softc *st, void *aux)
}
int
-stactivate(struct device *self __unused, enum devact act)
+stactivate(struct device *self, enum devact act)
{
int rv = 0;
@@ -440,7 +440,7 @@ stactivate(struct device *self __unused, enum devact act)
}
int
-stdetach(struct device *self, int flags __unused)
+stdetach(struct device *self, int flags)
{
struct st_softc *st = device_private(self);
int s, bmaj, cmaj, mn;
@@ -539,7 +539,7 @@ st_loadquirks(struct st_softc *st)
* open the device.
*/
static int
-stopen(dev_t dev, int flags, int mode __unused, struct lwp *l __unused)
+stopen(dev_t dev, int flags, int mode, struct lwp *l)
{
u_int stmode, dsty;
int error, sflags, unit, tries, ntries;
@@ -726,7 +726,7 @@ bad:
* occurence of an open device
*/
static int
-stclose(dev_t dev, int flags, int mode __unused, struct lwp *l __unused)
+stclose(dev_t dev, int flags, int mode, struct lwp *l)
{
int stxx, error = 0;
struct st_softc *st = st_cd.cd_devs[STUNIT(dev)];
@@ -821,7 +821,7 @@ stclose(dev_t dev, int flags, int mode __unused, struct lwp *l __unused)
* and try guess any that seem to be defaulted.
*/
static int
-st_mount_tape(dev_t dev, int flags __unused)
+st_mount_tape(dev_t dev, int flags)
{
int unit;
u_int dsty;
@@ -1368,7 +1368,7 @@ stdone(struct scsipi_xfer *xs, int error)
}
static int
-stread(dev_t dev, struct uio *uio, int iomode __unused)
+stread(dev_t dev, struct uio *uio, int iomode)
{
struct st_softc *st = st_cd.cd_devs[STUNIT(dev)];
@@ -1377,7 +1377,7 @@ stread(dev_t dev, struct uio *uio, int iomode __unused)
}
static int
-stwrite(dev_t dev, struct uio *uio, int iomode __unused)
+stwrite(dev_t dev, struct uio *uio, int iomode)
{
struct st_softc *st = st_cd.cd_devs[STUNIT(dev)];
@@ -2398,8 +2398,8 @@ bad: free(bf, M_TEMP);
}
static int
-stdump(dev_t dev __unused, daddr_t blkno __unused, caddr_t va __unused,
- size_t size __unused)
+stdump(dev_t dev, daddr_t blkno, caddr_t va,
+ size_t size)
{
/* Not implemented. */
diff --git a/sys/dev/scsipi/st_atapi.c b/sys/dev/scsipi/st_atapi.c
index 59d03100e11..a74fd7f52c5 100644
--- a/sys/dev/scsipi/st_atapi.c
+++ b/sys/dev/scsipi/st_atapi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: st_atapi.c,v 1.19 2006/10/12 01:31:58 christos Exp $ */
+/* $NetBSD: st_atapi.c,v 1.20 2006/11/16 01:33:26 christos Exp $ */
/*
* Copyright (c) 2001 Manuel Bouyer.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: st_atapi.c,v 1.19 2006/10/12 01:31:58 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: st_atapi.c,v 1.20 2006/11/16 01:33:26 christos Exp $");
#include "opt_scsi.h"
#include "rnd.h"
@@ -62,7 +62,7 @@ static const struct scsipi_inquiry_pattern st_atapibus_patterns[] = {
};
static int
-st_atapibus_match(struct device *parent __unused, struct cfdata *match __unused,
+st_atapibus_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct scsipibus_attach_args *sa = aux;
@@ -178,7 +178,7 @@ st_atapibus_mode_sense(struct st_softc *st, int flags)
}
static int
-st_atapibus_mode_select(struct st_softc *st __unused, int flags __unused)
+st_atapibus_mode_select(struct st_softc *st, int flags)
{
return ENODEV; /* for now ... */
}
diff --git a/sys/dev/scsipi/st_scsi.c b/sys/dev/scsipi/st_scsi.c
index fbfe96bd358..4580920f365 100644
--- a/sys/dev/scsipi/st_scsi.c
+++ b/sys/dev/scsipi/st_scsi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: st_scsi.c,v 1.25 2006/10/12 01:31:58 christos Exp $ */
+/* $NetBSD: st_scsi.c,v 1.26 2006/11/16 01:33:26 christos Exp $ */
/*-
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: st_scsi.c,v 1.25 2006/10/12 01:31:58 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: st_scsi.c,v 1.26 2006/11/16 01:33:26 christos Exp $");
#include "opt_scsi.h"
#include "rnd.h"
@@ -91,7 +91,7 @@ static const struct scsipi_inquiry_pattern st_scsibus_patterns[] = {
};
static int
-st_scsibus_match(struct device *parent __unused, struct cfdata *match __unused,
+st_scsibus_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct scsipibus_attach_args *sa = aux;
diff --git a/sys/dev/scsipi/uk.c b/sys/dev/scsipi/uk.c
index 52dd072ce12..28f61295ff1 100644
--- a/sys/dev/scsipi/uk.c
+++ b/sys/dev/scsipi/uk.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uk.c,v 1.50 2006/10/12 01:31:58 christos Exp $ */
+/* $NetBSD: uk.c,v 1.51 2006/11/16 01:33:26 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uk.c,v 1.50 2006/10/12 01:31:58 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uk.c,v 1.51 2006/11/16 01:33:26 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -86,8 +86,8 @@ const struct cdevsw uk_cdevsw = {
};
static int
-ukmatch(struct device *parent __unused, struct cfdata *match __unused,
- void *aux __unused)
+ukmatch(struct device *parent, struct cfdata *match,
+ void *aux)
{
return (1);
@@ -98,7 +98,7 @@ ukmatch(struct device *parent __unused, struct cfdata *match __unused,
* a device suitable for this driver.
*/
static void
-ukattach(struct device *parent __unused, struct device *self, void *aux)
+ukattach(struct device *parent, struct device *self, void *aux)
{
struct uk_softc *uk = device_private(self);
struct scsipibus_attach_args *sa = aux;
@@ -116,7 +116,7 @@ ukattach(struct device *parent __unused, struct device *self, void *aux)
}
static int
-ukactivate(struct device *self __unused, enum devact act)
+ukactivate(struct device *self, enum devact act)
{
int rv = 0;
@@ -135,7 +135,7 @@ ukactivate(struct device *self __unused, enum devact act)
}
static int
-ukdetach(struct device *self, int flags __unused)
+ukdetach(struct device *self, int flags)
{
/*struct uk_softc *uk = device_private(self);*/
int cmaj, mn;
@@ -154,7 +154,7 @@ ukdetach(struct device *self, int flags __unused)
* open the device.
*/
static int
-ukopen(dev_t dev, int flag __unused, int fmt __unused, struct lwp *l __unused)
+ukopen(dev_t dev, int flag, int fmt, struct lwp *l)
{
int unit, error;
struct uk_softc *uk;
@@ -196,7 +196,7 @@ ukopen(dev_t dev, int flag __unused, int fmt __unused, struct lwp *l __unused)
* occurence of an open device
*/
static int
-ukclose(dev_t dev, int flag __unused, int fmt __unused, struct lwp *l __unused)
+ukclose(dev_t dev, int flag, int fmt, struct lwp *l)
{
struct uk_softc *uk = uk_cd.cd_devs[UKUNIT(dev)];
struct scsipi_periph *periph = uk->sc_periph;
diff --git a/sys/dev/sequencer.c b/sys/dev/sequencer.c
index eb68d50de40..f627a4fb33f 100644
--- a/sys/dev/sequencer.c
+++ b/sys/dev/sequencer.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sequencer.c,v 1.36 2006/10/22 12:52:46 pooka Exp $ */
+/* $NetBSD: sequencer.c,v 1.37 2006/11/16 01:32:45 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sequencer.c,v 1.36 2006/10/22 12:52:46 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sequencer.c,v 1.37 2006/11/16 01:32:45 christos Exp $");
#include "sequencer.h"
@@ -148,7 +148,7 @@ sequencerattach(int n)
}
static int
-sequenceropen(dev_t dev, int flags, int ifmt __unused, struct lwp *l __unused)
+sequenceropen(dev_t dev, int flags, int ifmt, struct lwp *l)
{
int unit = SEQUENCERUNIT(dev);
struct sequencer_softc *sc;
@@ -284,8 +284,8 @@ seq_startoutput(struct sequencer_softc *sc)
}
static int
-sequencerclose(dev_t dev, int flags __unused, int ifmt __unused,
- struct lwp *l __unused)
+sequencerclose(dev_t dev, int flags, int ifmt,
+ struct lwp *l)
{
struct sequencer_softc *sc = &seqdevs[SEQUENCERUNIT(dev)];
int n, s;
@@ -436,7 +436,7 @@ sequencerwrite(dev_t dev, struct uio *uio, int ioflag)
}
static int
-sequencerioctl(dev_t dev, u_long cmd, caddr_t addr, int flag __unused,
+sequencerioctl(dev_t dev, u_long cmd, caddr_t addr, int flag,
struct lwp *l)
{
struct sequencer_softc *sc = &seqdevs[SEQUENCERUNIT(dev)];
@@ -642,7 +642,7 @@ filt_sequencerrdetach(struct knote *kn)
}
static int
-filt_sequencerread(struct knote *kn, long hint __unused)
+filt_sequencerread(struct knote *kn, long hint)
{
struct sequencer_softc *sc = kn->kn_hook;
@@ -669,7 +669,7 @@ filt_sequencerwdetach(struct knote *kn)
}
static int
-filt_sequencerwrite(struct knote *kn, long hint __unused)
+filt_sequencerwrite(struct knote *kn, long hint)
{
struct sequencer_softc *sc = kn->kn_hook;
@@ -838,7 +838,7 @@ seq_do_chncommon(struct sequencer_softc *sc, seq_event_t *b)
}
static int
-seq_do_local(struct sequencer_softc *sc __unused, seq_event_t *b __unused)
+seq_do_local(struct sequencer_softc *sc, seq_event_t *b)
{
return (EINVAL);
}
@@ -1095,7 +1095,7 @@ seq_to_new(seq_event_t *ev, struct uio *uio)
/**********************************************/
void
-midiseq_in(struct midi_dev *md, u_char *msg, int len __unused)
+midiseq_in(struct midi_dev *md, u_char *msg, int len)
{
int unit = md->unit;
seq_event_t ev;
@@ -1186,14 +1186,14 @@ midiseq_close(struct midi_dev *md)
}
static void
-midiseq_reset(struct midi_dev *md __unused)
+midiseq_reset(struct midi_dev *md)
{
/* XXX send GM reset? */
DPRINTFN(3, ("midiseq_reset: %d\n", md->unit));
}
static int
-midiseq_out(struct midi_dev *md, u_char *bf, u_int cc, int chk __unused)
+midiseq_out(struct midi_dev *md, u_char *bf, u_int cc, int chk)
{
DPRINTFN(5, ("midiseq_out: m=%p, unit=%d, bf[0]=0x%02x, cc=%d\n",
md->msc, md->unit, bf[0], cc));
diff --git a/sys/dev/sysmon/sysmon.c b/sys/dev/sysmon/sysmon.c
index 5363573f445..84fd0166632 100644
--- a/sys/dev/sysmon/sysmon.c
+++ b/sys/dev/sysmon/sysmon.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon.c,v 1.13 2006/10/12 01:31:59 christos Exp $ */
+/* $NetBSD: sysmon.c,v 1.14 2006/11/16 01:33:26 christos Exp $ */
/*-
* Copyright (c) 2000 Zembu Labs, Inc.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon.c,v 1.13 2006/10/12 01:31:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon.c,v 1.14 2006/11/16 01:33:26 christos Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -171,7 +171,7 @@ sysmonioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
* Perform a read request.
*/
int
-sysmonread(dev_t dev, struct uio *uio __unused, int flags __unused)
+sysmonread(dev_t dev, struct uio *uio, int flags)
{
int error;
@@ -194,7 +194,7 @@ sysmonread(dev_t dev, struct uio *uio __unused, int flags __unused)
* Poll the system monitor device.
*/
int
-sysmonpoll(dev_t dev, int events, struct lwp *l __unused)
+sysmonpoll(dev_t dev, int events, struct lwp *l)
{
int rv;
@@ -217,7 +217,7 @@ sysmonpoll(dev_t dev, int events, struct lwp *l __unused)
* Kqueue filter for the system monitor device.
*/
int
-sysmonkqfilter(dev_t dev, struct knote *kn __unused)
+sysmonkqfilter(dev_t dev, struct knote *kn)
{
int error;
diff --git a/sys/dev/sysmon/sysmon_envsys.c b/sys/dev/sysmon/sysmon_envsys.c
index 894235e9a35..f12d2f3a8c2 100644
--- a/sys/dev/sysmon/sysmon_envsys.c
+++ b/sys/dev/sysmon/sysmon_envsys.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_envsys.c,v 1.12 2006/10/12 01:31:59 christos Exp $ */
+/* $NetBSD: sysmon_envsys.c,v 1.13 2006/11/16 01:33:26 christos Exp $ */
/*-
* Copyright (c) 2000 Zembu Labs, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys.c,v 1.12 2006/10/12 01:31:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys.c,v 1.13 2006/11/16 01:33:26 christos Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -84,8 +84,8 @@ void sysmon_envsys_release(struct sysmon_envsys *);
* Open the system monitor device.
*/
int
-sysmonopen_envsys(dev_t dev __unused, int flag __unused, int mode __unused,
- struct lwp *l __unused)
+sysmonopen_envsys(dev_t dev, int flag, int mode,
+ struct lwp *l)
{
simple_lock(&sysmon_envsys_initialized_slock);
if (sysmon_envsys_initialized == 0) {
@@ -103,8 +103,8 @@ sysmonopen_envsys(dev_t dev __unused, int flag __unused, int mode __unused,
* Close the system monitor device.
*/
int
-sysmonclose_envsys(dev_t dev __unused, int flag __unused, int mode __unused,
- struct lwp *l __unused)
+sysmonclose_envsys(dev_t dev, int flag, int mode,
+ struct lwp *l)
{
/* Nothing to do */
@@ -117,8 +117,8 @@ sysmonclose_envsys(dev_t dev __unused, int flag __unused, int mode __unused,
* Perform an envsys control request.
*/
int
-sysmonioctl_envsys(dev_t dev __unused, u_long cmd, caddr_t data,
- int flag __unused, struct lwp *l __unused)
+sysmonioctl_envsys(dev_t dev, u_long cmd, caddr_t data,
+ int flag, struct lwp *l)
{
struct sysmon_envsys *sme;
int error = 0;
diff --git a/sys/dev/sysmon/sysmon_power.c b/sys/dev/sysmon/sysmon_power.c
index 826f7f96588..cd11d095a4e 100644
--- a/sys/dev/sysmon/sysmon_power.c
+++ b/sys/dev/sysmon/sysmon_power.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_power.c,v 1.13 2006/10/12 01:31:59 christos Exp $ */
+/* $NetBSD: sysmon_power.c,v 1.14 2006/11/16 01:33:26 christos Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon_power.c,v 1.13 2006/10/12 01:31:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_power.c,v 1.14 2006/11/16 01:33:26 christos Exp $");
#include <sys/param.h>
#include <sys/reboot.h>
@@ -146,7 +146,7 @@ sysmon_power_event_queue_flush(void)
* Open the system monitor device.
*/
int
-sysmonopen_power(dev_t dev __unused, int flag __unused, int mode __unused,
+sysmonopen_power(dev_t dev, int flag, int mode,
struct lwp *l)
{
int error = 0;
@@ -169,8 +169,8 @@ sysmonopen_power(dev_t dev __unused, int flag __unused, int mode __unused,
* Close the system monitor device.
*/
int
-sysmonclose_power(dev_t dev __unused, int flag __unused, int mode __unused,
- struct lwp *l __unused)
+sysmonclose_power(dev_t dev, int flag, int mode,
+ struct lwp *l)
{
int count;
@@ -193,7 +193,7 @@ sysmonclose_power(dev_t dev __unused, int flag __unused, int mode __unused,
* Read the system monitor device.
*/
int
-sysmonread_power(dev_t dev __unused, struct uio *uio, int flags)
+sysmonread_power(dev_t dev, struct uio *uio, int flags)
{
power_event_t pev;
int error;
@@ -230,7 +230,7 @@ sysmonread_power(dev_t dev __unused, struct uio *uio, int flags)
* Poll the system monitor device.
*/
int
-sysmonpoll_power(dev_t dev __unused, int events, struct lwp *l)
+sysmonpoll_power(dev_t dev, int events, struct lwp *l)
{
int revents;
@@ -261,7 +261,7 @@ filt_sysmon_power_rdetach(struct knote *kn)
}
static int
-filt_sysmon_power_read(struct knote *kn, long hint __unused)
+filt_sysmon_power_read(struct knote *kn, long hint)
{
simple_lock(&sysmon_power_event_queue_slock);
@@ -283,7 +283,7 @@ static const struct filterops sysmon_power_write_filtops =
* Kqueue filter for the system monitor device.
*/
int
-sysmonkqfilter_power(dev_t dev __unused, struct knote *kn)
+sysmonkqfilter_power(dev_t dev, struct knote *kn)
{
struct klist *klist;
@@ -315,8 +315,8 @@ sysmonkqfilter_power(dev_t dev __unused, struct knote *kn)
* Perform a power managmenet control request.
*/
int
-sysmonioctl_power(dev_t dev __unused, u_long cmd, caddr_t data,
- int flag __unused, struct lwp *l __unused)
+sysmonioctl_power(dev_t dev, u_long cmd, caddr_t data,
+ int flag, struct lwp *l)
{
int error = 0;
diff --git a/sys/dev/sysmon/sysmon_taskq.c b/sys/dev/sysmon/sysmon_taskq.c
index d95f5d45f04..98fb3d4e5a5 100644
--- a/sys/dev/sysmon/sysmon_taskq.c
+++ b/sys/dev/sysmon/sysmon_taskq.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_taskq.c,v 1.6 2006/10/12 01:31:59 christos Exp $ */
+/* $NetBSD: sysmon_taskq.c,v 1.7 2006/11/16 01:33:26 christos Exp $ */
/*
* Copyright (c) 2001, 2003 Wasabi Systems, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon_taskq.c,v 1.6 2006/10/12 01:31:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_taskq.c,v 1.7 2006/11/16 01:33:26 christos Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@@ -137,7 +137,7 @@ sysmon_task_queue_fini(void)
* Create the sysmon task queue execution thread.
*/
static void
-sysmon_task_queue_create_thread(void *arg __unused)
+sysmon_task_queue_create_thread(void *arg)
{
int error;
@@ -157,7 +157,7 @@ sysmon_task_queue_create_thread(void *arg __unused)
* have been queued for us.
*/
static void
-sysmon_task_queue_thread(void *arg __unused)
+sysmon_task_queue_thread(void *arg)
{
struct sysmon_task *st;
int s;
diff --git a/sys/dev/sysmon/sysmon_wdog.c b/sys/dev/sysmon/sysmon_wdog.c
index 93e51339084..58b91dfe6ff 100644
--- a/sys/dev/sysmon/sysmon_wdog.c
+++ b/sys/dev/sysmon/sysmon_wdog.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_wdog.c,v 1.13 2006/10/12 01:31:59 christos Exp $ */
+/* $NetBSD: sysmon_wdog.c,v 1.14 2006/11/16 01:33:26 christos Exp $ */
/*-
* Copyright (c) 2000 Zembu Labs, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon_wdog.c,v 1.13 2006/10/12 01:31:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_wdog.c,v 1.14 2006/11/16 01:33:26 christos Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -89,8 +89,8 @@ void sysmon_wdog_shutdown(void *);
* Open the system monitor device.
*/
int
-sysmonopen_wdog(dev_t dev __unused, int flag __unused, int mode __unused,
- struct lwp *l __unused)
+sysmonopen_wdog(dev_t dev, int flag, int mode,
+ struct lwp *l)
{
simple_lock(&sysmon_wdog_list_slock);
@@ -112,8 +112,8 @@ sysmonopen_wdog(dev_t dev __unused, int flag __unused, int mode __unused,
* Close the system monitor device.
*/
int
-sysmonclose_wdog(dev_t dev __unused, int flag __unused, int mode __unused,
- struct lwp *l __unused)
+sysmonclose_wdog(dev_t dev, int flag, int mode,
+ struct lwp *l)
{
struct sysmon_wdog *smw;
int s, error = 0;
@@ -151,7 +151,7 @@ sysmonclose_wdog(dev_t dev __unused, int flag __unused, int mode __unused,
* Perform a watchdog control request.
*/
int
-sysmonioctl_wdog(dev_t dev __unused, u_long cmd, caddr_t data, int flag,
+sysmonioctl_wdog(dev_t dev, u_long cmd, caddr_t data, int flag,
struct lwp *l)
{
struct sysmon_wdog *smw;
@@ -429,7 +429,7 @@ sysmon_wdog_setmode(struct sysmon_wdog *smw, int mode, u_int period)
* Kernel watchdog tickle routine.
*/
void
-sysmon_wdog_ktickle(void *arg __unused)
+sysmon_wdog_ktickle(void *arg)
{
struct sysmon_wdog *smw;
int s;
@@ -456,7 +456,7 @@ sysmon_wdog_ktickle(void *arg __unused)
* Perform shutdown-time operations.
*/
void
-sysmon_wdog_shutdown(void *arg __unused)
+sysmon_wdog_shutdown(void *arg)
{
struct sysmon_wdog *smw;
diff --git a/sys/dev/usb/ehci.c b/sys/dev/usb/ehci.c
index 927f5f4aa5a..b7d2f70f5f7 100644
--- a/sys/dev/usb/ehci.c
+++ b/sys/dev/usb/ehci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.114 2006/10/31 20:43:31 joerg Exp $ */
+/* $NetBSD: ehci.c,v 1.115 2006/11/16 01:33:26 christos Exp $ */
/*
* Copyright (c) 2004,2005 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.114 2006/10/31 20:43:31 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.115 2006/11/16 01:33:26 christos Exp $");
#include "ohci.h"
#include "uhci.h"
@@ -718,7 +718,7 @@ ehci_softintr(void *v)
/* Check for an interrupt. */
void
-ehci_check_intr(ehci_softc_t *sc __unused, struct ehci_xfer *ex)
+ehci_check_intr(ehci_softc_t *sc, struct ehci_xfer *ex)
{
ehci_soft_qtd_t *sqtd, *lsqtd;
u_int32_t status;
@@ -1200,7 +1200,7 @@ ehci_device_clear_toggle(usbd_pipe_handle pipe)
}
Static void
-ehci_noop(usbd_pipe_handle pipe __unused)
+ehci_noop(usbd_pipe_handle pipe)
{
}
@@ -2073,7 +2073,7 @@ ehci_root_ctrl_start(usbd_xfer_handle xfer)
}
void
-ehci_disown(ehci_softc_t *sc, int index, int lowspeed __unused)
+ehci_disown(ehci_softc_t *sc, int index, int lowspeed)
{
int port;
u_int32_t v;
@@ -2102,14 +2102,14 @@ ehci_disown(ehci_softc_t *sc, int index, int lowspeed __unused)
/* Abort a root control request. */
Static void
-ehci_root_ctrl_abort(usbd_xfer_handle xfer __unused)
+ehci_root_ctrl_abort(usbd_xfer_handle xfer)
{
/* Nothing to do, all transfers are synchronous. */
}
/* Close the root pipe. */
Static void
-ehci_root_ctrl_close(usbd_pipe_handle pipe __unused)
+ehci_root_ctrl_close(usbd_pipe_handle pipe)
{
DPRINTF(("ehci_root_ctrl_close\n"));
/* Nothing to do. */
@@ -3233,24 +3233,24 @@ ehci_device_intr_done(usbd_xfer_handle xfer)
/************************/
Static usbd_status
-ehci_device_isoc_transfer(usbd_xfer_handle xfer __unused)
+ehci_device_isoc_transfer(usbd_xfer_handle xfer)
{
return USBD_IOERROR;
}
Static usbd_status
-ehci_device_isoc_start(usbd_xfer_handle xfer __unused)
+ehci_device_isoc_start(usbd_xfer_handle xfer)
{
return USBD_IOERROR;
}
Static void
-ehci_device_isoc_abort(usbd_xfer_handle xfer __unused)
+ehci_device_isoc_abort(usbd_xfer_handle xfer)
{
}
Static void
-ehci_device_isoc_close(usbd_pipe_handle pipe __unused)
+ehci_device_isoc_close(usbd_pipe_handle pipe)
{
}
Static void
-ehci_device_isoc_done(usbd_xfer_handle xfer __unused)
+ehci_device_isoc_done(usbd_xfer_handle xfer)
{
}
diff --git a/sys/dev/usb/if_atu.c b/sys/dev/usb/if_atu.c
index 9d05debc807..e902338eafa 100644
--- a/sys/dev/usb/if_atu.c
+++ b/sys/dev/usb/if_atu.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_atu.c,v 1.22 2006/10/31 20:43:31 joerg Exp $ */
+/* $NetBSD: if_atu.c,v 1.23 2006/11/16 01:33:26 christos Exp $ */
/* $OpenBSD: if_atu.c,v 1.48 2004/12/30 01:53:21 dlg Exp $ */
/*
* Copyright (c) 2003, 2004
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_atu.c,v 1.22 2006/10/31 20:43:31 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_atu.c,v 1.23 2006/11/16 01:33:26 christos Exp $");
#include "bpfilter.h"
@@ -1442,7 +1442,7 @@ atu_activate(device_ptr_t self, enum devact act)
* Initialize an RX descriptor and attach an MBUF cluster.
*/
int
-atu_newbuf(struct atu_softc *sc __unused, struct atu_chain *c, struct mbuf *m)
+atu_newbuf(struct atu_softc *sc, struct atu_chain *c, struct mbuf *m)
{
struct mbuf *m_new = NULL;
@@ -1533,7 +1533,7 @@ atu_tx_list_init(struct atu_softc *sc)
}
void
-atu_xfer_list_free(struct atu_softc *sc __unused, struct atu_chain *ch,
+atu_xfer_list_free(struct atu_softc *sc, struct atu_chain *ch,
int listlen)
{
int i;
@@ -1668,7 +1668,7 @@ done:
* the list buffers.
*/
void
-atu_txeof(usbd_xfer_handle xfer __unused, usbd_private_handle priv,
+atu_txeof(usbd_xfer_handle xfer, usbd_private_handle priv,
usbd_status status)
{
struct atu_chain *c = (struct atu_chain *)priv;
@@ -1727,7 +1727,7 @@ atu_calculate_padding(int size)
}
int
-atu_tx_start(struct atu_softc *sc, struct ieee80211_node *ni __unused,
+atu_tx_start(struct atu_softc *sc, struct ieee80211_node *ni,
struct atu_chain *c, struct mbuf *m)
{
int len;
@@ -2169,7 +2169,7 @@ atu_watchdog(struct ifnet *ifp)
* RX and TX lists.
*/
void
-atu_stop(struct ifnet *ifp, int disable __unused)
+atu_stop(struct ifnet *ifp, int disable)
{
struct atu_softc *sc = ifp->if_softc;
struct ieee80211com *ic = &sc->sc_ic;
diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c
index 83c1f77e789..5e552259f23 100644
--- a/sys/dev/usb/if_aue.c
+++ b/sys/dev/usb/if_aue.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_aue.c,v 1.98 2006/10/31 20:43:31 joerg Exp $ */
+/* $NetBSD: if_aue.c,v 1.99 2006/11/16 01:33:26 christos Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.98 2006/10/31 20:43:31 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.99 2006/11/16 01:33:26 christos Exp $");
#if defined(__NetBSD__)
#include "opt_inet.h"
@@ -1048,7 +1048,7 @@ aue_tx_list_init(struct aue_softc *sc)
}
Static void
-aue_intr(usbd_xfer_handle xfer __unused, usbd_private_handle priv,
+aue_intr(usbd_xfer_handle xfer, usbd_private_handle priv,
usbd_status status)
{
struct aue_softc *sc = priv;
@@ -1194,7 +1194,7 @@ aue_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
*/
Static void
-aue_txeof(usbd_xfer_handle xfer __unused, usbd_private_handle priv,
+aue_txeof(usbd_xfer_handle xfer, usbd_private_handle priv,
usbd_status status)
{
struct aue_chain *c = priv;
diff --git a/sys/dev/usb/if_axe.c b/sys/dev/usb/if_axe.c
index 97d6d7055dc..7d7101497cb 100644
--- a/sys/dev/usb/if_axe.c
+++ b/sys/dev/usb/if_axe.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_axe.c,v 1.16 2006/10/31 20:43:31 joerg Exp $ */
+/* $NetBSD: if_axe.c,v 1.17 2006/11/16 01:33:26 christos Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000-2003
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.16 2006/10/31 20:43:31 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.17 2006/11/16 01:33:26 christos Exp $");
#if defined(__NetBSD__)
#include "opt_inet.h"
@@ -898,7 +898,7 @@ axe_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
*/
Static void
-axe_txeof(usbd_xfer_handle xfer __unused, usbd_private_handle priv,
+axe_txeof(usbd_xfer_handle xfer, usbd_private_handle priv,
usbd_status status)
{
struct axe_softc *sc;
diff --git a/sys/dev/usb/if_cdce.c b/sys/dev/usb/if_cdce.c
index f88809ed065..7757568e2cd 100644
--- a/sys/dev/usb/if_cdce.c
+++ b/sys/dev/usb/if_cdce.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cdce.c,v 1.11 2006/10/12 01:31:59 christos Exp $ */
+/* $NetBSD: if_cdce.c,v 1.12 2006/11/16 01:33:26 christos Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul <wpaul@windriver.com>
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cdce.c,v 1.11 2006/10/12 01:31:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cdce.c,v 1.12 2006/11/16 01:33:26 christos Exp $");
#include "bpfilter.h"
#include <sys/param.h>
@@ -727,7 +727,7 @@ done:
}
Static void
-cdce_txeof(usbd_xfer_handle xfer __unused, usbd_private_handle priv,
+cdce_txeof(usbd_xfer_handle xfer, usbd_private_handle priv,
usbd_status status)
{
struct cdce_chain *c = priv;
diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c
index 230327104e7..17349c6f6ff 100644
--- a/sys/dev/usb/if_cue.c
+++ b/sys/dev/usb/if_cue.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cue.c,v 1.47 2006/10/31 20:43:31 joerg Exp $ */
+/* $NetBSD: if_cue.c,v 1.48 2006/11/16 01:33:26 christos Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cue.c,v 1.47 2006/10/31 20:43:31 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cue.c,v 1.48 2006/11/16 01:33:26 christos Exp $");
#if defined(__NetBSD__)
#include "opt_inet.h"
@@ -859,7 +859,7 @@ done:
* the list buffers.
*/
Static void
-cue_txeof(usbd_xfer_handle xfer __unused, usbd_private_handle priv,
+cue_txeof(usbd_xfer_handle xfer, usbd_private_handle priv,
usbd_status status)
{
struct cue_chain *c = priv;
diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c
index 07536cf70b4..a46e021f672 100644
--- a/sys/dev/usb/if_kue.c
+++ b/sys/dev/usb/if_kue.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_kue.c,v 1.57 2006/10/12 01:31:59 christos Exp $ */
+/* $NetBSD: if_kue.c,v 1.58 2006/11/16 01:33:26 christos Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.57 2006/10/12 01:31:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.58 2006/11/16 01:33:26 christos Exp $");
#if defined(__NetBSD__)
#include "opt_inet.h"
@@ -815,7 +815,7 @@ kue_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
*/
Static void
-kue_txeof(usbd_xfer_handle xfer __unused, usbd_private_handle priv,
+kue_txeof(usbd_xfer_handle xfer, usbd_private_handle priv,
usbd_status status)
{
struct kue_chain *c = priv;
diff --git a/sys/dev/usb/if_udav.c b/sys/dev/usb/if_udav.c
index 58af88997d7..890dd191f10 100644
--- a/sys/dev/usb/if_udav.c
+++ b/sys/dev/usb/if_udav.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_udav.c,v 1.13 2006/10/31 20:43:31 joerg Exp $ */
+/* $NetBSD: if_udav.c,v 1.14 2006/11/16 01:33:26 christos Exp $ */
/* $nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $ */
/*
* Copyright (c) 2003
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.13 2006/10/31 20:43:31 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.14 2006/11/16 01:33:26 christos Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -1056,7 +1056,7 @@ udav_send(struct udav_softc *sc, struct mbuf *m, int idx)
}
Static void
-udav_txeof(usbd_xfer_handle xfer __unused, usbd_private_handle priv,
+udav_txeof(usbd_xfer_handle xfer, usbd_private_handle priv,
usbd_status status)
{
struct udav_chain *c = priv;
@@ -1276,7 +1276,7 @@ udav_stop_task(struct udav_softc *sc)
/* Stop the adapter and free any mbufs allocated to the RX and TX lists. */
Static void
-udav_stop(struct ifnet *ifp, int disable __unused)
+udav_stop(struct ifnet *ifp, int disable)
{
struct udav_softc *sc = ifp->if_softc;
usbd_status err;
@@ -1602,7 +1602,7 @@ udav_miibus_writereg(device_ptr_t dev, int phy, int reg, int data)
}
Static void
-udav_miibus_statchg(device_ptr_t dev __unused)
+udav_miibus_statchg(device_ptr_t dev)
{
#ifdef UDAV_DEBUG
struct udav_softc *sc;
diff --git a/sys/dev/usb/if_upl.c b/sys/dev/usb/if_upl.c
index ef6893afd09..59cd165222c 100644
--- a/sys/dev/usb/if_upl.c
+++ b/sys/dev/usb/if_upl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_upl.c,v 1.25 2006/10/12 01:31:59 christos Exp $ */
+/* $NetBSD: if_upl.c,v 1.26 2006/11/16 01:33:26 christos Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_upl.c,v 1.25 2006/10/12 01:31:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_upl.c,v 1.26 2006/11/16 01:33:26 christos Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -592,7 +592,7 @@ upl_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
* the list buffers.
*/
Static void
-upl_txeof(usbd_xfer_handle xfer __unused, usbd_private_handle priv,
+upl_txeof(usbd_xfer_handle xfer, usbd_private_handle priv,
usbd_status status)
{
struct upl_chain *c = priv;
@@ -810,7 +810,7 @@ upl_openpipes(struct upl_softc *sc)
}
Static void
-upl_intr(usbd_xfer_handle xfer __unused, usbd_private_handle priv,
+upl_intr(usbd_xfer_handle xfer, usbd_private_handle priv,
usbd_status status)
{
struct upl_softc *sc = priv;
@@ -1014,8 +1014,8 @@ upl_stop(struct upl_softc *sc)
}
Static int
-upl_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst __unused,
- struct rtentry *rt0 __unused)
+upl_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
+ struct rtentry *rt0)
{
int s, len, error;
ALTQ_DECL(struct altq_pktattr pktattr;)
diff --git a/sys/dev/usb/if_ural.c b/sys/dev/usb/if_ural.c
index 9fcecbc7b46..cf3e44924dc 100644
--- a/sys/dev/usb/if_ural.c
+++ b/sys/dev/usb/if_ural.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ural.c,v 1.17 2006/10/31 21:53:41 joerg Exp $ */
+/* $NetBSD: if_ural.c,v 1.18 2006/11/16 01:33:26 christos Exp $ */
/* $FreeBSD: /repoman/r/ncvs/src/sys/dev/usb/if_ural.c,v 1.40 2006/06/02 23:14:40 sam Exp $ */
/*-
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ural.c,v 1.17 2006/10/31 21:53:41 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ural.c,v 1.18 2006/11/16 01:33:26 christos Exp $");
#include "bpfilter.h"
@@ -817,7 +817,7 @@ ural_task(void *arg)
Static int
ural_newstate(struct ieee80211com *ic, enum ieee80211_state nstate,
- int arg __unused)
+ int arg)
{
struct ural_softc *sc = ic->ic_ifp->if_softc;
@@ -874,7 +874,7 @@ ural_rxrate(struct ural_rx_desc *desc)
}
Static void
-ural_txeof(usbd_xfer_handle xfer __unused, usbd_private_handle priv,
+ural_txeof(usbd_xfer_handle xfer, usbd_private_handle priv,
usbd_status status)
{
struct ural_tx_data *data = priv;
@@ -2244,7 +2244,7 @@ fail: ural_stop(ifp, 1);
}
Static void
-ural_stop(struct ifnet *ifp, int disable __unused)
+ural_stop(struct ifnet *ifp, int disable)
{
struct ural_softc *sc = ifp->if_softc;
struct ieee80211com *ic = &sc->sc_ic;
@@ -2347,7 +2347,7 @@ ural_amrr_timeout(void *arg)
}
Static void
-ural_amrr_update(usbd_xfer_handle xfer __unused, usbd_private_handle priv,
+ural_amrr_update(usbd_xfer_handle xfer, usbd_private_handle priv,
usbd_status status)
{
struct ural_softc *sc = (struct ural_softc *)priv;
diff --git a/sys/dev/usb/if_url.c b/sys/dev/usb/if_url.c
index 09fa4693ca8..49e1ca5d228 100644
--- a/sys/dev/usb/if_url.c
+++ b/sys/dev/usb/if_url.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_url.c,v 1.22 2006/10/31 20:43:31 joerg Exp $ */
+/* $NetBSD: if_url.c,v 1.23 2006/11/16 01:33:26 christos Exp $ */
/*
* Copyright (c) 2001, 2002
* Shingo WATANABE <nabe@nabechan.org>. All rights reserved.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.22 2006/10/31 20:43:31 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.23 2006/11/16 01:33:26 christos Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -942,7 +942,7 @@ url_send(struct url_softc *sc, struct mbuf *m, int idx)
}
Static void
-url_txeof(usbd_xfer_handle xfer __unused, usbd_private_handle priv,
+url_txeof(usbd_xfer_handle xfer, usbd_private_handle priv,
usbd_status status)
{
struct url_chain *c = priv;
@@ -1161,7 +1161,7 @@ url_stop_task(struct url_softc *sc)
/* Stop the adapter and free any mbufs allocated to the RX and TX lists. */
Static void
-url_stop(struct ifnet *ifp, int disable __unused)
+url_stop(struct ifnet *ifp, int disable)
{
struct url_softc *sc = ifp->if_softc;
usbd_status err;
@@ -1516,7 +1516,7 @@ url_int_miibus_writereg(device_ptr_t dev, int phy, int reg, int data)
}
Static void
-url_miibus_statchg(device_ptr_t dev __unused)
+url_miibus_statchg(device_ptr_t dev)
{
#ifdef URL_DEBUG
struct url_softc *sc;
diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c
index 4b90dc4eb28..57adf2cba7e 100644
--- a/sys/dev/usb/ohci.c
+++ b/sys/dev/usb/ohci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci.c,v 1.178 2006/10/31 20:43:31 joerg Exp $ */
+/* $NetBSD: ohci.c,v 1.179 2006/11/16 01:33:26 christos Exp $ */
/* $FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $ */
/*
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.178 2006/10/31 20:43:31 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.179 2006/11/16 01:33:26 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1481,7 +1481,7 @@ ohci_softintr(void *v)
}
void
-ohci_device_ctrl_done(usbd_xfer_handle xfer __unused)
+ohci_device_ctrl_done(usbd_xfer_handle xfer)
{
DPRINTFN(10,("ohci_device_ctrl_done: xfer=%p\n", xfer));
@@ -1535,7 +1535,7 @@ ohci_device_intr_done(usbd_xfer_handle xfer)
}
void
-ohci_device_bulk_done(usbd_xfer_handle xfer __unused)
+ohci_device_bulk_done(usbd_xfer_handle xfer)
{
DPRINTFN(10,("ohci_device_bulk_done: xfer=%p, actlen=%d\n",
xfer, xfer->actlen));
@@ -1576,12 +1576,12 @@ ohci_rhsc(ohci_softc_t *sc, usbd_xfer_handle xfer)
}
void
-ohci_root_intr_done(usbd_xfer_handle xfer __unused)
+ohci_root_intr_done(usbd_xfer_handle xfer)
{
}
void
-ohci_root_ctrl_done(usbd_xfer_handle xfer __unused)
+ohci_root_ctrl_done(usbd_xfer_handle xfer)
{
}
@@ -1829,7 +1829,7 @@ ohci_hash_add_td(ohci_softc_t *sc, ohci_soft_td_t *std)
/* Called at splusb() */
void
-ohci_hash_rem_td(ohci_softc_t *sc __unused, ohci_soft_td_t *std)
+ohci_hash_rem_td(ohci_softc_t *sc, ohci_soft_td_t *std)
{
SPLUSBCHECK;
@@ -1866,7 +1866,7 @@ ohci_hash_add_itd(ohci_softc_t *sc, ohci_soft_itd_t *sitd)
/* Called at splusb() */
void
-ohci_hash_rem_itd(ohci_softc_t *sc __unused, ohci_soft_itd_t *sitd)
+ohci_hash_rem_itd(ohci_softc_t *sc, ohci_soft_itd_t *sitd)
{
SPLUSBCHECK;
@@ -2701,14 +2701,14 @@ ohci_root_ctrl_start(usbd_xfer_handle xfer)
/* Abort a root control request. */
Static void
-ohci_root_ctrl_abort(usbd_xfer_handle xfer __unused)
+ohci_root_ctrl_abort(usbd_xfer_handle xfer)
{
/* Nothing to do, all transfers are synchronous. */
}
/* Close the root pipe. */
Static void
-ohci_root_ctrl_close(usbd_pipe_handle pipe __unused)
+ohci_root_ctrl_close(usbd_pipe_handle pipe)
{
DPRINTF(("ohci_root_ctrl_close\n"));
/* Nothing to do. */
@@ -2843,7 +2843,7 @@ ohci_device_clear_toggle(usbd_pipe_handle pipe)
}
Static void
-ohci_noop(usbd_pipe_handle pipe __unused)
+ohci_noop(usbd_pipe_handle pipe)
{
}
@@ -3415,7 +3415,7 @@ ohci_device_isoc_abort(usbd_xfer_handle xfer)
}
void
-ohci_device_isoc_done(usbd_xfer_handle xfer __unused)
+ohci_device_isoc_done(usbd_xfer_handle xfer)
{
DPRINTFN(1,("ohci_device_isoc_done: xfer=%p\n", xfer));
}
diff --git a/sys/dev/usb/uaudio.c b/sys/dev/usb/uaudio.c
index 759c07ba885..cd4c2dea8ab 100644
--- a/sys/dev/usb/uaudio.c
+++ b/sys/dev/usb/uaudio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uaudio.c,v 1.106 2006/10/12 01:31:59 christos Exp $ */
+/* $NetBSD: uaudio.c,v 1.107 2006/11/16 01:33:26 christos Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.106 2006/10/12 01:31:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.107 2006/11/16 01:33:26 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -616,8 +616,8 @@ uaudio_mixer_add_ctl(struct uaudio_softc *sc, struct mixerctl *mc)
}
Static char *
-uaudio_id_name(struct uaudio_softc *sc __unused,
- const struct io_terminal *iot __unused, int id)
+uaudio_id_name(struct uaudio_softc *sc,
+ const struct io_terminal *iot, int id)
{
static char tbuf[32];
@@ -723,8 +723,8 @@ uaudio_add_input(struct uaudio_softc *sc, const struct io_terminal *iot, int id)
}
Static void
-uaudio_add_output(struct uaudio_softc *sc __unused,
- const struct io_terminal *iot __unused, int id __unused)
+uaudio_add_output(struct uaudio_softc *sc,
+ const struct io_terminal *iot, int id)
{
#ifdef UAUDIO_DEBUG
const struct usb_audio_output_terminal *d;
@@ -2161,7 +2161,7 @@ uaudio_open(void *addr, int flags)
* Close function is called at splaudio().
*/
Static void
-uaudio_close(void *addr __unused)
+uaudio_close(void *addr)
{
}
@@ -2272,7 +2272,7 @@ uaudio_round_blocksize(void *addr, int blk,
}
Static int
-uaudio_get_props(void *addr __unused)
+uaudio_get_props(void *addr)
{
return AUDIO_PROP_FULLDUPLEX | AUDIO_PROP_INDEPENDENT;
@@ -2511,7 +2511,7 @@ uaudio_mixer_set_port(void *addr, mixer_ctrl_t *cp)
Static int
uaudio_trigger_input(void *addr, void *start, void *end, int blksize,
void (*intr)(void *), void *arg,
- const audio_params_t *param __unused)
+ const audio_params_t *param)
{
struct uaudio_softc *sc;
struct chan *ch;
@@ -2554,7 +2554,7 @@ uaudio_trigger_input(void *addr, void *start, void *end, int blksize,
Static int
uaudio_trigger_output(void *addr, void *start, void *end, int blksize,
void (*intr)(void *), void *arg,
- const audio_params_t *param __unused)
+ const audio_params_t *param)
{
struct uaudio_softc *sc;
struct chan *ch;
@@ -2694,7 +2694,7 @@ bad:
}
Static void
-uaudio_chan_free_buffers(struct uaudio_softc *sc __unused, struct chan *ch)
+uaudio_chan_free_buffers(struct uaudio_softc *sc, struct chan *ch)
{
int i;
diff --git a/sys/dev/usb/ubsa.c b/sys/dev/usb/ubsa.c
index df7eb88dfb0..bbcda33a1e6 100644
--- a/sys/dev/usb/ubsa.c
+++ b/sys/dev/usb/ubsa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ubsa.c,v 1.15 2006/10/12 01:31:59 christos Exp $ */
+/* $NetBSD: ubsa.c,v 1.16 2006/11/16 01:33:26 christos Exp $ */
/*-
* Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>.
* All rights reserved.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ubsa.c,v 1.15 2006/10/12 01:31:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ubsa.c,v 1.16 2006/11/16 01:33:26 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -484,7 +484,7 @@ ubsa_break(struct ubsa_softc *sc, int onoff)
}
Static void
-ubsa_set(void *addr, int portno __unused, int reg, int onoff)
+ubsa_set(void *addr, int portno, int reg, int onoff)
{
struct ubsa_softc *sc;
@@ -609,7 +609,7 @@ ubsa_flow(struct ubsa_softc *sc, tcflag_t cflag, tcflag_t iflag)
}
Static int
-ubsa_param(void *addr, int portno __unused, struct termios *ti)
+ubsa_param(void *addr, int portno, struct termios *ti)
{
struct ubsa_softc *sc = addr;
@@ -625,7 +625,7 @@ ubsa_param(void *addr, int portno __unused, struct termios *ti)
}
Static int
-ubsa_open(void *addr, int portno __unused)
+ubsa_open(void *addr, int portno)
{
struct ubsa_softc *sc = addr;
int err;
@@ -658,7 +658,7 @@ ubsa_open(void *addr, int portno __unused)
}
Static void
-ubsa_close(void *addr, int portno __unused)
+ubsa_close(void *addr, int portno)
{
struct ubsa_softc *sc = addr;
int err;
@@ -685,7 +685,7 @@ ubsa_close(void *addr, int portno __unused)
}
Static void
-ubsa_intr(usbd_xfer_handle xfer __unused, usbd_private_handle priv,
+ubsa_intr(usbd_xfer_handle xfer, usbd_private_handle priv,
usbd_status status)
{
struct ubsa_softc *sc = priv;
@@ -716,7 +716,7 @@ ubsa_intr(usbd_xfer_handle xfer __unused, usbd_private_handle priv,
}
Static void
-ubsa_get_status(void *addr, int portno __unused, u_char *lsr, u_char *msr)
+ubsa_get_status(void *addr, int portno, u_char *lsr, u_char *msr)
{
struct ubsa_softc *sc = addr;
diff --git a/sys/dev/usb/ubt.c b/sys/dev/usb/ubt.c
index 68f9eaae45b..f32e1ceef6f 100644
--- a/sys/dev/usb/ubt.c
+++ b/sys/dev/usb/ubt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ubt.c,v 1.19 2006/10/12 01:31:59 christos Exp $ */
+/* $NetBSD: ubt.c,v 1.20 2006/11/16 01:33:26 christos Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ubt.c,v 1.19 2006/10/12 01:31:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ubt.c,v 1.20 2006/11/16 01:33:26 christos Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -1121,7 +1121,7 @@ ubt_xmit_acl_start(struct hci_unit *unit)
}
static void
-ubt_xmit_acl_complete(usbd_xfer_handle xfer __unused,
+ubt_xmit_acl_complete(usbd_xfer_handle xfer,
usbd_private_handle h, usbd_status status)
{
struct hci_unit *unit = h;
@@ -1254,7 +1254,7 @@ ubt_xmit_sco_start1(struct ubt_softc *sc, struct ubt_isoc_xfer *isoc)
}
static void
-ubt_xmit_sco_complete(usbd_xfer_handle xfer __unused,
+ubt_xmit_sco_complete(usbd_xfer_handle xfer,
usbd_private_handle h, usbd_status status)
{
struct ubt_isoc_xfer *isoc = h;
diff --git a/sys/dev/usb/ucom.c b/sys/dev/usb/ucom.c
index 8eaa97107f8..e174042a041 100644
--- a/sys/dev/usb/ucom.c
+++ b/sys/dev/usb/ucom.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ucom.c,v 1.68 2006/10/12 01:31:59 christos Exp $ */
+/* $NetBSD: ucom.c,v 1.69 2006/11/16 01:33:26 christos Exp $ */
/*
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.68 2006/10/12 01:31:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.69 2006/11/16 01:33:26 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -301,7 +301,7 @@ ucom_shutdown(struct ucom_softc *sc)
}
int
-ucomopen(dev_t dev, int flag, int mode __unused, struct lwp *l)
+ucomopen(dev_t dev, int flag, int mode, struct lwp *l)
{
int unit = UCOMUNIT(dev);
usbd_status err;
@@ -495,7 +495,7 @@ bad:
}
int
-ucomclose(dev_t dev, int flag, int mode __unused, struct lwp *l __unused)
+ucomclose(dev_t dev, int flag, int mode, struct lwp *l)
{
struct ucom_softc *sc = ucom_cd.cd_devs[UCOMUNIT(dev)];
struct tty *tp = sc->sc_tty;
@@ -869,7 +869,7 @@ XXX what if the hardware is not open
* (un)block input via hw flowcontrol
*/
Static void
-ucom_hwiflow(struct ucom_softc *sc __unused)
+ucom_hwiflow(struct ucom_softc *sc)
{
DPRINTF(("ucom_hwiflow:\n"));
#if 0
@@ -958,7 +958,7 @@ out:
}
void
-ucomstop(struct tty *tp __unused, int flag __unused)
+ucomstop(struct tty *tp, int flag)
{
DPRINTF(("ucomstop: flag=%d\n", flag));
#if 0
@@ -1140,7 +1140,7 @@ ucomprint(void *aux, const char *pnp)
int
ucomsubmatch(struct device *parent, struct cfdata *cf,
- const int *ldesc __unused, void *aux)
+ const int *ldesc, void *aux)
{
struct ucom_attach_args *uca = aux;
diff --git a/sys/dev/usb/ucycom.c b/sys/dev/usb/ucycom.c
index 3f942478eb9..ac9d43d6124 100644
--- a/sys/dev/usb/ucycom.c
+++ b/sys/dev/usb/ucycom.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ucycom.c,v 1.15 2006/10/12 01:31:59 christos Exp $ */
+/* $NetBSD: ucycom.c,v 1.16 2006/11/16 01:33:26 christos Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: ucycom.c,v 1.15 2006/10/12 01:31:59 christos Exp $");
+__RCSID("$NetBSD: ucycom.c,v 1.16 2006/11/16 01:33:26 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -181,7 +181,7 @@ Static const struct usb_devno ucycom_devs[] = {
USB_DECLARE_DRIVER(ucycom);
int
-ucycom_match(struct device *parent __unused, struct cfdata *match __unused,
+ucycom_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct uhidev_attach_arg *uha = aux;
@@ -191,7 +191,7 @@ ucycom_match(struct device *parent __unused, struct cfdata *match __unused,
}
void
-ucycom_attach(struct device *parent __unused, struct device *self, void *aux)
+ucycom_attach(struct device *parent, struct device *self, void *aux)
{
struct ucycom_softc *sc = (struct ucycom_softc *)self;
struct uhidev_attach_arg *uha = aux;
@@ -225,7 +225,7 @@ ucycom_attach(struct device *parent __unused, struct device *self, void *aux)
int
-ucycom_detach(struct device *self, int flags __unused)
+ucycom_detach(struct device *self, int flags)
{
struct ucycom_softc *sc = (struct ucycom_softc *)self;
struct tty *tp = sc->sc_tty;
@@ -305,7 +305,7 @@ ucycom_shutdown(struct ucycom_softc *sc)
#endif
int
-ucycomopen(dev_t dev, int flag, int mode __unused, struct lwp *l)
+ucycomopen(dev_t dev, int flag, int mode, struct lwp *l)
{
int unit = UCYCOMUNIT(dev);
struct ucycom_softc *sc;
@@ -424,7 +424,7 @@ bad:
int
-ucycomclose(dev_t dev, int flag, int mode __unused, struct lwp *l __unused)
+ucycomclose(dev_t dev, int flag, int mode, struct lwp *l)
{
struct ucycom_softc *sc = ucycom_cd.cd_devs[UCYCOMUNIT(dev)];
struct tty *tp = sc->sc_tty;
@@ -675,7 +675,7 @@ ucycomparam(struct tty *tp, struct termios *t)
}
void
-ucycomstop(struct tty *tp __unused, int flag __unused)
+ucycomstop(struct tty *tp, int flag)
{
DPRINTF(("ucycomstop: flag=%d\n", flag));
}
diff --git a/sys/dev/usb/uftdi.c b/sys/dev/usb/uftdi.c
index 8954742a895..72ecae840ee 100644
--- a/sys/dev/usb/uftdi.c
+++ b/sys/dev/usb/uftdi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uftdi.c,v 1.28 2006/10/12 01:31:59 christos Exp $ */
+/* $NetBSD: uftdi.c,v 1.29 2006/11/16 01:33:26 christos Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.28 2006/10/12 01:31:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.29 2006/11/16 01:33:26 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -372,7 +372,7 @@ uftdi_open(void *vsc, int portno)
}
Static void
-uftdi_read(void *vsc, int portno __unused, u_char **ptr, u_int32_t *count)
+uftdi_read(void *vsc, int portno, u_char **ptr, u_int32_t *count)
{
struct uftdi_softc *sc = vsc;
u_char msr, lsr;
@@ -581,7 +581,7 @@ uftdi_param(void *vsc, int portno, struct termios *t)
}
void
-uftdi_get_status(void *vsc, int portno __unused, u_char *lsr, u_char *msr)
+uftdi_get_status(void *vsc, int portno, u_char *lsr, u_char *msr)
{
struct uftdi_softc *sc = vsc;
diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c
index f668290b40b..71d49a4e62c 100644
--- a/sys/dev/usb/ugen.c
+++ b/sys/dev/usb/ugen.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ugen.c,v 1.87 2006/10/12 17:50:07 xtraeme Exp $ */
+/* $NetBSD: ugen.c,v 1.88 2006/11/16 01:33:26 christos Exp $ */
/*
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.87 2006/10/12 17:50:07 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.88 2006/11/16 01:33:26 christos Exp $");
#include "opt_ugen_bulk_ra_wb.h"
@@ -338,7 +338,7 @@ ugen_set_config(struct ugen_softc *sc, int configno)
}
int
-ugenopen(dev_t dev, int flag, int mode __unused, struct lwp *l __unused)
+ugenopen(dev_t dev, int flag, int mode, struct lwp *l)
{
struct ugen_softc *sc;
int unit = UGENUNIT(dev);
@@ -487,7 +487,7 @@ ugenopen(dev_t dev, int flag, int mode __unused, struct lwp *l __unused)
}
int
-ugenclose(dev_t dev, int flag, int mode __unused, struct lwp *l __unused)
+ugenclose(dev_t dev, int flag, int mode, struct lwp *l)
{
int endpt = UGENENDPOINT(dev);
struct ugen_softc *sc;
@@ -789,7 +789,7 @@ ugenread(dev_t dev, struct uio *uio, int flag)
Static int
ugen_do_write(struct ugen_softc *sc, int endpt, struct uio *uio,
- int flag __unused)
+ int flag)
{
struct ugen_endpoint *sce = &sc->sc_endpoints[endpt][OUT];
u_int32_t n;
@@ -1937,7 +1937,7 @@ filt_ugenrdetach(struct knote *kn)
}
static int
-filt_ugenread_intr(struct knote *kn, long hint __unused)
+filt_ugenread_intr(struct knote *kn, long hint)
{
struct ugen_endpoint *sce = kn->kn_hook;
@@ -1946,7 +1946,7 @@ filt_ugenread_intr(struct knote *kn, long hint __unused)
}
static int
-filt_ugenread_isoc(struct knote *kn, long hint __unused)
+filt_ugenread_isoc(struct knote *kn, long hint)
{
struct ugen_endpoint *sce = kn->kn_hook;
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c
index eddd47aba78..fabd600081b 100644
--- a/sys/dev/usb/uhci.c
+++ b/sys/dev/usb/uhci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uhci.c,v 1.204 2006/10/31 20:43:31 joerg Exp $ */
+/* $NetBSD: uhci.c,v 1.205 2006/11/16 01:33:26 christos Exp $ */
/* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $ */
/*
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.204 2006/10/31 20:43:31 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.205 2006/11/16 01:33:26 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1045,12 +1045,12 @@ uhci_poll_hub(void *addr)
}
void
-uhci_root_intr_done(usbd_xfer_handle xfer __unused)
+uhci_root_intr_done(usbd_xfer_handle xfer)
{
}
void
-uhci_root_ctrl_done(usbd_xfer_handle xfer __unused)
+uhci_root_ctrl_done(usbd_xfer_handle xfer)
{
}
@@ -1348,7 +1348,7 @@ uhci_softintr(void *v)
/* Check for an interrupt. */
void
-uhci_check_intr(uhci_softc_t *sc __unused, uhci_intr_info_t *ii)
+uhci_check_intr(uhci_softc_t *sc, uhci_intr_info_t *ii)
{
uhci_soft_td_t *std, *lstd;
u_int32_t status;
@@ -1844,7 +1844,7 @@ uhci_device_clear_toggle(usbd_pipe_handle pipe)
}
void
-uhci_noop(usbd_pipe_handle pipe __unused)
+uhci_noop(usbd_pipe_handle pipe)
{
}
@@ -2211,7 +2211,7 @@ uhci_device_ctrl_abort(usbd_xfer_handle xfer)
/* Close a device control pipe. */
void
-uhci_device_ctrl_close(usbd_pipe_handle pipe __unused)
+uhci_device_ctrl_close(usbd_pipe_handle pipe)
{
}
@@ -3518,14 +3518,14 @@ uhci_root_ctrl_start(usbd_xfer_handle xfer)
/* Abort a root control request. */
void
-uhci_root_ctrl_abort(usbd_xfer_handle xfer __unused)
+uhci_root_ctrl_abort(usbd_xfer_handle xfer)
{
/* Nothing to do, all transfers are synchronous. */
}
/* Close the root pipe. */
void
-uhci_root_ctrl_close(usbd_pipe_handle pipe __unused)
+uhci_root_ctrl_close(usbd_pipe_handle pipe)
{
DPRINTF(("uhci_root_ctrl_close\n"));
}
diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c
index fb9ed1006d9..90efc46359a 100644
--- a/sys/dev/usb/uhid.c
+++ b/sys/dev/usb/uhid.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uhid.c,v 1.71 2006/10/12 01:31:59 christos Exp $ */
+/* $NetBSD: uhid.c,v 1.72 2006/11/16 01:33:26 christos Exp $ */
/*
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.71 2006/10/12 01:31:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.72 2006/11/16 01:33:26 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -125,8 +125,8 @@ Static int uhid_do_ioctl(struct uhid_softc*, u_long, caddr_t, int, struct lwp *)
USB_DECLARE_DRIVER(uhid);
int
-uhid_match(struct device *parent __unused, struct cfdata *match,
- void *aux __unused)
+uhid_match(struct device *parent, struct cfdata *match,
+ void *aux)
{
#ifdef UHID_DEBUG
struct uhidev_attach_arg *uha = aux;
@@ -141,7 +141,7 @@ uhid_match(struct device *parent __unused, struct cfdata *match,
}
void
-uhid_attach(struct device *parent __unused, struct device *self, void *aux)
+uhid_attach(struct device *parent, struct device *self, void *aux)
{
struct uhid_softc *sc = (struct uhid_softc *)self;
struct uhidev_attach_arg *uha = aux;
@@ -181,7 +181,7 @@ uhid_activate(device_ptr_t self, enum devact act)
}
int
-uhid_detach(struct device *self, int flags __unused)
+uhid_detach(struct device *self, int flags)
{
struct uhid_softc *sc = (struct uhid_softc *)self;
int s;
@@ -255,8 +255,8 @@ uhid_intr(struct uhidev *addr, void *data, u_int len)
}
int
-uhidopen(dev_t dev, int flag __unused, int mode __unused,
- struct lwp *l __unused)
+uhidopen(dev_t dev, int flag, int mode,
+ struct lwp *l)
{
struct uhid_softc *sc;
int error;
@@ -284,8 +284,8 @@ uhidopen(dev_t dev, int flag __unused, int mode __unused,
}
int
-uhidclose(dev_t dev, int flag __unused, int mode __unused,
- struct lwp *l __unused)
+uhidclose(dev_t dev, int flag, int mode,
+ struct lwp *l)
{
struct uhid_softc *sc;
@@ -375,7 +375,7 @@ uhidread(dev_t dev, struct uio *uio, int flag)
}
int
-uhid_do_write(struct uhid_softc *sc, struct uio *uio, int flag __unused)
+uhid_do_write(struct uhid_softc *sc, struct uio *uio, int flag)
{
int error;
int size;
@@ -418,7 +418,7 @@ uhidwrite(dev_t dev, struct uio *uio, int flag)
int
uhid_do_ioctl(struct uhid_softc *sc, u_long cmd, caddr_t addr,
- int flag __unused, struct lwp *l)
+ int flag, struct lwp *l)
{
struct usb_ctl_report_desc *rd;
struct usb_ctl_report *re;
@@ -608,7 +608,7 @@ filt_uhidrdetach(struct knote *kn)
}
static int
-filt_uhidread(struct knote *kn, long hint __unused)
+filt_uhidread(struct knote *kn, long hint)
{
struct uhid_softc *sc = kn->kn_hook;
diff --git a/sys/dev/usb/uhub.c b/sys/dev/usb/uhub.c
index 825f34ac55c..3c0d267184c 100644
--- a/sys/dev/usb/uhub.c
+++ b/sys/dev/usb/uhub.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uhub.c,v 1.80 2006/10/24 21:03:30 drochner Exp $ */
+/* $NetBSD: uhub.c,v 1.81 2006/11/16 01:33:26 christos Exp $ */
/* $FreeBSD: src/sys/dev/usb/uhub.c,v 1.18 1999/11/17 22:33:43 n_hibma Exp $ */
/*
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhub.c,v 1.80 2006/10/24 21:03:30 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhub.c,v 1.81 2006/11/16 01:33:26 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -636,7 +636,7 @@ uhub_child_detached(device_t self, device_t child)
* to be explored again.
*/
void
-uhub_intr(usbd_xfer_handle xfer __unused, usbd_private_handle addr,
+uhub_intr(usbd_xfer_handle xfer, usbd_private_handle addr,
usbd_status status)
{
struct uhub_softc *sc = addr;
diff --git a/sys/dev/usb/uipaq.c b/sys/dev/usb/uipaq.c
index b16a94e78a9..25cd1a55e1b 100644
--- a/sys/dev/usb/uipaq.c
+++ b/sys/dev/usb/uipaq.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uipaq.c,v 1.3 2006/10/12 01:32:00 christos Exp $ */
+/* $NetBSD: uipaq.c,v 1.4 2006/11/16 01:33:27 christos Exp $ */
/* $OpenBSD: uipaq.c,v 1.1 2005/06/17 23:50:33 deraadt Exp $ */
/*
@@ -331,7 +331,7 @@ uipaq_break(struct uipaq_softc* sc, int onoff)
void
-uipaq_set(void *addr, int portno __unused, int reg, int onoff)
+uipaq_set(void *addr, int portno, int reg, int onoff)
{
struct uipaq_softc* sc = addr;
diff --git a/sys/dev/usb/uirda.c b/sys/dev/usb/uirda.c
index ea28a204d1c..1ddbab0f56a 100644
--- a/sys/dev/usb/uirda.c
+++ b/sys/dev/usb/uirda.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uirda.c,v 1.21 2006/10/12 01:32:00 christos Exp $ */
+/* $NetBSD: uirda.c,v 1.22 2006/11/16 01:33:27 christos Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uirda.c,v 1.21 2006/10/12 01:32:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uirda.c,v 1.22 2006/11/16 01:33:27 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -441,8 +441,8 @@ uirda_activate(device_ptr_t self, enum devact act)
}
int
-uirda_open(void *h, int flag __unused, int mode __unused,
- struct lwp *l __unused)
+uirda_open(void *h, int flag, int mode,
+ struct lwp *l)
{
struct uirda_softc *sc = h;
int error;
@@ -511,8 +511,8 @@ bad1:
}
int
-uirda_close(void *h, int flag __unused, int mode __unused,
- struct lwp *l __unused)
+uirda_close(void *h, int flag, int mode,
+ struct lwp *l)
{
struct uirda_softc *sc = h;
@@ -543,7 +543,7 @@ uirda_close(void *h, int flag __unused, int mode __unused,
}
int
-uirda_read(void *h, struct uio *uio, int flag __unused)
+uirda_read(void *h, struct uio *uio, int flag)
{
struct uirda_softc *sc = h;
usbd_status err;
@@ -605,7 +605,7 @@ uirda_read(void *h, struct uio *uio, int flag __unused)
}
int
-uirda_write(void *h, struct uio *uio, int flag __unused)
+uirda_write(void *h, struct uio *uio, int flag)
{
struct uirda_softc *sc = h;
usbd_status err;
@@ -696,7 +696,7 @@ filt_uirdardetach(struct knote *kn)
}
static int
-filt_uirdaread(struct knote *kn, long hint __unused)
+filt_uirdaread(struct knote *kn, long hint)
{
struct uirda_softc *sc = kn->kn_hook;
@@ -721,7 +721,7 @@ static const struct filterops uirdawrite_filtops =
{ 1, NULL, filt_uirdawdetach, filt_seltrue };
int
-uirda_kqfilter(void *h __unused, struct knote *kn)
+uirda_kqfilter(void *h, struct knote *kn)
{
struct uirda_softc *sc = kn->kn_hook;
struct klist *klist;
diff --git a/sys/dev/usb/ukbd.c b/sys/dev/usb/ukbd.c
index c41dc5b1141..26f5d7d5fc5 100644
--- a/sys/dev/usb/ukbd.c
+++ b/sys/dev/usb/ukbd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ukbd.c,v 1.93 2006/10/12 01:32:00 christos Exp $ */
+/* $NetBSD: ukbd.c,v 1.94 2006/11/16 01:33:27 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ukbd.c,v 1.93 2006/10/12 01:32:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ukbd.c,v 1.94 2006/11/16 01:33:27 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -278,7 +278,7 @@ const struct wskbd_mapdata ukbd_keymapdata = {
USB_DECLARE_DRIVER(ukbd);
int
-ukbd_match(struct device *parent __unused, struct cfdata *match __unused,
+ukbd_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct uhidev_attach_arg *uha = aux;
@@ -294,7 +294,7 @@ ukbd_match(struct device *parent __unused, struct cfdata *match __unused,
}
void
-ukbd_attach(struct device *parent __unused, struct device *self, void *aux)
+ukbd_attach(struct device *parent, struct device *self, void *aux)
{
struct ukbd_softc *sc = (struct ukbd_softc *)self;
struct uhidev_attach_arg *uha = aux;
@@ -458,7 +458,7 @@ ukbd_detach(struct device *self, int flags)
}
void
-ukbd_intr(struct uhidev *addr, void *ibuf, u_int len __unused)
+ukbd_intr(struct uhidev *addr, void *ibuf, u_int len)
{
struct ukbd_softc *sc = (struct ukbd_softc *)addr;
struct ukbd_data *ud = &sc->sc_ndata;
@@ -697,8 +697,8 @@ ukbd_rawrepeat(void *v)
#endif /* defined(WSDISPLAY_COMPAT_RAWKBD) && defined(UKBD_REPEAT) */
int
-ukbd_ioctl(void *v, u_long cmd, caddr_t data, int flag __unused,
- struct lwp *l __unused)
+ukbd_ioctl(void *v, u_long cmd, caddr_t data, int flag,
+ struct lwp *l)
{
struct ukbd_softc *sc = v;
diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c
index 91fd876e0c9..52d7dd4e000 100644
--- a/sys/dev/usb/ulpt.c
+++ b/sys/dev/usb/ulpt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ulpt.c,v 1.75 2006/10/12 01:32:00 christos Exp $ */
+/* $NetBSD: ulpt.c,v 1.76 2006/11/16 01:33:27 christos Exp $ */
/* $FreeBSD: src/sys/dev/usb/ulpt.c,v 1.24 1999/11/17 22:33:44 n_hibma Exp $ */
/*
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulpt.c,v 1.75 2006/10/12 01:32:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulpt.c,v 1.76 2006/11/16 01:33:27 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -500,7 +500,7 @@ int ulptusein = 1;
* Reset the printer, then wait until it's selected and not busy.
*/
int
-ulptopen(dev_t dev, int flag, int mode __unused, struct lwp *l __unused)
+ulptopen(dev_t dev, int flag, int mode, struct lwp *l)
{
u_char flags = ULPTFLAGS(dev);
struct ulpt_softc *sc;
@@ -646,8 +646,8 @@ ulpt_statusmsg(u_char status, struct ulpt_softc *sc)
}
int
-ulptclose(dev_t dev, int flag __unused, int mode __unused,
- struct lwp *l __unused)
+ulptclose(dev_t dev, int flag, int mode,
+ struct lwp *l)
{
struct ulpt_softc *sc;
@@ -689,7 +689,7 @@ ulptclose(dev_t dev, int flag __unused, int mode __unused,
}
int
-ulpt_do_write(struct ulpt_softc *sc, struct uio *uio, int flags __unused)
+ulpt_do_write(struct ulpt_softc *sc, struct uio *uio, int flags)
{
u_int32_t n;
int error = 0;
@@ -737,7 +737,7 @@ ulptwrite(dev_t dev, struct uio *uio, int flags)
}
int
-ulpt_do_read(struct ulpt_softc *sc, struct uio *uio, int flags __unused)
+ulpt_do_read(struct ulpt_softc *sc, struct uio *uio, int flags)
{
u_int32_t n, on;
int error = 0;
@@ -792,8 +792,8 @@ ulptread(dev_t dev, struct uio *uio, int flags)
}
void
-ulpt_read_cb(usbd_xfer_handle xfer, usbd_private_handle priv __unused,
- usbd_status status __unused)
+ulpt_read_cb(usbd_xfer_handle xfer, usbd_private_handle priv,
+ usbd_status status)
{
usbd_status err;
u_int32_t n;
@@ -833,8 +833,8 @@ ulpt_tick(void *xsc)
}
int
-ulptioctl(dev_t dev __unused, u_long cmd __unused, caddr_t data __unused,
- int flag __unused, struct lwp *l __unused)
+ulptioctl(dev_t dev, u_long cmd, caddr_t data,
+ int flag, struct lwp *l)
{
return ENODEV;
}
diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c
index dd52abf1acf..7b90040dcb6 100644
--- a/sys/dev/usb/umass.c
+++ b/sys/dev/usb/umass.c
@@ -1,4 +1,4 @@
-/* $NetBSD: umass.c,v 1.121 2006/10/12 01:32:00 christos Exp $ */
+/* $NetBSD: umass.c,v 1.122 2006/11/16 01:33:27 christos Exp $ */
/*
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -131,7 +131,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.121 2006/10/12 01:32:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.122 2006/11/16 01:33:27 christos Exp $");
#include "atapibus.h"
#include "scsibus.h"
@@ -1378,7 +1378,7 @@ umass_cbi_reset(struct umass_softc *sc, int status)
}
Static void
-umass_cbi_transfer(struct umass_softc *sc, int lun __unused,
+umass_cbi_transfer(struct umass_softc *sc, int lun,
void *cmd, int cmdlen, void *data, int datalen, int dir,
u_int timeout, umass_callback cb, void *priv)
{
diff --git a/sys/dev/usb/umass_isdata.c b/sys/dev/usb/umass_isdata.c
index c037163962d..dcc4468d07e 100644
--- a/sys/dev/usb/umass_isdata.c
+++ b/sys/dev/usb/umass_isdata.c
@@ -1,4 +1,4 @@
-/* $NetBSD: umass_isdata.c,v 1.15 2006/10/12 01:32:00 christos Exp $ */
+/* $NetBSD: umass_isdata.c,v 1.16 2006/11/16 01:33:27 christos Exp $ */
/*
* TODO:
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass_isdata.c,v 1.15 2006/10/12 01:32:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass_isdata.c,v 1.16 2006/11/16 01:33:27 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -379,22 +379,22 @@ uisdata_bio1(struct ata_drive_datas *drv, struct ata_bio *ata_bio)
}
void
-uisdata_reset_drive(struct ata_drive_datas *drv __unused, int flags __unused)
+uisdata_reset_drive(struct ata_drive_datas *drv, int flags)
{
DPRINTFN(-1,("%s\n", __func__));
/* XXX what? */
}
void
-uisdata_reset_channel(struct ata_channel *chp __unused, int flags __unused)
+uisdata_reset_channel(struct ata_channel *chp, int flags)
{
DPRINTFN(-1,("%s\n", __func__));
/* XXX what? */
}
void
-uisdata_exec_cb(struct umass_softc *sc __unused, void *priv,
- int residue __unused, int status)
+uisdata_exec_cb(struct umass_softc *sc, void *priv,
+ int residue, int status)
{
struct ata_command *cmd = priv;
@@ -476,7 +476,7 @@ done:
}
int
-uisdata_addref(struct ata_drive_datas *drv __unused)
+uisdata_addref(struct ata_drive_datas *drv)
{
DPRINTF(("%s\n", __func__));
/* Nothing to do */
@@ -484,7 +484,7 @@ uisdata_addref(struct ata_drive_datas *drv __unused)
}
void
-uisdata_delref(struct ata_drive_datas *drv __unused)
+uisdata_delref(struct ata_drive_datas *drv)
{
DPRINTF(("%s\n", __func__));
/* Nothing to do */
@@ -575,7 +575,7 @@ uisdata_get_params(struct ata_drive_datas *drvp, u_int8_t flags,
/* XXX join with wdc.c routine? */
int
-uwdprint(void *aux __unused, const char *pnp)
+uwdprint(void *aux, const char *pnp)
{
//struct ata_device *adev = aux;
if (pnp)
diff --git a/sys/dev/usb/umass_scsipi.c b/sys/dev/usb/umass_scsipi.c
index 56c87a54280..8c6e013e980 100644
--- a/sys/dev/usb/umass_scsipi.c
+++ b/sys/dev/usb/umass_scsipi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: umass_scsipi.c,v 1.28 2006/10/12 01:32:00 christos Exp $ */
+/* $NetBSD: umass_scsipi.c,v 1.29 2006/11/16 01:33:27 christos Exp $ */
/*
* Copyright (c) 2001, 2003 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass_scsipi.c,v 1.28 2006/10/12 01:32:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass_scsipi.c,v 1.29 2006/11/16 01:33:27 christos Exp $");
#include "atapibus.h"
#include "scsibus.h"
@@ -344,8 +344,8 @@ umass_scsipi_minphys(struct buf *bp)
}
int
-umass_scsipi_ioctl(struct scsipi_channel *chan __unused, u_long cmd,
- caddr_t arg __unused, int flag __unused, usb_proc_ptr p __unused)
+umass_scsipi_ioctl(struct scsipi_channel *chan, u_long cmd,
+ caddr_t arg, int flag, usb_proc_ptr p)
{
/*struct umass_softc *sc = link->adapter_softc;*/
/*struct umass_scsipi_softc *scbus = sc->bus;*/
diff --git a/sys/dev/usb/umct.c b/sys/dev/usb/umct.c
index 946d1674a2f..dafde69ff7f 100644
--- a/sys/dev/usb/umct.c
+++ b/sys/dev/usb/umct.c
@@ -1,4 +1,4 @@
-/* $NetBSD: umct.c,v 1.19 2006/10/12 01:32:00 christos Exp $ */
+/* $NetBSD: umct.c,v 1.20 2006/11/16 01:33:27 christos Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umct.c,v 1.19 2006/10/12 01:32:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umct.c,v 1.20 2006/11/16 01:33:27 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -377,7 +377,7 @@ umct_set_line_state(struct umct_softc *sc)
}
void
-umct_set(void *addr, int portno __unused, int reg, int onoff)
+umct_set(void *addr, int portno, int reg, int onoff)
{
struct umct_softc *sc = addr;
@@ -490,7 +490,7 @@ umct_init(struct umct_softc *sc)
}
int
-umct_param(void *addr, int portno __unused, struct termios *t)
+umct_param(void *addr, int portno, struct termios *t)
{
struct umct_softc *sc = addr;
u_int data = 0;
@@ -534,7 +534,7 @@ umct_param(void *addr, int portno __unused, struct termios *t)
}
int
-umct_open(void *addr, int portno __unused)
+umct_open(void *addr, int portno)
{
struct umct_softc *sc = addr;
int err, lcr_data;
@@ -567,7 +567,7 @@ umct_open(void *addr, int portno __unused)
}
void
-umct_close(void *addr, int portno __unused)
+umct_close(void *addr, int portno)
{
struct umct_softc *sc = addr;
int err;
@@ -592,7 +592,7 @@ umct_close(void *addr, int portno __unused)
}
void
-umct_intr(usbd_xfer_handle xfer __unused, usbd_private_handle priv,
+umct_intr(usbd_xfer_handle xfer, usbd_private_handle priv,
usbd_status status)
{
struct umct_softc *sc = priv;
@@ -625,7 +625,7 @@ umct_intr(usbd_xfer_handle xfer __unused, usbd_private_handle priv,
}
void
-umct_get_status(void *addr, int portno __unused, u_char *lsr, u_char *msr)
+umct_get_status(void *addr, int portno, u_char *lsr, u_char *msr)
{
struct umct_softc *sc = addr;
diff --git a/sys/dev/usb/umidi.c b/sys/dev/usb/umidi.c
index c15fdada8db..a9dada9a4a1 100644
--- a/sys/dev/usb/umidi.c
+++ b/sys/dev/usb/umidi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: umidi.c,v 1.27 2006/10/12 01:32:00 christos Exp $ */
+/* $NetBSD: umidi.c,v 1.28 2006/11/16 01:33:27 christos Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umidi.c,v 1.27 2006/10/12 01:32:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umidi.c,v 1.28 2006/11/16 01:33:27 christos Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -350,7 +350,7 @@ umidi_close(void *addr)
}
int
-umidi_channelmsg(void *addr, int status, int channel __unused, u_char *msg,
+umidi_channelmsg(void *addr, int status, int channel, u_char *msg,
int len)
{
struct umidi_mididev *mididev = addr;
@@ -362,7 +362,7 @@ umidi_channelmsg(void *addr, int status, int channel __unused, u_char *msg,
}
int
-umidi_commonmsg(void *addr, int status __unused, u_char *msg, int len)
+umidi_commonmsg(void *addr, int status, u_char *msg, int len)
{
struct umidi_mididev *mididev = addr;
int cin;
@@ -953,7 +953,7 @@ free_all_jacks(struct umidi_softc *sc)
}
static usbd_status
-bind_jacks_to_mididev(struct umidi_softc *sc __unused,
+bind_jacks_to_mididev(struct umidi_softc *sc,
struct umidi_jack *out_jack,
struct umidi_jack *in_jack,
struct umidi_mididev *mididev)
@@ -1550,7 +1550,7 @@ out_jack_output(struct umidi_jack *out_jack, u_char *src, int len, int cin)
static void
in_intr(usbd_xfer_handle xfer, usbd_private_handle priv,
- usbd_status status __unused)
+ usbd_status status)
{
int cn, len, i;
struct umidi_endpoint *ep = (struct umidi_endpoint *)priv;
@@ -1621,7 +1621,7 @@ in_intr(usbd_xfer_handle xfer, usbd_private_handle priv,
static void
out_intr(usbd_xfer_handle xfer, usbd_private_handle priv,
- usbd_status status __unused)
+ usbd_status status)
{
struct umidi_endpoint *ep = (struct umidi_endpoint *)priv;
struct umidi_softc *sc = ep->sc;
diff --git a/sys/dev/usb/umodem_common.c b/sys/dev/usb/umodem_common.c
index 72b8e99d27d..0adea455603 100644
--- a/sys/dev/usb/umodem_common.c
+++ b/sys/dev/usb/umodem_common.c
@@ -1,4 +1,4 @@
-/* $NetBSD: umodem_common.c,v 1.8 2006/10/12 01:32:00 christos Exp $ */
+/* $NetBSD: umodem_common.c,v 1.9 2006/11/16 01:33:27 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umodem_common.c,v 1.8 2006/10/12 01:32:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umodem_common.c,v 1.9 2006/11/16 01:33:27 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -265,7 +265,7 @@ umodem_common_attach(device_ptr_t self, struct umodem_softc *sc,
}
int
-umodem_open(void *addr, int portno __unused)
+umodem_open(void *addr, int portno)
{
struct umodem_softc *sc = addr;
int err;
@@ -289,7 +289,7 @@ umodem_open(void *addr, int portno __unused)
}
void
-umodem_close(void *addr, int portno __unused)
+umodem_close(void *addr, int portno)
{
struct umodem_softc *sc = addr;
int err;
@@ -310,7 +310,7 @@ umodem_close(void *addr, int portno __unused)
}
Static void
-umodem_intr(usbd_xfer_handle xfer __unused, usbd_private_handle priv,
+umodem_intr(usbd_xfer_handle xfer, usbd_private_handle priv,
usbd_status status)
{
struct umodem_softc *sc = priv;
@@ -411,7 +411,7 @@ umodem_get_caps(usbd_device_handle dev, int *cm, int *acm,
}
void
-umodem_get_status(void *addr, int portno __unused, u_char *lsr, u_char *msr)
+umodem_get_status(void *addr, int portno, u_char *lsr, u_char *msr)
{
struct umodem_softc *sc = addr;
@@ -424,7 +424,7 @@ umodem_get_status(void *addr, int portno __unused, u_char *lsr, u_char *msr)
}
int
-umodem_param(void *addr, int portno __unused, struct termios *t)
+umodem_param(void *addr, int portno, struct termios *t)
{
struct umodem_softc *sc = addr;
usbd_status err;
@@ -468,8 +468,8 @@ umodem_param(void *addr, int portno __unused, struct termios *t)
}
int
-umodem_ioctl(void *addr, int portno __unused, u_long cmd, caddr_t data,
- int flag __unused, usb_proc_ptr p __unused)
+umodem_ioctl(void *addr, int portno, u_long cmd, caddr_t data,
+ int flag, usb_proc_ptr p)
{
struct umodem_softc *sc = addr;
int error = 0;
@@ -561,7 +561,7 @@ umodem_break(struct umodem_softc *sc, int onoff)
}
void
-umodem_set(void *addr, int portno __unused, int reg, int onoff)
+umodem_set(void *addr, int portno, int reg, int onoff)
{
struct umodem_softc *sc = addr;
diff --git a/sys/dev/usb/ums.c b/sys/dev/usb/ums.c
index eb40819e812..dc3ec87deb4 100644
--- a/sys/dev/usb/ums.c
+++ b/sys/dev/usb/ums.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ums.c,v 1.66 2006/11/12 19:00:43 plunky Exp $ */
+/* $NetBSD: ums.c,v 1.67 2006/11/16 01:33:27 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.66 2006/11/12 19:00:43 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.67 2006/11/16 01:33:27 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -129,7 +129,7 @@ const struct wsmouse_accessops ums_accessops = {
USB_DECLARE_DRIVER(ums);
int
-ums_match(struct device *parent __unused, struct cfdata *match __unused,
+ums_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct uhidev_attach_arg *uha = aux;
@@ -145,7 +145,7 @@ ums_match(struct device *parent __unused, struct cfdata *match __unused,
}
void
-ums_attach(struct device *parent __unused, struct device *self, void *aux)
+ums_attach(struct device *parent, struct device *self, void *aux)
{
struct ums_softc *sc = (struct ums_softc *)self;
struct uhidev_attach_arg *uha = aux;
@@ -306,7 +306,7 @@ ums_detach(struct device *self, int flags)
}
void
-ums_intr(struct uhidev *addr, void *ibuf, u_int len __unused)
+ums_intr(struct uhidev *addr, void *ibuf, u_int len)
{
struct ums_softc *sc = (struct ums_softc *)addr;
int dx, dy, dz, dw;
@@ -379,8 +379,8 @@ ums_disable(void *v)
}
Static int
-ums_ioctl(void *v __unused, u_long cmd, caddr_t data, int flag __unused,
- struct lwp * p __unused)
+ums_ioctl(void *v, u_long cmd, caddr_t data, int flag,
+ struct lwp * p)
{
switch (cmd) {
diff --git a/sys/dev/usb/uplcom.c b/sys/dev/usb/uplcom.c
index cae3523036e..3550964a6e5 100644
--- a/sys/dev/usb/uplcom.c
+++ b/sys/dev/usb/uplcom.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uplcom.c,v 1.49 2006/10/12 01:32:00 christos Exp $ */
+/* $NetBSD: uplcom.c,v 1.50 2006/11/16 01:33:27 christos Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uplcom.c,v 1.49 2006/10/12 01:32:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uplcom.c,v 1.50 2006/11/16 01:33:27 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -519,7 +519,7 @@ uplcom_set_line_state(struct uplcom_softc *sc)
}
void
-uplcom_set(void *addr, int portno __unused, int reg, int onoff)
+uplcom_set(void *addr, int portno, int reg, int onoff)
{
struct uplcom_softc *sc = addr;
@@ -642,7 +642,7 @@ uplcom_set_line_coding(struct uplcom_softc *sc, usb_cdc_line_state_t *state)
}
int
-uplcom_param(void *addr, int portno __unused, struct termios *t)
+uplcom_param(void *addr, int portno, struct termios *t)
{
struct uplcom_softc *sc = addr;
usbd_status err;
@@ -720,7 +720,7 @@ uplcom_vendor_control_write(usbd_device_handle dev, u_int16_t value, u_int16_t i
}
int
-uplcom_open(void *addr, int portno __unused)
+uplcom_open(void *addr, int portno)
{
struct uplcom_softc *sc = addr;
usbd_status err;
@@ -753,7 +753,7 @@ uplcom_open(void *addr, int portno __unused)
}
void
-uplcom_close(void *addr, int portno __unused)
+uplcom_close(void *addr, int portno)
{
struct uplcom_softc *sc = addr;
int err;
@@ -778,7 +778,7 @@ uplcom_close(void *addr, int portno __unused)
}
void
-uplcom_intr(usbd_xfer_handle xfer __unused, usbd_private_handle priv,
+uplcom_intr(usbd_xfer_handle xfer, usbd_private_handle priv,
usbd_status status)
{
struct uplcom_softc *sc = priv;
@@ -810,7 +810,7 @@ uplcom_intr(usbd_xfer_handle xfer __unused, usbd_private_handle priv,
}
void
-uplcom_get_status(void *addr, int portno __unused, u_char *lsr, u_char *msr)
+uplcom_get_status(void *addr, int portno, u_char *lsr, u_char *msr)
{
struct uplcom_softc *sc = addr;
diff --git a/sys/dev/usb/urio.c b/sys/dev/usb/urio.c
index 1349126675a..0c5cde24a7b 100644
--- a/sys/dev/usb/urio.c
+++ b/sys/dev/usb/urio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: urio.c,v 1.25 2006/10/12 01:32:00 christos Exp $ */
+/* $NetBSD: urio.c,v 1.26 2006/11/16 01:33:27 christos Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: urio.c,v 1.25 2006/10/12 01:32:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: urio.c,v 1.26 2006/11/16 01:33:27 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -312,7 +312,7 @@ urio_activate(device_ptr_t self, enum devact act)
#endif
int
-urioopen(dev_t dev, int flag, int mode __unused, struct lwp *l __unused)
+urioopen(dev_t dev, int flag, int mode, struct lwp *l)
{
struct urio_softc *sc;
usbd_status err;
@@ -345,8 +345,8 @@ urioopen(dev_t dev, int flag, int mode __unused, struct lwp *l __unused)
}
int
-urioclose(dev_t dev, int flag __unused, int mode __unused,
- struct lwp *l __unused)
+urioclose(dev_t dev, int flag, int mode,
+ struct lwp *l)
{
struct urio_softc *sc;
USB_GET_SC(urio, URIOUNIT(dev), sc);
@@ -369,7 +369,7 @@ urioclose(dev_t dev, int flag __unused, int mode __unused,
}
int
-urioread(dev_t dev, struct uio *uio, int flag __unused)
+urioread(dev_t dev, struct uio *uio, int flag)
{
struct urio_softc *sc;
usbd_xfer_handle xfer;
@@ -426,7 +426,7 @@ urioread(dev_t dev, struct uio *uio, int flag __unused)
}
int
-uriowrite(dev_t dev, struct uio *uio, int flag __unused)
+uriowrite(dev_t dev, struct uio *uio, int flag)
{
struct urio_softc *sc;
usbd_xfer_handle xfer;
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index 24f8cffa205..634a8d3cb2d 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: usb.c,v 1.90 2006/10/31 20:43:31 joerg Exp $ */
+/* $NetBSD: usb.c,v 1.91 2006/11/16 01:33:27 christos Exp $ */
/*
* Copyright (c) 1998, 2002 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.90 2006/10/31 20:43:31 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.91 2006/11/16 01:33:27 christos Exp $");
#include "ohci.h"
#include "uhci.h"
@@ -287,7 +287,7 @@ usb_create_event_thread(void *arg)
* context ASAP.
*/
void
-usb_add_task(usbd_device_handle dev __unused, struct usb_task *task, int queue)
+usb_add_task(usbd_device_handle dev, struct usb_task *task, int queue)
{
struct usb_taskq *taskq;
int s;
@@ -306,7 +306,7 @@ usb_add_task(usbd_device_handle dev __unused, struct usb_task *task, int queue)
}
void
-usb_rem_task(usbd_device_handle dev __unused, struct usb_task *task)
+usb_rem_task(usbd_device_handle dev, struct usb_task *task)
{
struct usb_taskq *taskq;
int s;
@@ -394,7 +394,7 @@ usb_task_thread(void *arg)
}
int
-usbctlprint(void *aux __unused, const char *pnp)
+usbctlprint(void *aux, const char *pnp)
{
/* only "usb"es can attach to host controllers */
if (pnp)
@@ -405,7 +405,7 @@ usbctlprint(void *aux __unused, const char *pnp)
#endif /* defined(__NetBSD__) || defined(__OpenBSD__) */
int
-usbopen(dev_t dev, int flag __unused, int mode __unused, struct lwp *l __unused)
+usbopen(dev_t dev, int flag, int mode, struct lwp *l)
{
int unit = minor(dev);
struct usb_softc *sc;
@@ -461,8 +461,8 @@ usbread(dev_t dev, struct uio *uio, int flag)
}
int
-usbclose(dev_t dev, int flag __unused, int mode __unused,
- struct lwp *l __unused)
+usbclose(dev_t dev, int flag, int mode,
+ struct lwp *l)
{
int unit = minor(dev);
@@ -633,7 +633,7 @@ filt_usbrdetach(struct knote *kn)
}
static int
-filt_usbread(struct knote *kn, long hint __unused)
+filt_usbread(struct knote *kn, long hint)
{
if (usb_nevents == 0)
@@ -841,7 +841,7 @@ usb_activate(device_ptr_t self, enum devact act)
}
int
-usb_detach(device_ptr_t self, int flags __unused)
+usb_detach(device_ptr_t self, int flags)
{
struct usb_softc *sc = (struct usb_softc *)self;
struct usb_event *ue;
diff --git a/sys/dev/usb/usb_mem.c b/sys/dev/usb/usb_mem.c
index 103eb6a4af7..36b3176d098 100644
--- a/sys/dev/usb/usb_mem.c
+++ b/sys/dev/usb/usb_mem.c
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_mem.c,v 1.30 2006/10/12 01:32:00 christos Exp $ */
+/* $NetBSD: usb_mem.c,v 1.31 2006/11/16 01:33:27 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb_mem.c,v 1.30 2006/10/12 01:32:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_mem.c,v 1.31 2006/11/16 01:33:27 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -275,7 +275,7 @@ usb_allocmem(usbd_bus_handle bus, size_t size, size_t align, usb_dma_t *p)
}
void
-usb_freemem(usbd_bus_handle bus __unused, usb_dma_t *p)
+usb_freemem(usbd_bus_handle bus, usb_dma_t *p)
{
struct usb_frag_dma *f;
int s;
diff --git a/sys/dev/usb/usb_port.h b/sys/dev/usb/usb_port.h
index 127ea80eca6..8e6c47b6ece 100644
--- a/sys/dev/usb/usb_port.h
+++ b/sys/dev/usb/usb_port.h
@@ -1,5 +1,5 @@
/* $OpenBSD: usb_port.h,v 1.18 2000/09/06 22:42:10 rahnds Exp $ */
-/* $NetBSD: usb_port.h,v 1.72 2006/10/24 21:03:30 drochner Exp $ */
+/* $NetBSD: usb_port.h,v 1.73 2006/11/16 01:33:27 christos Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_port.h,v 1.21 1999/11/17 22:33:47 n_hibma Exp $ */
/*
@@ -155,14 +155,14 @@ CFATTACH_DECL(USB_DNAME(dname), \
___CONCAT(dname,_activate))
#define USB_MATCH(dname) \
-int __CONCAT(dname,_match)(struct device *parent __unused, \
- struct cfdata *match __unused, void *aux __unused)
+int __CONCAT(dname,_match)(struct device *parent, \
+ struct cfdata *match, void *aux)
#define USB_MATCH_START(dname, uaa) \
struct usb_attach_arg *uaa = aux
#define USB_ATTACH(dname) \
-void __CONCAT(dname,_attach)(struct device *parent __unused, \
+void __CONCAT(dname,_attach)(struct device *parent, \
struct device *self, void *aux)
#define USB_ATTACH_START(dname, sc, uaa) \
@@ -177,7 +177,7 @@ void __CONCAT(dname,_attach)(struct device *parent __unused, \
#define USB_ATTACH_SETUP printf("\n")
#define USB_DETACH(dname) \
-int __CONCAT(dname,_detach)(struct device *self __unused, int flags __unused)
+int __CONCAT(dname,_detach)(struct device *self, int flags)
#define USB_DETACH_START(dname, sc) \
struct __CONCAT(dname,_softc) *sc = \
diff --git a/sys/dev/usb/usb_subr.c b/sys/dev/usb/usb_subr.c
index e3b00bbd255..d26294bbbf9 100644
--- a/sys/dev/usb/usb_subr.c
+++ b/sys/dev/usb/usb_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_subr.c,v 1.137 2006/10/12 01:32:00 christos Exp $ */
+/* $NetBSD: usb_subr.c,v 1.138 2006/11/16 01:33:27 christos Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $ */
/*
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.137 2006/10/12 01:32:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.138 2006/11/16 01:33:27 christos Exp $");
#include "opt_usbverbose.h"
@@ -1201,7 +1201,7 @@ usbd_print(void *aux, const char *pnp)
#if defined(__NetBSD__)
int
usbd_submatch(struct device *parent, struct cfdata *cf,
- const int *ldesc __unused, void *aux)
+ const int *ldesc, void *aux)
{
#elif defined(__OpenBSD__)
int
diff --git a/sys/dev/usb/usbdi.c b/sys/dev/usb/usbdi.c
index 5092ed684bf..91e09836794 100644
--- a/sys/dev/usb/usbdi.c
+++ b/sys/dev/usb/usbdi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdi.c,v 1.113 2006/10/12 01:32:00 christos Exp $ */
+/* $NetBSD: usbdi.c,v 1.114 2006/11/16 01:33:27 christos Exp $ */
/* $FreeBSD: src/sys/dev/usb/usbdi.c,v 1.28 1999/11/17 22:33:49 n_hibma Exp $ */
/*
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.113 2006/10/12 01:32:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.114 2006/11/16 01:33:27 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1021,7 +1021,7 @@ usbd_do_request_flags_pipe(usbd_device_handle dev, usbd_pipe_handle pipe,
void
usbd_do_request_async_cb(usbd_xfer_handle xfer,
- usbd_private_handle priv __unused, usbd_status status __unused)
+ usbd_private_handle priv, usbd_status status)
{
#if defined(USB_DEBUG) || defined(DIAGNOSTIC)
if (xfer->actlen > xfer->length) {
diff --git a/sys/dev/usb/usbdi_util.c b/sys/dev/usb/usbdi_util.c
index 8faa0fc14f3..3a32bd4826d 100644
--- a/sys/dev/usb/usbdi_util.c
+++ b/sys/dev/usb/usbdi_util.c
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdi_util.c,v 1.46 2006/10/12 01:32:00 christos Exp $ */
+/* $NetBSD: usbdi_util.c,v 1.47 2006/11/16 01:33:27 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbdi_util.c,v 1.46 2006/10/12 01:32:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi_util.c,v 1.47 2006/11/16 01:33:27 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -427,8 +427,8 @@ usbd_get_config(usbd_device_handle dev, u_int8_t *conf)
Static void usbd_bulk_transfer_cb(usbd_xfer_handle xfer,
usbd_private_handle priv, usbd_status status);
Static void
-usbd_bulk_transfer_cb(usbd_xfer_handle xfer, usbd_private_handle priv __unused,
- usbd_status status __unused)
+usbd_bulk_transfer_cb(usbd_xfer_handle xfer, usbd_private_handle priv,
+ usbd_status status)
{
wakeup(xfer);
}
@@ -469,8 +469,8 @@ usbd_bulk_transfer(usbd_xfer_handle xfer, usbd_pipe_handle pipe,
Static void usbd_intr_transfer_cb(usbd_xfer_handle xfer,
usbd_private_handle priv, usbd_status status);
Static void
-usbd_intr_transfer_cb(usbd_xfer_handle xfer, usbd_private_handle priv __unused,
- usbd_status status __unused)
+usbd_intr_transfer_cb(usbd_xfer_handle xfer, usbd_private_handle priv,
+ usbd_status status)
{
wakeup(xfer);
}
diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c
index c8208b3ef0f..ec3fd79704b 100644
--- a/sys/dev/usb/uscanner.c
+++ b/sys/dev/usb/uscanner.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uscanner.c,v 1.53 2006/10/12 01:32:00 christos Exp $ */
+/* $NetBSD: uscanner.c,v 1.54 2006/11/16 01:33:27 christos Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uscanner.c,v 1.53 2006/10/12 01:32:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uscanner.c,v 1.54 2006/11/16 01:33:27 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -395,8 +395,8 @@ USB_ATTACH(uscanner)
}
int
-uscanneropen(dev_t dev, int flag __unused, int mode __unused,
- struct lwp *l __unused)
+uscanneropen(dev_t dev, int flag, int mode,
+ struct lwp *l)
{
struct uscanner_softc *sc;
int unit = USCANNERUNIT(dev);
@@ -459,8 +459,8 @@ uscanneropen(dev_t dev, int flag __unused, int mode __unused,
}
int
-uscannerclose(dev_t dev, int flag __unused, int mode __unused,
- struct lwp *l __unused)
+uscannerclose(dev_t dev, int flag, int mode,
+ struct lwp *l)
{
struct uscanner_softc *sc;
@@ -519,7 +519,7 @@ uscanner_do_close(struct uscanner_softc *sc)
}
Static int
-uscanner_do_read(struct uscanner_softc *sc, struct uio *uio, int flag __unused)
+uscanner_do_read(struct uscanner_softc *sc, struct uio *uio, int flag)
{
u_int32_t n, tn;
usbd_status err;
@@ -574,7 +574,7 @@ uscannerread(dev_t dev, struct uio *uio, int flag)
}
Static int
-uscanner_do_write(struct uscanner_softc *sc, struct uio *uio, int flag __unused)
+uscanner_do_write(struct uscanner_softc *sc, struct uio *uio, int flag)
{
u_int32_t n;
int error = 0;
@@ -702,7 +702,7 @@ USB_DETACH(uscanner)
}
int
-uscannerpoll(dev_t dev, int events, struct lwp *l __unused)
+uscannerpoll(dev_t dev, int events, struct lwp *l)
{
struct uscanner_softc *sc;
int revents = 0;
@@ -769,8 +769,8 @@ uscannerkqfilter(dev_t dev, struct knote *kn)
}
int
-uscannerioctl(dev_t dev __unused, u_long cmd __unused, caddr_t addr __unused,
- int flag __unused, struct lwp *l __unused)
+uscannerioctl(dev_t dev, u_long cmd, caddr_t addr,
+ int flag, struct lwp *l)
{
return (EINVAL);
}
diff --git a/sys/dev/usb/usscanner.c b/sys/dev/usb/usscanner.c
index 9e177457f99..280d2b1c333 100644
--- a/sys/dev/usb/usscanner.c
+++ b/sys/dev/usb/usscanner.c
@@ -1,4 +1,4 @@
-/* $NetBSD: usscanner.c,v 1.19 2006/10/12 01:32:00 christos Exp $ */
+/* $NetBSD: usscanner.c,v 1.20 2006/11/16 01:33:27 christos Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -54,7 +54,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usscanner.c,v 1.19 2006/10/12 01:32:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usscanner.c,v 1.20 2006/11/16 01:33:27 christos Exp $");
#include "scsibus.h"
#include <sys/param.h>
@@ -453,8 +453,8 @@ usscanner_sense(struct usscanner_softc *sc)
}
Static void
-usscanner_intr_cb(usbd_xfer_handle xfer __unused, usbd_private_handle priv,
- usbd_status status __unused)
+usscanner_intr_cb(usbd_xfer_handle xfer, usbd_private_handle priv,
+ usbd_status status)
{
struct usscanner_softc *sc = priv;
int s;
@@ -576,8 +576,8 @@ usscanner_done(struct usscanner_softc *sc)
}
Static void
-usscanner_sensecmd_cb(usbd_xfer_handle xfer __unused, usbd_private_handle priv,
- usbd_status status __unused)
+usscanner_sensecmd_cb(usbd_xfer_handle xfer, usbd_private_handle priv,
+ usbd_status status)
{
struct usscanner_softc *sc = priv;
struct scsipi_xfer *xs = sc->sc_xs;
@@ -621,7 +621,7 @@ usscanner_sensecmd_cb(usbd_xfer_handle xfer __unused, usbd_private_handle priv,
}
Static void
-usscanner_cmd_cb(usbd_xfer_handle xfer __unused, usbd_private_handle priv,
+usscanner_cmd_cb(usbd_xfer_handle xfer, usbd_private_handle priv,
usbd_status status)
{
struct usscanner_softc *sc = priv;
diff --git a/sys/dev/usb/ustir.c b/sys/dev/usb/ustir.c
index 1f86e827567..eedd8d38119 100644
--- a/sys/dev/usb/ustir.c
+++ b/sys/dev/usb/ustir.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ustir.c,v 1.16 2006/10/12 01:32:00 christos Exp $ */
+/* $NetBSD: ustir.c,v 1.17 2006/11/16 01:33:27 christos Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ustir.c,v 1.16 2006/10/12 01:32:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ustir.c,v 1.17 2006/11/16 01:33:27 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -857,8 +857,8 @@ ustir_activate(device_ptr_t self, enum devact act)
/* ARGSUSED */
Static int
-ustir_open(void *h, int flag __unused, int mode __unused,
- struct lwp *l __unused)
+ustir_open(void *h, int flag, int mode,
+ struct lwp *l)
{
struct ustir_softc *sc = h;
int error;
@@ -947,8 +947,8 @@ ustir_open(void *h, int flag __unused, int mode __unused,
/* ARGSUSED */
Static int
-ustir_close(void *h, int flag __unused, int mode __unused,
- struct lwp *l __unused)
+ustir_close(void *h, int flag, int mode,
+ struct lwp *l)
{
struct ustir_softc *sc = h;
@@ -997,7 +997,7 @@ ustir_close(void *h, int flag __unused, int mode __unused,
/* ARGSUSED */
Static int
-ustir_read(void *h, struct uio *uio, int flag __unused)
+ustir_read(void *h, struct uio *uio, int flag)
{
struct ustir_softc *sc = h;
int s;
@@ -1067,7 +1067,7 @@ ustir_read(void *h, struct uio *uio, int flag __unused)
/* ARGSUSED */
Static int
-ustir_write(void *h, struct uio *uio, int flag __unused)
+ustir_write(void *h, struct uio *uio, int flag)
{
struct ustir_softc *sc = h;
usbd_status err;
@@ -1232,7 +1232,7 @@ filt_ustirrdetach(struct knote *kn)
/* ARGSUSED */
static int
-filt_ustirread(struct knote *kn, long hint __unused)
+filt_ustirread(struct knote *kn, long hint)
{
struct ustir_softc *sc = kn->kn_hook;
@@ -1253,7 +1253,7 @@ filt_ustirwdetach(struct knote *kn)
/* ARGSUSED */
static int
-filt_ustirwrite(struct knote *kn, long hint __unused)
+filt_ustirwrite(struct knote *kn, long hint)
{
struct ustir_softc *sc = kn->kn_hook;
diff --git a/sys/dev/usb/utoppy.c b/sys/dev/usb/utoppy.c
index 772ea9e730f..e22e52dcf66 100644
--- a/sys/dev/usb/utoppy.c
+++ b/sys/dev/usb/utoppy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: utoppy.c,v 1.7 2006/10/12 01:32:00 christos Exp $ */
+/* $NetBSD: utoppy.c,v 1.8 2006/11/16 01:33:27 christos Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: utoppy.c,v 1.7 2006/10/12 01:32:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: utoppy.c,v 1.8 2006/11/16 01:33:27 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -512,8 +512,8 @@ utoppy_dump_packet(const void *b, size_t len)
*/
static void
utoppy_bulk_transfer_cb(usbd_xfer_handle xfer,
- usbd_private_handle priv __unused,
- usbd_status status __unused)
+ usbd_private_handle priv,
+ usbd_status status)
{
wakeup(xfer);
@@ -1332,8 +1332,8 @@ utoppy_readfile_next(struct utoppy_softc *sc)
}
int
-utoppyopen(dev_t dev, int flag __unused, int mode __unused,
- struct lwp *l __unused)
+utoppyopen(dev_t dev, int flag, int mode,
+ struct lwp *l)
{
struct utoppy_softc *sc;
int error = 0;
@@ -1417,8 +1417,8 @@ utoppyopen(dev_t dev, int flag __unused, int mode __unused,
}
int
-utoppyclose(dev_t dev, int flag __unused, int mode __unused,
- struct lwp *l __unused)
+utoppyclose(dev_t dev, int flag, int mode,
+ struct lwp *l)
{
struct utoppy_softc *sc;
usbd_status err;
@@ -1474,7 +1474,7 @@ utoppyclose(dev_t dev, int flag __unused, int mode __unused,
}
int
-utoppyread(dev_t dev, struct uio *uio, int flags __unused)
+utoppyread(dev_t dev, struct uio *uio, int flags)
{
struct utoppy_softc *sc;
struct utoppy_dirent ud;
@@ -1555,7 +1555,7 @@ utoppyread(dev_t dev, struct uio *uio, int flags __unused)
}
int
-utoppywrite(dev_t dev, struct uio *uio, int flags __unused)
+utoppywrite(dev_t dev, struct uio *uio, int flags)
{
struct utoppy_softc *sc;
uint16_t resp;
@@ -1658,8 +1658,8 @@ utoppywrite(dev_t dev, struct uio *uio, int flags __unused)
}
int
-utoppyioctl(dev_t dev, u_long cmd, caddr_t data, int flag __unused,
- struct lwp *l __unused)
+utoppyioctl(dev_t dev, u_long cmd, caddr_t data, int flag,
+ struct lwp *l)
{
struct utoppy_softc *sc;
struct utoppy_rename *ur;
diff --git a/sys/dev/usb/uvisor.c b/sys/dev/usb/uvisor.c
index 77f1f60ac9d..be1a7edb8fe 100644
--- a/sys/dev/usb/uvisor.c
+++ b/sys/dev/usb/uvisor.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uvisor.c,v 1.32 2006/10/12 01:32:00 christos Exp $ */
+/* $NetBSD: uvisor.c,v 1.33 2006/11/16 01:33:27 christos Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvisor.c,v 1.32 2006/10/12 01:32:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvisor.c,v 1.33 2006/11/16 01:33:27 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -469,7 +469,7 @@ uvisor_init(struct uvisor_softc *sc, struct uvisor_connection_info *ci,
}
void
-uvisor_close(void *addr, int portno __unused)
+uvisor_close(void *addr, int portno)
{
struct uvisor_softc *sc = addr;
usb_device_request_t req;
diff --git a/sys/dev/usb/uvscom.c b/sys/dev/usb/uvscom.c
index 8d428444ca9..c6669b25079 100644
--- a/sys/dev/usb/uvscom.c
+++ b/sys/dev/usb/uvscom.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uvscom.c,v 1.18 2006/10/12 01:32:00 christos Exp $ */
+/* $NetBSD: uvscom.c,v 1.19 2006/11/16 01:33:27 christos Exp $ */
/*-
* Copyright (c) 2001-2002, Shunsuke Akiyama <akiyama@jp.FreeBSD.org>.
* All rights reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvscom.c,v 1.18 2006/10/12 01:32:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvscom.c,v 1.19 2006/11/16 01:33:27 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -508,7 +508,7 @@ uvscom_shutdown(struct uvscom_softc *sc)
}
Static usbd_status
-uvscom_reset(struct uvscom_softc *sc __unused)
+uvscom_reset(struct uvscom_softc *sc)
{
DPRINTF(("%s: uvscom_reset\n", USBDEVNAME(sc->sc_dev)));
@@ -516,7 +516,7 @@ uvscom_reset(struct uvscom_softc *sc __unused)
}
Static usbd_status
-uvscom_set_crtscts(struct uvscom_softc *sc __unused)
+uvscom_set_crtscts(struct uvscom_softc *sc)
{
DPRINTF(("%s: uvscom_set_crtscts\n", USBDEVNAME(sc->sc_dev)));
@@ -635,7 +635,7 @@ uvscom_break(struct uvscom_softc *sc, int onoff)
}
Static void
-uvscom_set(void *addr, int portno __unused, int reg, int onoff)
+uvscom_set(void *addr, int portno, int reg, int onoff)
{
struct uvscom_softc *sc = addr;
@@ -655,7 +655,7 @@ uvscom_set(void *addr, int portno __unused, int reg, int onoff)
}
Static int
-uvscom_param(void *addr, int portno __unused, struct termios *t)
+uvscom_param(void *addr, int portno, struct termios *t)
{
struct uvscom_softc *sc = addr;
usbd_status err;
@@ -749,7 +749,7 @@ uvscom_param(void *addr, int portno __unused, struct termios *t)
}
Static int
-uvscom_open(void *addr, int portno __unused)
+uvscom_open(void *addr, int portno)
{
struct uvscom_softc *sc = addr;
int err;
@@ -818,7 +818,7 @@ uvscom_open(void *addr, int portno __unused)
}
Static void
-uvscom_close(void *addr, int portno __unused)
+uvscom_close(void *addr, int portno)
{
struct uvscom_softc *sc = addr;
int err;
@@ -847,7 +847,7 @@ uvscom_close(void *addr, int portno __unused)
}
Static void
-uvscom_intr(usbd_xfer_handle xfer __unused, usbd_private_handle priv,
+uvscom_intr(usbd_xfer_handle xfer, usbd_private_handle priv,
usbd_status status)
{
struct uvscom_softc *sc = priv;
@@ -892,7 +892,7 @@ uvscom_intr(usbd_xfer_handle xfer __unused, usbd_private_handle priv,
}
Static void
-uvscom_get_status(void *addr, int portno __unused, u_char *lsr, u_char *msr)
+uvscom_get_status(void *addr, int portno, u_char *lsr, u_char *msr)
{
struct uvscom_softc *sc = addr;
diff --git a/sys/dev/usb/uyap.c b/sys/dev/usb/uyap.c
index 44a49e08090..0f6fcdd7d15 100644
--- a/sys/dev/usb/uyap.c
+++ b/sys/dev/usb/uyap.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uyap.c,v 1.10 2006/10/12 01:32:00 christos Exp $ */
+/* $NetBSD: uyap.c,v 1.11 2006/11/16 01:33:27 christos Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uyap.c,v 1.10 2006/10/12 01:32:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uyap.c,v 1.11 2006/11/16 01:33:27 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -112,7 +112,7 @@ USB_DETACH(uyap)
}
int
-uyap_activate(device_ptr_t self __unused, enum devact act __unused)
+uyap_activate(device_ptr_t self, enum devact act)
{
return 0;
}
diff --git a/sys/dev/verified_exec.c b/sys/dev/verified_exec.c
index fc95e235755..e1ed8190569 100644
--- a/sys/dev/verified_exec.c
+++ b/sys/dev/verified_exec.c
@@ -1,4 +1,4 @@
-/* $NetBSD: verified_exec.c,v 1.47 2006/10/30 12:37:08 elad Exp $ */
+/* $NetBSD: verified_exec.c,v 1.48 2006/11/16 01:32:45 christos Exp $ */
/*-
* Copyright 2005 Elad Efrat <elad@NetBSD.org>
@@ -31,9 +31,9 @@
#include <sys/cdefs.h>
#if defined(__NetBSD__)
-__KERNEL_RCSID(0, "$NetBSD: verified_exec.c,v 1.47 2006/10/30 12:37:08 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: verified_exec.c,v 1.48 2006/11/16 01:32:45 christos Exp $");
#else
-__RCSID("$Id: verified_exec.c,v 1.47 2006/10/30 12:37:08 elad Exp $\n$NetBSD: verified_exec.c,v 1.47 2006/10/30 12:37:08 elad Exp $");
+__RCSID("$Id: verified_exec.c,v 1.48 2006/11/16 01:32:45 christos Exp $\n$NetBSD: verified_exec.c,v 1.48 2006/11/16 01:32:45 christos Exp $");
#endif
#include <sys/param.h>
@@ -115,8 +115,8 @@ int veriexecioctl(dev_t dev, u_long cmd, caddr_t data, int flags,
struct lwp *l);
void
-veriexecattach(DEVPORT_DEVICE *parent __unused, DEVPORT_DEVICE *self __unused,
- void *aux __unused)
+veriexecattach(DEVPORT_DEVICE *parent, DEVPORT_DEVICE *self,
+ void *aux)
{
veriexec_dev_usage = 0;
@@ -125,8 +125,8 @@ veriexecattach(DEVPORT_DEVICE *parent __unused, DEVPORT_DEVICE *self __unused,
}
int
-veriexecopen(dev_t dev __unused, int flags __unused,
- int fmt __unused, struct lwp *l __unused)
+veriexecopen(dev_t dev, int flags,
+ int fmt, struct lwp *l)
{
if (veriexec_verbose >= 2) {
log(LOG_DEBUG, "Veriexec: Pseudo-device open attempt by "
@@ -152,8 +152,8 @@ veriexecopen(dev_t dev __unused, int flags __unused,
}
int
-veriexecclose(dev_t dev __unused, int flags __unused, int fmt __unused,
- struct lwp *l __unused)
+veriexecclose(dev_t dev, int flags, int fmt,
+ struct lwp *l)
{
if (veriexec_dev_usage > 0)
veriexec_dev_usage--;
@@ -161,7 +161,7 @@ veriexecclose(dev_t dev __unused, int flags __unused, int fmt __unused,
}
int
-veriexecioctl(dev_t dev __unused, u_long cmd, caddr_t data, int flags __unused,
+veriexecioctl(dev_t dev, u_long cmd, caddr_t data, int flags,
struct lwp *l)
{
int error = 0;
@@ -203,7 +203,7 @@ veriexecioctl(dev_t dev __unused, u_long cmd, caddr_t data, int flags __unused,
#if defined(__FreeBSD__)
static void
-veriexec_drvinit(void *unused __unused)
+veriexec_drvinit(void *unused)
{
make_dev(&verifiedexec_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600,
"veriexec");
diff --git a/sys/dev/vnd.c b/sys/dev/vnd.c
index 1bf2e2567c9..29530921617 100644
--- a/sys/dev/vnd.c
+++ b/sys/dev/vnd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vnd.c,v 1.159 2006/11/11 13:42:14 jmmv Exp $ */
+/* $NetBSD: vnd.c,v 1.160 2006/11/16 01:32:45 christos Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -137,7 +137,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.159 2006/11/11 13:42:14 jmmv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.160 2006/11/16 01:32:45 christos Exp $");
#if defined(_KERNEL_OPT)
#include "fs_nfs.h"
@@ -258,7 +258,7 @@ static struct vnd_softc *vnd_spawn(int);
int vnd_destroy(struct device *);
void
-vndattach(int num __unused)
+vndattach(int num)
{
int error;
@@ -269,15 +269,15 @@ vndattach(int num __unused)
}
static int
-vnd_match(struct device *self __unused, struct cfdata *cfdata __unused,
- void *aux __unused)
+vnd_match(struct device *self, struct cfdata *cfdata,
+ void *aux)
{
return 1;
}
static void
-vnd_attach(struct device *parent __unused, struct device *self,
- void *aux __unused)
+vnd_attach(struct device *parent, struct device *self,
+ void *aux)
{
struct vnd_softc *sc = (struct vnd_softc *)self;
@@ -289,7 +289,7 @@ vnd_attach(struct device *parent __unused, struct device *self,
}
static int
-vnd_detach(struct device *self, int flags __unused)
+vnd_detach(struct device *self, int flags)
{
struct vnd_softc *sc = (struct vnd_softc *)self;
if (sc->sc_flags & VNF_INITED)
@@ -329,7 +329,7 @@ vnd_destroy(struct device *dev)
}
static int
-vndopen(dev_t dev, int flags __unused, int mode, struct lwp *l __unused)
+vndopen(dev_t dev, int flags, int mode, struct lwp *l)
{
int unit = vndunit(dev);
struct vnd_softc *sc;
@@ -394,7 +394,7 @@ vndopen(dev_t dev, int flags __unused, int mode, struct lwp *l __unused)
}
static int
-vndclose(dev_t dev, int flags __unused, int mode, struct lwp *l __unused)
+vndclose(dev_t dev, int flags, int mode, struct lwp *l)
{
int unit = vndunit(dev);
struct vnd_softc *sc;
@@ -854,7 +854,7 @@ vndiodone(struct buf *bp)
/* ARGSUSED */
static int
-vndread(dev_t dev, struct uio *uio, int flags __unused)
+vndread(dev_t dev, struct uio *uio, int flags)
{
int unit = vndunit(dev);
struct vnd_softc *sc;
@@ -876,7 +876,7 @@ vndread(dev_t dev, struct uio *uio, int flags __unused)
/* ARGSUSED */
static int
-vndwrite(dev_t dev, struct uio *uio, int flags __unused)
+vndwrite(dev_t dev, struct uio *uio, int flags)
{
int unit = vndunit(dev);
struct vnd_softc *sc;
@@ -1595,8 +1595,8 @@ vndsize(dev_t dev)
}
static int
-vnddump(dev_t dev __unused, daddr_t blkno __unused, caddr_t va __unused,
- size_t size __unused)
+vnddump(dev_t dev, daddr_t blkno, caddr_t va,
+ size_t size)
{
/* Not implemented. */
@@ -1829,13 +1829,13 @@ compstrategy(struct buf *bp, off_t bn)
/* compression memory allocation routines */
static void *
-vnd_alloc(void *aux __unused, u_int items, u_int siz)
+vnd_alloc(void *aux, u_int items, u_int siz)
{
return malloc(items * siz, M_TEMP, M_NOWAIT);
}
static void
-vnd_free(void *aux __unused, void *ptr)
+vnd_free(void *aux, void *ptr)
{
free(ptr, M_TEMP);
}
diff --git a/sys/dev/wscons/tpcalib.c b/sys/dev/wscons/tpcalib.c
index 361ff6d6014..3031bcc6a4d 100644
--- a/sys/dev/wscons/tpcalib.c
+++ b/sys/dev/wscons/tpcalib.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tpcalib.c,v 1.9 2006/10/12 01:32:06 christos Exp $ */
+/* $NetBSD: tpcalib.c,v 1.10 2006/11/16 01:33:31 christos Exp $ */
/*
* Copyright (c) 1999-2003 TAKEMURA Shin All rights reserved.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tpcalib.c,v 1.9 2006/10/12 01:32:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tpcalib.c,v 1.10 2006/11/16 01:33:31 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_tpcalib.h"
@@ -90,7 +90,7 @@ tpcalib_trans(struct tpcalib_softc *sc, int rawx, int rawy, int *x, int *y)
int
tpcalib_ioctl(struct tpcalib_softc *sc, u_long cmd, caddr_t data,
- int flag __unused, struct lwp *l __unused)
+ int flag, struct lwp *l)
{
const struct wsmouse_calibcoords *d;
int s;
diff --git a/sys/dev/wscons/wsdisplay.c b/sys/dev/wscons/wsdisplay.c
index 07bffb5719a..fc06a21837d 100644
--- a/sys/dev/wscons/wsdisplay.c
+++ b/sys/dev/wscons/wsdisplay.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wsdisplay.c,v 1.105 2006/11/06 19:51:12 macallan Exp $ */
+/* $NetBSD: wsdisplay.c,v 1.106 2006/11/16 01:33:31 christos Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.105 2006/11/06 19:51:12 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.106 2006/11/16 01:33:31 christos Exp $");
#include "opt_wsdisplay_compat.h"
#include "opt_wsmsgattrs.h"
@@ -499,7 +499,7 @@ wsdisplay_delscreen(struct wsdisplay_softc *sc, int idx, int flags)
* Autoconfiguration functions.
*/
int
-wsdisplay_emul_match(struct device *parent __unused, struct cfdata *match,
+wsdisplay_emul_match(struct device *parent, struct cfdata *match,
void *aux)
{
struct wsemuldisplaydev_attach_args *ap = aux;
@@ -522,7 +522,7 @@ wsdisplay_emul_match(struct device *parent __unused, struct cfdata *match,
}
void
-wsdisplay_emul_attach(struct device *parent __unused, struct device *self,
+wsdisplay_emul_attach(struct device *parent, struct device *self,
void *aux)
{
struct wsdisplay_softc *sc = (struct wsdisplay_softc *)self;
@@ -549,7 +549,7 @@ wsdisplay_emul_attach(struct device *parent __unused, struct device *self,
/* Print function (for parent devices). */
int
-wsemuldisplaydevprint(void *aux __unused, const char *pnp)
+wsemuldisplaydevprint(void *aux, const char *pnp)
{
#if 0 /* -Wunused */
struct wsemuldisplaydev_attach_args *ap = aux;
@@ -565,8 +565,8 @@ wsemuldisplaydevprint(void *aux __unused, const char *pnp)
}
int
-wsdisplay_noemul_match(struct device *parent __unused,
- struct cfdata *match __unused, void *aux __unused)
+wsdisplay_noemul_match(struct device *parent,
+ struct cfdata *match, void *aux)
{
#if 0 /* -Wunused */
struct wsdisplaydev_attach_args *ap = aux;
@@ -577,7 +577,7 @@ wsdisplay_noemul_match(struct device *parent __unused,
}
void
-wsdisplay_noemul_attach(struct device *parent __unused, struct device *self,
+wsdisplay_noemul_attach(struct device *parent, struct device *self,
void *aux)
{
struct wsdisplay_softc *sc = (struct wsdisplay_softc *)self;
@@ -590,7 +590,7 @@ wsdisplay_noemul_attach(struct device *parent __unused, struct device *self,
/* Print function (for parent devices). */
int
-wsdisplaydevprint(void *aux __unused, const char *pnp)
+wsdisplaydevprint(void *aux, const char *pnp)
{
#if 0 /* -Wunused */
struct wsdisplaydev_attach_args *ap = aux;
@@ -747,7 +747,7 @@ wsdisplay_preattach(const struct wsscreen_descr *type, void *cookie,
* Tty and cdevsw functions.
*/
int
-wsdisplayopen(dev_t dev, int flag __unused, int mode __unused, struct lwp *l)
+wsdisplayopen(dev_t dev, int flag, int mode, struct lwp *l)
{
struct wsdisplay_softc *sc;
struct tty *tp;
@@ -813,7 +813,7 @@ wsdisplayopen(dev_t dev, int flag __unused, int mode __unused, struct lwp *l)
}
int
-wsdisplayclose(dev_t dev, int flag, int mode __unused, struct lwp *l)
+wsdisplayclose(dev_t dev, int flag, int mode, struct lwp *l)
{
struct wsdisplay_softc *sc;
struct tty *tp;
@@ -1202,7 +1202,7 @@ wsdisplay_internal_ioctl(struct wsdisplay_softc *sc, struct wsscreen *scr,
int
wsdisplay_stat_ioctl(struct wsdisplay_softc *sc, u_long cmd, caddr_t data,
- int flag __unused, struct lwp *l __unused)
+ int flag, struct lwp *l)
{
switch (cmd) {
case WSDISPLAYIO_GETACTIVESCREEN:
@@ -1456,7 +1456,7 @@ wsdisplaystart(struct tty *tp)
}
void
-wsdisplaystop(struct tty *tp, int flag __unused)
+wsdisplaystop(struct tty *tp, int flag)
{
int s;
@@ -1857,7 +1857,7 @@ wsscreen_lookup_sync(struct wsscreen *scr,
* Interface to virtual screen stuff
*/
int
-wsdisplay_maxscreenidx(struct wsdisplay_softc *sc __unused)
+wsdisplay_maxscreenidx(struct wsdisplay_softc *sc)
{
return (WSDISPLAY_MAXSCREEN - 1);
}
@@ -1954,7 +1954,7 @@ wsdisplay_set_console_kbd(struct wsevsrc *src)
* Console interface.
*/
void
-wsdisplay_cnputc(dev_t dev __unused, int i)
+wsdisplay_cnputc(dev_t dev, int i)
{
struct wsscreen_internal *dc;
u_char c = i;
@@ -1972,14 +1972,14 @@ wsdisplay_cnputc(dev_t dev __unused, int i)
}
static int
-wsdisplay_getc_dummy(dev_t dev __unused)
+wsdisplay_getc_dummy(dev_t dev)
{
/* panic? */
return (0);
}
static void
-wsdisplay_pollc(dev_t dev __unused, int on)
+wsdisplay_pollc(dev_t dev, int on)
{
wsdisplay_cons_pollmode = on;
@@ -2035,7 +2035,7 @@ wsdisplay_switchtoconsole(void)
* Switch the console at shutdown.
*/
static void
-wsdisplay_shutdownhook(void *arg __unused)
+wsdisplay_shutdownhook(void *arg)
{
wsdisplay_switchtoconsole();
diff --git a/sys/dev/wscons/wsdisplay_compat_usl.c b/sys/dev/wscons/wsdisplay_compat_usl.c
index 66121d30d22..694c6c4b053 100644
--- a/sys/dev/wscons/wsdisplay_compat_usl.c
+++ b/sys/dev/wscons/wsdisplay_compat_usl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wsdisplay_compat_usl.c,v 1.36 2006/11/11 17:28:16 bjh21 Exp $ */
+/* $NetBSD: wsdisplay_compat_usl.c,v 1.37 2006/11/16 01:33:31 christos Exp $ */
/*
* Copyright (c) 1998
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsdisplay_compat_usl.c,v 1.36 2006/11/11 17:28:16 bjh21 Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsdisplay_compat_usl.c,v 1.37 2006/11/16 01:33:31 christos Exp $");
#include "opt_compat_freebsd.h"
#include "opt_compat_netbsd.h"
@@ -156,7 +156,7 @@ usl_sync_get(struct wsscreen *scr)
}
static int
-usl_detachproc(void *cookie, int waitok __unused,
+usl_detachproc(void *cookie, int waitok,
void (*callback)(void *, int, int), void *cbarg)
{
struct usl_syncdata *sd = cookie;
@@ -221,7 +221,7 @@ usl_detachtimeout(void *arg)
}
static int
-usl_attachproc(void *cookie, int waitok __unused,
+usl_attachproc(void *cookie, int waitok,
void (*callback)(void *, int, int), void *cbarg)
{
struct usl_syncdata *sd = cookie;
@@ -282,7 +282,7 @@ usl_attachtimeout(void *arg)
int
wsdisplay_usl_ioctl1(struct wsdisplay_softc *sc, u_long cmd, caddr_t data,
- int flag __unused, struct lwp *l __unused)
+ int flag, struct lwp *l)
{
int idx, maxidx;
diff --git a/sys/dev/wscons/wsdisplay_vcons.c b/sys/dev/wscons/wsdisplay_vcons.c
index e4cb5ee591e..2faf23d95d1 100644
--- a/sys/dev/wscons/wsdisplay_vcons.c
+++ b/sys/dev/wscons/wsdisplay_vcons.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wsdisplay_vcons.c,v 1.8 2006/10/12 01:32:06 christos Exp $ */
+/* $NetBSD: wsdisplay_vcons.c,v 1.9 2006/11/16 01:33:31 christos Exp $ */
/*-
* Copyright (c) 2005, 2006 Michael Lorenz
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsdisplay_vcons.c,v 1.8 2006/10/12 01:32:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsdisplay_vcons.c,v 1.9 2006/11/16 01:33:31 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -164,9 +164,9 @@ vcons_unlock(struct vcons_screen *scr)
}
static void
-vcons_dummy_init_screen(void *cookie __unused,
- struct vcons_screen *scr __unused, int exists __unused,
- long *defattr __unused)
+vcons_dummy_init_screen(void *cookie,
+ struct vcons_screen *scr, int exists,
+ long *defattr)
{
/*
@@ -460,7 +460,7 @@ vcons_free_screen(void *v, void *cookie)
}
static int
-vcons_show_screen(void *v, void *cookie, int waitok __unused,
+vcons_show_screen(void *v, void *cookie, int waitok,
void (*cb)(void *, int, int), void *cb_arg)
{
struct vcons_data *vd = v;
diff --git a/sys/dev/wscons/wsemul_dumb.c b/sys/dev/wscons/wsemul_dumb.c
index 6ffca8ff83f..4cc29ed590f 100644
--- a/sys/dev/wscons/wsemul_dumb.c
+++ b/sys/dev/wscons/wsemul_dumb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wsemul_dumb.c,v 1.13 2006/10/12 01:32:06 christos Exp $ */
+/* $NetBSD: wsemul_dumb.c,v 1.14 2006/11/16 01:33:31 christos Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsemul_dumb.c,v 1.13 2006/10/12 01:32:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsemul_dumb.c,v 1.14 2006/11/16 01:33:31 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -122,7 +122,7 @@ wsemul_dumb_attach(int console, const struct wsscreen_descr *type,
void
wsemul_dumb_output(void *cookie, const u_char *data, u_int count,
- int kernel __unused)
+ int kernel)
{
struct wsemul_dumb_emuldata *edp = cookie;
u_char c;
@@ -200,8 +200,8 @@ wsemul_dumb_output(void *cookie, const u_char *data, u_int count,
}
int
-wsemul_dumb_translate(void *cookie __unused, keysym_t in __unused,
- const char **out __unused)
+wsemul_dumb_translate(void *cookie, keysym_t in,
+ const char **out)
{
return (0);
}
diff --git a/sys/dev/wscons/wsemul_sun.c b/sys/dev/wscons/wsemul_sun.c
index 8a0103c7a42..489aa675ebd 100644
--- a/sys/dev/wscons/wsemul_sun.c
+++ b/sys/dev/wscons/wsemul_sun.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wsemul_sun.c,v 1.25 2006/10/12 01:32:06 christos Exp $ */
+/* $NetBSD: wsemul_sun.c,v 1.26 2006/11/16 01:33:31 christos Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -33,7 +33,7 @@
/* XXX DESCRIPTION/SOURCE OF INFORMATION */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsemul_sun.c,v 1.25 2006/10/12 01:32:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsemul_sun.c,v 1.26 2006/11/16 01:33:31 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -541,7 +541,7 @@ static const char *sun_fkeys[] = {
};
int
-wsemul_sun_translate(void *cookie __unused, keysym_t in, const char **out)
+wsemul_sun_translate(void *cookie, keysym_t in, const char **out)
{
static char c;
diff --git a/sys/dev/wscons/wsemul_vt100.c b/sys/dev/wscons/wsemul_vt100.c
index fb80851df80..af4b47940ea 100644
--- a/sys/dev/wscons/wsemul_vt100.c
+++ b/sys/dev/wscons/wsemul_vt100.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wsemul_vt100.c,v 1.29 2006/10/12 01:32:06 christos Exp $ */
+/* $NetBSD: wsemul_vt100.c,v 1.30 2006/11/16 01:33:31 christos Exp $ */
/*
* Copyright (c) 1998
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsemul_vt100.c,v 1.29 2006/10/12 01:32:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsemul_vt100.c,v 1.30 2006/11/16 01:33:31 christos Exp $");
#include "opt_wsmsgattrs.h"
@@ -726,7 +726,7 @@ wsemul_vt100_output_scs96_percent(struct wsemul_vt100_emuldata *edp, u_char c)
}
static u_int
-wsemul_vt100_output_esc_spc(struct wsemul_vt100_emuldata *edp __unused,
+wsemul_vt100_output_esc_spc(struct wsemul_vt100_emuldata *edp,
u_char c)
{
switch (c) {
diff --git a/sys/dev/wscons/wsevent.c b/sys/dev/wscons/wsevent.c
index 9d0bb3727ac..bd83b647d1f 100644
--- a/sys/dev/wscons/wsevent.c
+++ b/sys/dev/wscons/wsevent.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wsevent.c,v 1.21 2006/10/12 01:32:06 christos Exp $ */
+/* $NetBSD: wsevent.c,v 1.22 2006/11/16 01:33:31 christos Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -111,7 +111,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsevent.c,v 1.21 2006/10/12 01:32:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsevent.c,v 1.22 2006/11/16 01:33:31 christos Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -265,7 +265,7 @@ filt_wseventrdetach(struct knote *kn)
}
static int
-filt_wseventread(struct knote *kn, long hint __unused)
+filt_wseventread(struct knote *kn, long hint)
{
struct wseventvar *ev = kn->kn_hook;
diff --git a/sys/dev/wscons/wskbd.c b/sys/dev/wscons/wskbd.c
index 478dff41168..bbfb5fe5090 100644
--- a/sys/dev/wscons/wskbd.c
+++ b/sys/dev/wscons/wskbd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wskbd.c,v 1.97 2006/10/17 18:21:29 dogcow Exp $ */
+/* $NetBSD: wskbd.c,v 1.98 2006/11/16 01:33:31 christos Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.97 2006/10/17 18:21:29 dogcow Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.98 2006/11/16 01:33:31 christos Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -342,7 +342,7 @@ wskbd_update_layout(struct wskbd_internal *id, kbd_t enc)
* Print function (for parent devices).
*/
int
-wskbddevprint(void *aux __unused, const char *pnp)
+wskbddevprint(void *aux, const char *pnp)
{
#if 0
struct wskbddev_attach_args *ap = aux;
@@ -358,7 +358,7 @@ wskbddevprint(void *aux __unused, const char *pnp)
}
int
-wskbd_match(struct device *parent __unused, struct cfdata *match, void *aux)
+wskbd_match(struct device *parent, struct cfdata *match, void *aux)
{
struct wskbddev_attach_args *ap = aux;
@@ -378,7 +378,7 @@ wskbd_match(struct device *parent __unused, struct cfdata *match, void *aux)
}
void
-wskbd_attach(struct device *parent __unused, struct device *self, void *aux)
+wskbd_attach(struct device *parent, struct device *self, void *aux)
{
struct wskbd_softc *sc = (struct wskbd_softc *)self;
struct wskbddev_attach_args *ap = aux;
@@ -555,7 +555,7 @@ wskbd_activate(struct device *self, enum devact act)
* vnode and return (which will deallocate the softc).
*/
int
-wskbd_detach(struct device *self, int flags __unused)
+wskbd_detach(struct device *self, int flags)
{
struct wskbd_softc *sc = (struct wskbd_softc *)self;
struct wseventvar *evar;
@@ -782,7 +782,7 @@ wskbd_mux_open(struct wsevsrc *me, struct wseventvar *evp)
#endif
int
-wskbdopen(dev_t dev, int flags, int mode __unused, struct lwp *l)
+wskbdopen(dev_t dev, int flags, int mode, struct lwp *l)
{
struct wskbd_softc *sc;
struct wseventvar *evar;
@@ -839,8 +839,8 @@ wskbd_do_open(struct wskbd_softc *sc, struct wseventvar *evp)
}
int
-wskbdclose(dev_t dev, int flags __unused, int mode __unused,
- struct lwp *l __unused)
+wskbdclose(dev_t dev, int flags, int mode,
+ struct lwp *l)
{
struct wskbd_softc *sc =
(struct wskbd_softc *)wskbd_cd.cd_devs[minor(dev)];
@@ -1302,7 +1302,7 @@ wskbd_add_mux(int unit, struct wsmux_softc *muxsc)
* Console interface.
*/
int
-wskbd_cngetc(dev_t dev __unused)
+wskbd_cngetc(dev_t dev)
{
static int num = 0;
static int pos;
@@ -1344,7 +1344,7 @@ wskbd_cngetc(dev_t dev __unused)
}
void
-wskbd_cnpollc(dev_t dev __unused, int poll)
+wskbd_cnpollc(dev_t dev, int poll)
{
if (!wskbd_console_initted)
@@ -1359,7 +1359,7 @@ wskbd_cnpollc(dev_t dev __unused, int poll)
}
void
-wskbd_cnbell(dev_t dev __unused, u_int pitch, u_int period, u_int volume)
+wskbd_cnbell(dev_t dev, u_int pitch, u_int period, u_int volume)
{
if (!wskbd_console_initted)
diff --git a/sys/dev/wscons/wsmouse.c b/sys/dev/wscons/wsmouse.c
index 6100f1aed72..1bfef6462be 100644
--- a/sys/dev/wscons/wsmouse.c
+++ b/sys/dev/wscons/wsmouse.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wsmouse.c,v 1.49 2006/11/12 19:00:43 plunky Exp $ */
+/* $NetBSD: wsmouse.c,v 1.50 2006/11/16 01:33:31 christos Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -111,7 +111,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsmouse.c,v 1.49 2006/11/12 19:00:43 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsmouse.c,v 1.50 2006/11/16 01:33:31 christos Exp $");
#include "wsmouse.h"
#include "wsdisplay.h"
@@ -224,7 +224,7 @@ struct wssrcops wsmouse_srcops = {
* Print function (for parent devices).
*/
int
-wsmousedevprint(void *aux __unused, const char *pnp)
+wsmousedevprint(void *aux, const char *pnp)
{
if (pnp)
@@ -233,14 +233,14 @@ wsmousedevprint(void *aux __unused, const char *pnp)
}
int
-wsmouse_match(struct device *parent __unused, struct cfdata *match __unused,
- void *aux __unused)
+wsmouse_match(struct device *parent, struct cfdata *match,
+ void *aux)
{
return (1);
}
void
-wsmouse_attach(struct device *parent __unused, struct device *self, void *aux)
+wsmouse_attach(struct device *parent, struct device *self, void *aux)
{
struct wsmouse_softc *sc = (struct wsmouse_softc *)self;
struct wsmousedev_attach_args *ap = aux;
@@ -294,7 +294,7 @@ wsmouse_activate(struct device *self, enum devact act)
* vnode and return (which will deallocate the softc).
*/
int
-wsmouse_detach(struct device *self, int flags __unused)
+wsmouse_detach(struct device *self, int flags)
{
struct wsmouse_softc *sc = (struct wsmouse_softc *)self;
struct wseventvar *evar;
@@ -559,7 +559,7 @@ wsmouse_repeat(void *v)
}
int
-wsmouseopen(dev_t dev, int flags, int mode __unused, struct lwp *l)
+wsmouseopen(dev_t dev, int flags, int mode, struct lwp *l)
{
struct wsmouse_softc *sc;
struct wseventvar *evar;
@@ -600,8 +600,8 @@ wsmouseopen(dev_t dev, int flags, int mode __unused, struct lwp *l)
}
int
-wsmouseclose(dev_t dev, int flags __unused, int mode __unused,
- struct lwp *l __unused)
+wsmouseclose(dev_t dev, int flags, int mode,
+ struct lwp *l)
{
struct wsmouse_softc *sc =
(struct wsmouse_softc *)wsmouse_cd.cd_devs[minor(dev)];
diff --git a/sys/dev/wscons/wsmux.c b/sys/dev/wscons/wsmux.c
index 4096926f4cd..79a3b8ad391 100644
--- a/sys/dev/wscons/wsmux.c
+++ b/sys/dev/wscons/wsmux.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wsmux.c,v 1.45 2006/10/12 01:32:06 christos Exp $ */
+/* $NetBSD: wsmux.c,v 1.46 2006/11/16 01:33:31 christos Exp $ */
/*
* Copyright (c) 1998, 2005 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsmux.c,v 1.45 2006/10/12 01:32:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsmux.c,v 1.46 2006/11/16 01:33:31 christos Exp $");
#include "wsdisplay.h"
#include "wsmux.h"
@@ -140,7 +140,7 @@ struct wssrcops wsmux_srcops = {
/* From upper level */
void
-wsmuxattach(int n __unused)
+wsmuxattach(int n)
{
}
@@ -191,7 +191,7 @@ wsmux_getmux(int n)
* open() of the pseudo device from device table.
*/
int
-wsmuxopen(dev_t dev, int flags, int mode __unused, struct lwp *l)
+wsmuxopen(dev_t dev, int flags, int mode, struct lwp *l)
{
struct wsmux_softc *sc;
struct wseventvar *evar;
@@ -299,8 +299,8 @@ wsmux_do_open(struct wsmux_softc *sc, struct wseventvar *evar)
* close() of the pseudo device from device table.
*/
int
-wsmuxclose(dev_t dev, int flags __unused, int mode __unused,
- struct lwp *l __unused)
+wsmuxclose(dev_t dev, int flags, int mode,
+ struct lwp *l)
{
int minr = minor(dev);
struct wsmux_softc *sc = wsmuxdevs[WSMUXDEV(minr)];
diff --git a/sys/dev/wsfont/wsfontdev.c b/sys/dev/wsfont/wsfontdev.c
index 8d9507a8d53..a7eaa376a3d 100644
--- a/sys/dev/wsfont/wsfontdev.c
+++ b/sys/dev/wsfont/wsfontdev.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wsfontdev.c,v 1.12 2006/10/12 01:32:06 christos Exp $ */
+/* $NetBSD: wsfontdev.c,v 1.13 2006/11/16 01:33:31 christos Exp $ */
/*
* Copyright (c) 2001
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsfontdev.c,v 1.12 2006/10/12 01:32:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsfontdev.c,v 1.13 2006/11/16 01:33:31 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -44,15 +44,15 @@ void wsfontattach(int);
static int wsfont_isopen;
void
-wsfontattach(int n __unused)
+wsfontattach(int n)
{
wsfont_init();
}
static int
-wsfontopen(dev_t dev __unused, int flag __unused, int mode __unused,
- struct lwp *l __unused)
+wsfontopen(dev_t dev, int flag, int mode,
+ struct lwp *l)
{
if (wsfont_isopen)
@@ -62,8 +62,8 @@ wsfontopen(dev_t dev __unused, int flag __unused, int mode __unused,
}
static int
-wsfontclose(dev_t dev __unused, int flag __unused, int mode __unused,
- struct lwp *l __unused)
+wsfontclose(dev_t dev, int flag, int mode,
+ struct lwp *l)
{
wsfont_isopen = 0;
@@ -71,8 +71,8 @@ wsfontclose(dev_t dev __unused, int flag __unused, int mode __unused,
}
static int
-wsfontioctl(dev_t dev __unused, u_long cmd, caddr_t data, int flag __unused,
- struct lwp *l __unused)
+wsfontioctl(dev_t dev, u_long cmd, caddr_t data, int flag,
+ struct lwp *l)
{
char nbuf[16];
void *buf;