svn commit: r242625 - in head/sys: dev/ale dev/ata dev/ata/chipsets dev/ath/ath_hal/ar5212 dev/bge dev/cas dev/dc dev/flash dev/fxp dev/gem dev/lge dev/mii dev/nge dev/pci dev/re dev/sis dev/ste de...
Adrian Chadd
adrian at freebsd.org
Mon Nov 5 22:36:01 UTC 2012
Hi,
I'm fine with the change, but why didn't you run this by the various
driver owners first before doing a drive-by commit?
Adrian
On 5 November 2012 11:16, Dimitry Andric <dim at freebsd.org> wrote:
> Author: dim
> Date: Mon Nov 5 19:16:27 2012
> New Revision: 242625
> URL: http://svnweb.freebsd.org/changeset/base/242625
>
> Log:
> Remove duplicate const specifiers in many drivers (I hope I got all of
> them, please let me know if not). Most of these are of the form:
>
> static const struct bzzt_type {
> [...list of members...]
> } const bzzt_devs[] = {
> [...list of initializers...]
> };
>
> The second const is unnecessary, as arrays cannot be modified anyway,
> and if the elements are const, the whole thing is const automatically
> (e.g. it is placed in .rodata).
>
> I have verified this does not change the binary output of a full kernel
> build (except for build timestamps embedded in the object files).
>
> Reviewed by: yongari, marius
> MFC after: 1 week
>
> Modified:
> head/sys/dev/ale/if_ale.c
> head/sys/dev/ata/ata-card.c
> head/sys/dev/ata/chipsets/ata-acard.c
> head/sys/dev/ata/chipsets/ata-acerlabs.c
> head/sys/dev/ata/chipsets/ata-adaptec.c
> head/sys/dev/ata/chipsets/ata-amd.c
> head/sys/dev/ata/chipsets/ata-ati.c
> head/sys/dev/ata/chipsets/ata-highpoint.c
> head/sys/dev/ata/chipsets/ata-intel.c
> head/sys/dev/ata/chipsets/ata-ite.c
> head/sys/dev/ata/chipsets/ata-jmicron.c
> head/sys/dev/ata/chipsets/ata-marvell.c
> head/sys/dev/ata/chipsets/ata-nvidia.c
> head/sys/dev/ata/chipsets/ata-promise.c
> head/sys/dev/ata/chipsets/ata-serverworks.c
> head/sys/dev/ata/chipsets/ata-siliconimage.c
> head/sys/dev/ata/chipsets/ata-sis.c
> head/sys/dev/ata/chipsets/ata-via.c
> head/sys/dev/ath/ath_hal/ar5212/ar5212.h
> head/sys/dev/bge/if_bge.c
> head/sys/dev/cas/if_cas.c
> head/sys/dev/dc/if_dc.c
> head/sys/dev/flash/at45d.c
> head/sys/dev/fxp/if_fxp.c
> head/sys/dev/gem/if_gem_pci.c
> head/sys/dev/lge/if_lge.c
> head/sys/dev/mii/mii.c
> head/sys/dev/nge/if_nge.c
> head/sys/dev/pci/pci.c
> head/sys/dev/re/if_re.c
> head/sys/dev/sis/if_sis.c
> head/sys/dev/ste/if_ste.c
> head/sys/dev/stge/if_stge.c
> head/sys/dev/ti/if_ti.c
> head/sys/dev/tl/if_tl.c
> head/sys/dev/vr/if_vr.c
> head/sys/dev/wb/if_wb.c
> head/sys/dev/xl/if_xl.c
> head/sys/pci/if_rl.c
> head/sys/sparc64/pci/fire.c
> head/sys/sparc64/pci/psycho.c
> head/sys/sparc64/pci/schizo.c
>
> Modified: head/sys/dev/ale/if_ale.c
> ==============================================================================
> --- head/sys/dev/ale/if_ale.c Mon Nov 5 19:08:18 2012 (r242624)
> +++ head/sys/dev/ale/if_ale.c Mon Nov 5 19:16:27 2012 (r242625)
> @@ -95,7 +95,7 @@ static const struct ale_dev {
> uint16_t ale_vendorid;
> uint16_t ale_deviceid;
> const char *ale_name;
> -} const ale_devs[] = {
> +} ale_devs[] = {
> { VENDORID_ATHEROS, DEVICEID_ATHEROS_AR81XX,
> "Atheros AR8121/AR8113/AR8114 PCIe Ethernet" },
> };
>
> Modified: head/sys/dev/ata/ata-card.c
> ==============================================================================
> --- head/sys/dev/ata/ata-card.c Mon Nov 5 19:08:18 2012 (r242624)
> +++ head/sys/dev/ata/ata-card.c Mon Nov 5 19:16:27 2012 (r242625)
> @@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$");
>
> #include "pccarddevs.h"
>
> -static const struct pccard_product const ata_pccard_products[] = {
> +static const struct pccard_product ata_pccard_products[] = {
> PCMCIA_CARD(FREECOM, PCCARDIDE),
> PCMCIA_CARD(EXP, EXPMULTIMEDIA),
> PCMCIA_CARD(IODATA3, CBIDE2),
>
> Modified: head/sys/dev/ata/chipsets/ata-acard.c
> ==============================================================================
> --- head/sys/dev/ata/chipsets/ata-acard.c Mon Nov 5 19:08:18 2012 (r242624)
> +++ head/sys/dev/ata/chipsets/ata-acard.c Mon Nov 5 19:16:27 2012 (r242625)
> @@ -81,7 +81,7 @@ static int
> ata_acard_probe(device_t dev)
> {
> struct ata_pci_controller *ctlr = device_get_softc(dev);
> - static const struct ata_chip_id const ids[] =
> + static const struct ata_chip_id ids[] =
> {{ ATA_ATP850R, 0, ATP_OLD, 0x00, ATA_UDMA2, "ATP850" },
> { ATA_ATP860A, 0, 0, 0x00, ATA_UDMA4, "ATP860A" },
> { ATA_ATP860R, 0, 0, 0x00, ATA_UDMA4, "ATP860R" },
>
> Modified: head/sys/dev/ata/chipsets/ata-acerlabs.c
> ==============================================================================
> --- head/sys/dev/ata/chipsets/ata-acerlabs.c Mon Nov 5 19:08:18 2012 (r242624)
> +++ head/sys/dev/ata/chipsets/ata-acerlabs.c Mon Nov 5 19:16:27 2012 (r242625)
> @@ -75,7 +75,7 @@ static int
> ata_ali_probe(device_t dev)
> {
> struct ata_pci_controller *ctlr = device_get_softc(dev);
> - static const struct ata_chip_id const ids[] =
> + static const struct ata_chip_id ids[] =
> {{ ATA_ALI_5289, 0x00, 2, ALI_SATA, ATA_SA150, "M5289" },
> { ATA_ALI_5288, 0x00, 4, ALI_SATA, ATA_SA300, "M5288" },
> { ATA_ALI_5287, 0x00, 4, ALI_SATA, ATA_SA150, "M5287" },
>
> Modified: head/sys/dev/ata/chipsets/ata-adaptec.c
> ==============================================================================
> --- head/sys/dev/ata/chipsets/ata-adaptec.c Mon Nov 5 19:08:18 2012 (r242624)
> +++ head/sys/dev/ata/chipsets/ata-adaptec.c Mon Nov 5 19:16:27 2012 (r242625)
> @@ -62,7 +62,7 @@ static int
> ata_adaptec_probe(device_t dev)
> {
> struct ata_pci_controller *ctlr = device_get_softc(dev);
> - static const struct ata_chip_id const ids[] =
> + static const struct ata_chip_id ids[] =
> {{ ATA_ADAPTEC_1420, 0, 4, MV_60XX, ATA_SA300, "1420SA" },
> { ATA_ADAPTEC_1430, 0, 4, MV_7042, ATA_SA300, "1430SA" },
> { 0, 0, 0, 0, 0, 0}};
>
> Modified: head/sys/dev/ata/chipsets/ata-amd.c
> ==============================================================================
> --- head/sys/dev/ata/chipsets/ata-amd.c Mon Nov 5 19:08:18 2012 (r242624)
> +++ head/sys/dev/ata/chipsets/ata-amd.c Mon Nov 5 19:16:27 2012 (r242625)
> @@ -67,7 +67,7 @@ static int
> ata_amd_probe(device_t dev)
> {
> struct ata_pci_controller *ctlr = device_get_softc(dev);
> - static const struct ata_chip_id const ids[] =
> + static const struct ata_chip_id ids[] =
> {{ ATA_AMD756, 0x00, 0x00, 0, ATA_UDMA4, "756" },
> { ATA_AMD766, 0x00, AMD_CABLE|AMD_BUG, 0, ATA_UDMA5, "766" },
> { ATA_AMD768, 0x00, AMD_CABLE, 0, ATA_UDMA5, "768" },
>
> Modified: head/sys/dev/ata/chipsets/ata-ati.c
> ==============================================================================
> --- head/sys/dev/ata/chipsets/ata-ati.c Mon Nov 5 19:08:18 2012 (r242624)
> +++ head/sys/dev/ata/chipsets/ata-ati.c Mon Nov 5 19:16:27 2012 (r242625)
> @@ -75,7 +75,7 @@ static int
> ata_ati_probe(device_t dev)
> {
> struct ata_pci_controller *ctlr = device_get_softc(dev);
> - static const struct ata_chip_id const ids[] =
> + static const struct ata_chip_id ids[] =
> {{ ATA_ATI_IXP200, 0x00, ATI_PATA, 0, ATA_UDMA5, "IXP200" },
> { ATA_ATI_IXP300, 0x00, ATI_PATA, 0, ATA_UDMA6, "IXP300" },
> { ATA_ATI_IXP300_S1, 0x00, ATI_SATA, SII_BUG, ATA_SA150, "IXP300" },
>
> Modified: head/sys/dev/ata/chipsets/ata-highpoint.c
> ==============================================================================
> --- head/sys/dev/ata/chipsets/ata-highpoint.c Mon Nov 5 19:08:18 2012 (r242624)
> +++ head/sys/dev/ata/chipsets/ata-highpoint.c Mon Nov 5 19:16:27 2012 (r242625)
> @@ -73,7 +73,7 @@ ata_highpoint_probe(device_t dev)
> {
> struct ata_pci_controller *ctlr = device_get_softc(dev);
> const struct ata_chip_id *idx;
> - static const struct ata_chip_id const ids[] =
> + static const struct ata_chip_id ids[] =
> {{ ATA_HPT374, 0x07, HPT_374, 0, ATA_UDMA6, "HPT374" },
> { ATA_HPT372, 0x02, HPT_372, 0, ATA_UDMA6, "HPT372N" },
> { ATA_HPT372, 0x01, HPT_372, 0, ATA_UDMA6, "HPT372" },
>
> Modified: head/sys/dev/ata/chipsets/ata-intel.c
> ==============================================================================
> --- head/sys/dev/ata/chipsets/ata-intel.c Mon Nov 5 19:08:18 2012 (r242624)
> +++ head/sys/dev/ata/chipsets/ata-intel.c Mon Nov 5 19:16:27 2012 (r242625)
> @@ -105,7 +105,7 @@ static int
> ata_intel_probe(device_t dev)
> {
> struct ata_pci_controller *ctlr = device_get_softc(dev);
> - static const struct ata_chip_id const ids[] =
> + static const struct ata_chip_id ids[] =
> {{ ATA_I82371FB, 0, 0, 2, ATA_WDMA2, "PIIX" },
> { ATA_I82371SB, 0, 0, 2, ATA_WDMA2, "PIIX3" },
> { ATA_I82371AB, 0, 0, 2, ATA_UDMA2, "PIIX4" },
>
> Modified: head/sys/dev/ata/chipsets/ata-ite.c
> ==============================================================================
> --- head/sys/dev/ata/chipsets/ata-ite.c Mon Nov 5 19:08:18 2012 (r242624)
> +++ head/sys/dev/ata/chipsets/ata-ite.c Mon Nov 5 19:16:27 2012 (r242625)
> @@ -64,7 +64,7 @@ static int
> ata_ite_probe(device_t dev)
> {
> struct ata_pci_controller *ctlr = device_get_softc(dev);
> - static const struct ata_chip_id const ids[] =
> + static const struct ata_chip_id ids[] =
> {{ ATA_IT8213F, 0x00, 0x00, 0x00, ATA_UDMA6, "IT8213F" },
> { ATA_IT8212F, 0x00, 0x00, 0x00, ATA_UDMA6, "IT8212F" },
> { ATA_IT8211F, 0x00, 0x00, 0x00, ATA_UDMA6, "IT8211F" },
>
> Modified: head/sys/dev/ata/chipsets/ata-jmicron.c
> ==============================================================================
> --- head/sys/dev/ata/chipsets/ata-jmicron.c Mon Nov 5 19:08:18 2012 (r242624)
> +++ head/sys/dev/ata/chipsets/ata-jmicron.c Mon Nov 5 19:16:27 2012 (r242625)
> @@ -64,7 +64,7 @@ ata_jmicron_probe(device_t dev)
> {
> struct ata_pci_controller *ctlr = device_get_softc(dev);
> const struct ata_chip_id *idx;
> - static const struct ata_chip_id const ids[] =
> + static const struct ata_chip_id ids[] =
> {{ ATA_JMB360, 0, 1, 0, ATA_SA300, "JMB360" },
> { ATA_JMB361, 0, 1, 1, ATA_UDMA6, "JMB361" },
> { ATA_JMB362, 0, 2, 0, ATA_SA300, "JMB362" },
>
> Modified: head/sys/dev/ata/chipsets/ata-marvell.c
> ==============================================================================
> --- head/sys/dev/ata/chipsets/ata-marvell.c Mon Nov 5 19:08:18 2012 (r242624)
> +++ head/sys/dev/ata/chipsets/ata-marvell.c Mon Nov 5 19:16:27 2012 (r242625)
> @@ -99,7 +99,7 @@ static int
> ata_marvell_probe(device_t dev)
> {
> struct ata_pci_controller *ctlr = device_get_softc(dev);
> - static const struct ata_chip_id const ids[] =
> + static const struct ata_chip_id ids[] =
> {{ ATA_M88SX5040, 0, 4, MV_50XX, ATA_SA150, "88SX5040" },
> { ATA_M88SX5041, 0, 4, MV_50XX, ATA_SA150, "88SX5041" },
> { ATA_M88SX5080, 0, 8, MV_50XX, ATA_SA150, "88SX5080" },
>
> Modified: head/sys/dev/ata/chipsets/ata-nvidia.c
> ==============================================================================
> --- head/sys/dev/ata/chipsets/ata-nvidia.c Mon Nov 5 19:08:18 2012 (r242624)
> +++ head/sys/dev/ata/chipsets/ata-nvidia.c Mon Nov 5 19:16:27 2012 (r242625)
> @@ -75,7 +75,7 @@ static int
> ata_nvidia_probe(device_t dev)
> {
> struct ata_pci_controller *ctlr = device_get_softc(dev);
> - static const struct ata_chip_id const ids[] =
> + static const struct ata_chip_id ids[] =
> {{ ATA_NFORCE1, 0, 0, 0, ATA_UDMA5, "nForce" },
> { ATA_NFORCE2, 0, 0, 0, ATA_UDMA6, "nForce2" },
> { ATA_NFORCE2_PRO, 0, 0, 0, ATA_UDMA6, "nForce2 Pro" },
>
> Modified: head/sys/dev/ata/chipsets/ata-promise.c
> ==============================================================================
> --- head/sys/dev/ata/chipsets/ata-promise.c Mon Nov 5 19:08:18 2012 (r242624)
> +++ head/sys/dev/ata/chipsets/ata-promise.c Mon Nov 5 19:16:27 2012 (r242625)
> @@ -130,7 +130,7 @@ ata_promise_probe(device_t dev)
> {
> struct ata_pci_controller *ctlr = device_get_softc(dev);
> const struct ata_chip_id *idx;
> - static const struct ata_chip_id const ids[] =
> + static const struct ata_chip_id ids[] =
> {{ ATA_PDC20246, 0, PR_OLD, 0x00, ATA_UDMA2, "PDC20246" },
> { ATA_PDC20262, 0, PR_NEW, 0x00, ATA_UDMA4, "PDC20262" },
> { ATA_PDC20263, 0, PR_NEW, 0x00, ATA_UDMA4, "PDC20263" },
>
> Modified: head/sys/dev/ata/chipsets/ata-serverworks.c
> ==============================================================================
> --- head/sys/dev/ata/chipsets/ata-serverworks.c Mon Nov 5 19:08:18 2012 (r242624)
> +++ head/sys/dev/ata/chipsets/ata-serverworks.c Mon Nov 5 19:16:27 2012 (r242625)
> @@ -75,7 +75,7 @@ static int
> ata_serverworks_probe(device_t dev)
> {
> struct ata_pci_controller *ctlr = device_get_softc(dev);
> - static const struct ata_chip_id const ids[] =
> + static const struct ata_chip_id ids[] =
> {{ ATA_ROSB4, 0x00, SWKS_33, 0, ATA_WDMA2, "ROSB4" },
> { ATA_CSB5, 0x92, SWKS_100, 0, ATA_UDMA5, "CSB5" },
> { ATA_CSB5, 0x00, SWKS_66, 0, ATA_UDMA4, "CSB5" },
>
> Modified: head/sys/dev/ata/chipsets/ata-siliconimage.c
> ==============================================================================
> --- head/sys/dev/ata/chipsets/ata-siliconimage.c Mon Nov 5 19:08:18 2012 (r242624)
> +++ head/sys/dev/ata/chipsets/ata-siliconimage.c Mon Nov 5 19:16:27 2012 (r242625)
> @@ -87,7 +87,7 @@ static int
> ata_sii_probe(device_t dev)
> {
> struct ata_pci_controller *ctlr = device_get_softc(dev);
> - static const struct ata_chip_id const ids[] =
> + static const struct ata_chip_id ids[] =
> {{ ATA_SII3114, 0x00, SII_MEMIO, SII_4CH, ATA_SA150, "3114" },
> { ATA_SII3512, 0x02, SII_MEMIO, 0, ATA_SA150, "3512" },
> { ATA_SII3112, 0x02, SII_MEMIO, 0, ATA_SA150, "3112" },
>
> Modified: head/sys/dev/ata/chipsets/ata-sis.c
> ==============================================================================
> --- head/sys/dev/ata/chipsets/ata-sis.c Mon Nov 5 19:08:18 2012 (r242624)
> +++ head/sys/dev/ata/chipsets/ata-sis.c Mon Nov 5 19:16:27 2012 (r242625)
> @@ -74,7 +74,7 @@ ata_sis_probe(device_t dev)
> {
> struct ata_pci_controller *ctlr = device_get_softc(dev);
> const struct ata_chip_id *idx;
> - static const struct ata_chip_id const ids[] =
> + static const struct ata_chip_id ids[] =
> {{ ATA_SIS182, 0x00, SIS_SATA, 0, ATA_SA150, "182" }, /* south */
> { ATA_SIS181, 0x00, SIS_SATA, 0, ATA_SA150, "181" }, /* south */
> { ATA_SIS180, 0x00, SIS_SATA, 0, ATA_SA150, "180" }, /* south */
>
> Modified: head/sys/dev/ata/chipsets/ata-via.c
> ==============================================================================
> --- head/sys/dev/ata/chipsets/ata-via.c Mon Nov 5 19:08:18 2012 (r242624)
> +++ head/sys/dev/ata/chipsets/ata-via.c Mon Nov 5 19:16:27 2012 (r242625)
> @@ -89,7 +89,7 @@ static int
> ata_via_probe(device_t dev)
> {
> struct ata_pci_controller *ctlr = device_get_softc(dev);
> - static const struct ata_chip_id const ids[] =
> + static const struct ata_chip_id ids[] =
> {{ ATA_VIA82C586, 0x02, VIA33, 0x00, ATA_UDMA2, "82C586B" },
> { ATA_VIA82C586, 0x00, VIA33, 0x00, ATA_WDMA2, "82C586" },
> { ATA_VIA82C596, 0x12, VIA66, VIACLK, ATA_UDMA4, "82C596B" },
> @@ -113,7 +113,7 @@ ata_via_probe(device_t dev)
> { ATA_VIAVX855, 0x00, VIA133, 0x00, ATA_UDMA6, "VX855" },
> { ATA_VIAVX900, 0x00, VIA133, VIASATA, ATA_SA300, "VX900" },
> { 0, 0, 0, 0, 0, 0 }};
> - static const struct ata_chip_id const new_ids[] =
> + static const struct ata_chip_id new_ids[] =
> {{ ATA_VIA6410, 0x00, 0, 0x00, ATA_UDMA6, "6410" },
> { ATA_VIA6420, 0x00, 7, 0x00, ATA_SA150, "6420" },
> { ATA_VIA6421, 0x00, 6, VIABAR, ATA_SA150, "6421" },
>
> Modified: head/sys/dev/ath/ath_hal/ar5212/ar5212.h
> ==============================================================================
> --- head/sys/dev/ath/ath_hal/ar5212/ar5212.h Mon Nov 5 19:08:18 2012 (r242624)
> +++ head/sys/dev/ath/ath_hal/ar5212/ar5212.h Mon Nov 5 19:16:27 2012 (r242625)
> @@ -143,7 +143,7 @@ typedef struct RfHalFuncs {
> int16_t *minPower, int16_t *maxPower,
> const struct ieee80211_channel *, uint16_t *rfXpdGain);
> HAL_BOOL (*getChannelMaxMinPower)(struct ath_hal *ah,
> - const const struct ieee80211_channel *,
> + const struct ieee80211_channel *,
> int16_t *maxPow, int16_t *minPow);
> int16_t (*getNfAdjust)(struct ath_hal *, const HAL_CHANNEL_INTERNAL*);
> } RF_HAL_FUNCS;
>
> Modified: head/sys/dev/bge/if_bge.c
> ==============================================================================
> --- head/sys/dev/bge/if_bge.c Mon Nov 5 19:08:18 2012 (r242624)
> +++ head/sys/dev/bge/if_bge.c Mon Nov 5 19:16:27 2012 (r242625)
> @@ -139,7 +139,7 @@ MODULE_DEPEND(bge, miibus, 1, 1, 1);
> static const struct bge_type {
> uint16_t bge_vid;
> uint16_t bge_did;
> -} const bge_devs[] = {
> +} bge_devs[] = {
> { ALTEON_VENDORID, ALTEON_DEVICEID_BCM5700 },
> { ALTEON_VENDORID, ALTEON_DEVICEID_BCM5701 },
>
> @@ -239,7 +239,7 @@ static const struct bge_type {
> static const struct bge_vendor {
> uint16_t v_id;
> const char *v_name;
> -} const bge_vendors[] = {
> +} bge_vendors[] = {
> { ALTEON_VENDORID, "Alteon" },
> { ALTIMA_VENDORID, "Altima" },
> { APPLE_VENDORID, "Apple" },
> @@ -254,7 +254,7 @@ static const struct bge_vendor {
> static const struct bge_revision {
> uint32_t br_chipid;
> const char *br_name;
> -} const bge_revisions[] = {
> +} bge_revisions[] = {
> { BGE_CHIPID_BCM5700_A0, "BCM5700 A0" },
> { BGE_CHIPID_BCM5700_A1, "BCM5700 A1" },
> { BGE_CHIPID_BCM5700_B0, "BCM5700 B0" },
> @@ -328,7 +328,7 @@ static const struct bge_revision {
> * Some defaults for major revisions, so that newer steppings
> * that we don't know about have a shot at working.
> */
> -static const struct bge_revision const bge_majorrevs[] = {
> +static const struct bge_revision bge_majorrevs[] = {
> { BGE_ASICREV_BCM5700, "unknown BCM5700" },
> { BGE_ASICREV_BCM5701, "unknown BCM5701" },
> { BGE_ASICREV_BCM5703, "unknown BCM5703" },
> @@ -3122,7 +3122,7 @@ bge_mbox_reorder(struct bge_softc *sc)
> const uint16_t vendor;
> const uint16_t device;
> const char *desc;
> - } const mbox_reorder_lists[] = {
> + } mbox_reorder_lists[] = {
> { 0x1022, 0x7450, "AMD-8131 PCI-X Bridge" },
> };
> devclass_t pci, pcib;
>
> Modified: head/sys/dev/cas/if_cas.c
> ==============================================================================
> --- head/sys/dev/cas/if_cas.c Mon Nov 5 19:08:18 2012 (r242624)
> +++ head/sys/dev/cas/if_cas.c Mon Nov 5 19:16:27 2012 (r242625)
> @@ -2623,7 +2623,7 @@ static const struct cas_pci_dev {
> uint8_t cpd_revid;
> int cpd_variant;
> const char *cpd_desc;
> -} const cas_pci_devlist[] = {
> +} cas_pci_devlist[] = {
> { 0x0035100b, 0x0, CAS_SATURN, "NS DP83065 Saturn Gigabit Ethernet" },
> { 0xabba108e, 0x10, CAS_CASPLUS, "Sun Cassini+ Gigabit Ethernet" },
> { 0xabba108e, 0x0, CAS_CAS, "Sun Cassini Gigabit Ethernet" },
>
> Modified: head/sys/dev/dc/if_dc.c
> ==============================================================================
> --- head/sys/dev/dc/if_dc.c Mon Nov 5 19:08:18 2012 (r242624)
> +++ head/sys/dev/dc/if_dc.c Mon Nov 5 19:16:27 2012 (r242625)
> @@ -150,7 +150,7 @@ MODULE_DEPEND(dc, miibus, 1, 1, 1);
> /*
> * Various supported device vendors/types and their names.
> */
> -static const struct dc_type const dc_devs[] = {
> +static const struct dc_type dc_devs[] = {
> { DC_DEVID(DC_VENDORID_DEC, DC_DEVICEID_21143), 0,
> "Intel 21143 10/100BaseTX" },
> { DC_DEVID(DC_VENDORID_DAVICOM, DC_DEVICEID_DM9009), 0,
>
> Modified: head/sys/dev/flash/at45d.c
> ==============================================================================
> --- head/sys/dev/flash/at45d.c Mon Nov 5 19:08:18 2012 (r242624)
> +++ head/sys/dev/flash/at45d.c Mon Nov 5 19:16:27 2012 (r242625)
> @@ -106,7 +106,7 @@ static int at45d_wait_ready(device_t dev
> * 2^N byte pages. If support for the latter is enabled, the sector offset
> * has to be reduced by one.
> */
> -static const struct at45d_flash_ident const at45d_flash_devices[] = {
> +static const struct at45d_flash_ident at45d_flash_devices[] = {
> { "AT45DB011B", 0x1f2200, 512, 9, 264, 256 },
> { "AT45DB021B", 0x1f2300, 1024, 9, 264, 256 },
> { "AT45DB041x", 0x1f2400, 2028, 9, 264, 256 },
>
> Modified: head/sys/dev/fxp/if_fxp.c
> ==============================================================================
> --- head/sys/dev/fxp/if_fxp.c Mon Nov 5 19:08:18 2012 (r242624)
> +++ head/sys/dev/fxp/if_fxp.c Mon Nov 5 19:16:27 2012 (r242625)
> @@ -111,7 +111,7 @@ static int tx_threshold = 64;
> *
> * See struct fxp_cb_config for the bit definitions.
> */
> -static const u_char const fxp_cb_config_template[] = {
> +static const u_char fxp_cb_config_template[] = {
> 0x0, 0x0, /* cb_status */
> 0x0, 0x0, /* cb_command */
> 0x0, 0x0, 0x0, 0x0, /* link_addr */
> @@ -155,7 +155,7 @@ static const u_char const fxp_cb_config_
> * particular variants, but we don't currently differentiate between
> * them.
> */
> -static const struct fxp_ident const fxp_ident_table[] = {
> +static const struct fxp_ident fxp_ident_table[] = {
> { 0x1029, -1, 0, "Intel 82559 PCI/CardBus Pro/100" },
> { 0x1030, -1, 0, "Intel 82559 Pro/100 Ethernet" },
> { 0x1031, -1, 3, "Intel 82801CAM (ICH3) Pro/100 VE Ethernet" },
> @@ -3053,7 +3053,7 @@ static const struct ucode {
> int length;
> u_short int_delay_offset;
> u_short bundle_max_offset;
> -} const ucode_table[] = {
> +} ucode_table[] = {
> { FXP_REV_82558_A4, UCODE(fxp_ucode_d101a), D101_CPUSAVER_DWORD, 0 },
> { FXP_REV_82558_B0, UCODE(fxp_ucode_d101b0), D101_CPUSAVER_DWORD, 0 },
> { FXP_REV_82559_A0, UCODE(fxp_ucode_d101ma),
>
> Modified: head/sys/dev/gem/if_gem_pci.c
> ==============================================================================
> --- head/sys/dev/gem/if_gem_pci.c Mon Nov 5 19:08:18 2012 (r242624)
> +++ head/sys/dev/gem/if_gem_pci.c Mon Nov 5 19:16:27 2012 (r242625)
> @@ -104,7 +104,7 @@ static const struct gem_pci_dev {
> uint32_t gpd_devid;
> int gpd_variant;
> const char *gpd_desc;
> -} const gem_pci_devlist[] = {
> +} gem_pci_devlist[] = {
> { 0x1101108e, GEM_SUN_ERI, "Sun ERI 10/100 Ethernet" },
> { 0x2bad108e, GEM_SUN_GEM, "Sun GEM Gigabit Ethernet" },
> { 0x0021106b, GEM_APPLE_GMAC, "Apple UniNorth GMAC Ethernet" },
>
> Modified: head/sys/dev/lge/if_lge.c
> ==============================================================================
> --- head/sys/dev/lge/if_lge.c Mon Nov 5 19:08:18 2012 (r242624)
> +++ head/sys/dev/lge/if_lge.c Mon Nov 5 19:16:27 2012 (r242625)
> @@ -110,7 +110,7 @@ __FBSDID("$FreeBSD$");
> /*
> * Various supported device vendors/types and their names.
> */
> -static const struct lge_type const lge_devs[] = {
> +static const struct lge_type lge_devs[] = {
> { LGE_VENDORID, LGE_DEVICEID, "Level 1 Gigabit Ethernet" },
> { 0, 0, NULL }
> };
>
> Modified: head/sys/dev/mii/mii.c
> ==============================================================================
> --- head/sys/dev/mii/mii.c Mon Nov 5 19:08:18 2012 (r242624)
> +++ head/sys/dev/mii/mii.c Mon Nov 5 19:16:27 2012 (r242625)
> @@ -626,7 +626,7 @@ mii_down(struct mii_data *mii)
> static unsigned char
> mii_bitreverse(unsigned char x)
> {
> - static unsigned const char const nibbletab[16] = {
> + static unsigned const char nibbletab[16] = {
> 0, 8, 4, 12, 2, 10, 6, 14, 1, 9, 5, 13, 3, 11, 7, 15
> };
>
>
> Modified: head/sys/dev/nge/if_nge.c
> ==============================================================================
> --- head/sys/dev/nge/if_nge.c Mon Nov 5 19:08:18 2012 (r242624)
> +++ head/sys/dev/nge/if_nge.c Mon Nov 5 19:16:27 2012 (r242625)
> @@ -139,7 +139,7 @@ MODULE_DEPEND(nge, miibus, 1, 1, 1);
> /*
> * Various supported device vendors/types and their names.
> */
> -static const struct nge_type const nge_devs[] = {
> +static const struct nge_type nge_devs[] = {
> { NGE_VENDORID, NGE_DEVICEID,
> "National Semiconductor Gigabit Ethernet" },
> { 0, 0, NULL }
>
> Modified: head/sys/dev/pci/pci.c
> ==============================================================================
> --- head/sys/dev/pci/pci.c Mon Nov 5 19:08:18 2012 (r242624)
> +++ head/sys/dev/pci/pci.c Mon Nov 5 19:16:27 2012 (r242625)
> @@ -201,7 +201,7 @@ struct pci_quirk {
> int arg2;
> };
>
> -static const struct pci_quirk const pci_quirks[] = {
> +static const struct pci_quirk pci_quirks[] = {
> /* The Intel 82371AB and 82443MX has a map register at offset 0x90. */
> { 0x71138086, PCI_QUIRK_MAP_REG, 0x90, 0 },
> { 0x719b8086, PCI_QUIRK_MAP_REG, 0x90, 0 },
>
> Modified: head/sys/dev/re/if_re.c
> ==============================================================================
> --- head/sys/dev/re/if_re.c Mon Nov 5 19:08:18 2012 (r242624)
> +++ head/sys/dev/re/if_re.c Mon Nov 5 19:16:27 2012 (r242625)
> @@ -171,7 +171,7 @@ TUNABLE_INT("hw.re.prefer_iomap", &prefe
> /*
> * Various supported device vendors/types and their names.
> */
> -static const struct rl_type const re_devs[] = {
> +static const struct rl_type re_devs[] = {
> { DLINK_VENDORID, DLINK_DEVICEID_528T, 0,
> "D-Link DGE-528(T) Gigabit Ethernet Adapter" },
> { DLINK_VENDORID, DLINK_DEVICEID_530T_REVC, 0,
> @@ -194,7 +194,7 @@ static const struct rl_type const re_dev
> "US Robotics 997902 (RTL8169S) Gigabit Ethernet" }
> };
>
> -static const struct rl_hwrev const re_hwrevs[] = {
> +static const struct rl_hwrev re_hwrevs[] = {
> { RL_HWREV_8139, RL_8139, "", RL_MTU },
> { RL_HWREV_8139A, RL_8139, "A", RL_MTU },
> { RL_HWREV_8139AG, RL_8139, "A-G", RL_MTU },
>
> Modified: head/sys/dev/sis/if_sis.c
> ==============================================================================
> --- head/sys/dev/sis/if_sis.c Mon Nov 5 19:08:18 2012 (r242624)
> +++ head/sys/dev/sis/if_sis.c Mon Nov 5 19:16:27 2012 (r242625)
> @@ -126,7 +126,7 @@ MODULE_DEPEND(sis, miibus, 1, 1, 1);
> /*
> * Various supported device vendors/types and their names.
> */
> -static const struct sis_type const sis_devs[] = {
> +static const struct sis_type sis_devs[] = {
> { SIS_VENDORID, SIS_DEVICEID_900, "SiS 900 10/100BaseTX" },
> { SIS_VENDORID, SIS_DEVICEID_7016, "SiS 7016 10/100BaseTX" },
> { NS_VENDORID, NS_DEVICEID_DP83815, "NatSemi DP8381[56] 10/100BaseTX" },
>
> Modified: head/sys/dev/ste/if_ste.c
> ==============================================================================
> --- head/sys/dev/ste/if_ste.c Mon Nov 5 19:08:18 2012 (r242624)
> +++ head/sys/dev/ste/if_ste.c Mon Nov 5 19:16:27 2012 (r242625)
> @@ -85,7 +85,7 @@ MODULE_DEPEND(ste, miibus, 1, 1, 1);
> /*
> * Various supported device vendors/types and their names.
> */
> -static const struct ste_type const ste_devs[] = {
> +static const struct ste_type ste_devs[] = {
> { ST_VENDORID, ST_DEVICEID_ST201_1, "Sundance ST201 10/100BaseTX" },
> { ST_VENDORID, ST_DEVICEID_ST201_2, "Sundance ST201 10/100BaseTX" },
> { DL_VENDORID, DL_DEVICEID_DL10050, "D-Link DL10050 10/100BaseTX" },
>
> Modified: head/sys/dev/stge/if_stge.c
> ==============================================================================
> --- head/sys/dev/stge/if_stge.c Mon Nov 5 19:08:18 2012 (r242624)
> +++ head/sys/dev/stge/if_stge.c Mon Nov 5 19:16:27 2012 (r242625)
> @@ -91,7 +91,7 @@ static const struct stge_product {
> uint16_t stge_vendorid;
> uint16_t stge_deviceid;
> const char *stge_name;
> -} const stge_products[] = {
> +} stge_products[] = {
> { VENDOR_SUNDANCETI, DEVICEID_SUNDANCETI_ST1023,
> "Sundance ST-1023 Gigabit Ethernet" },
>
>
> Modified: head/sys/dev/ti/if_ti.c
> ==============================================================================
> --- head/sys/dev/ti/if_ti.c Mon Nov 5 19:08:18 2012 (r242624)
> +++ head/sys/dev/ti/if_ti.c Mon Nov 5 19:16:27 2012 (r242625)
> @@ -145,7 +145,7 @@ typedef enum {
> * Various supported device vendors/types and their names.
> */
>
> -static const struct ti_type const ti_devs[] = {
> +static const struct ti_type ti_devs[] = {
> { ALT_VENDORID, ALT_DEVICEID_ACENIC,
> "Alteon AceNIC 1000baseSX Gigabit Ethernet" },
> { ALT_VENDORID, ALT_DEVICEID_ACENIC_COPPER,
>
> Modified: head/sys/dev/tl/if_tl.c
> ==============================================================================
> --- head/sys/dev/tl/if_tl.c Mon Nov 5 19:08:18 2012 (r242624)
> +++ head/sys/dev/tl/if_tl.c Mon Nov 5 19:16:27 2012 (r242625)
> @@ -229,7 +229,7 @@ MODULE_DEPEND(tl, miibus, 1, 1, 1);
> * Various supported device vendors/types and their names.
> */
>
> -static const struct tl_type const tl_devs[] = {
> +static const struct tl_type tl_devs[] = {
> { TI_VENDORID, TI_DEVICEID_THUNDERLAN,
> "Texas Instruments ThunderLAN" },
> { COMPAQ_VENDORID, COMPAQ_DEVICEID_NETEL_10,
>
> Modified: head/sys/dev/vr/if_vr.c
> ==============================================================================
> --- head/sys/dev/vr/if_vr.c Mon Nov 5 19:08:18 2012 (r242624)
> +++ head/sys/dev/vr/if_vr.c Mon Nov 5 19:16:27 2012 (r242625)
> @@ -119,7 +119,7 @@ static const struct vr_type {
> u_int16_t vr_did;
> int vr_quirks;
> const char *vr_name;
> -} const vr_devs[] = {
> +} vr_devs[] = {
> { VIA_VENDORID, VIA_DEVICEID_RHINE,
> VR_Q_NEEDALIGN,
> "VIA VT3043 Rhine I 10/100BaseTX" },
> @@ -200,7 +200,7 @@ static const struct vr_tx_threshold_tabl
> int tx_cfg;
> int bcr_cfg;
> int value;
> -} const vr_tx_threshold_tables[] = {
> +} vr_tx_threshold_tables[] = {
> { VR_TXTHRESH_64BYTES, VR_BCR1_TXTHRESH64BYTES, 64 },
> { VR_TXTHRESH_128BYTES, VR_BCR1_TXTHRESH128BYTES, 128 },
> { VR_TXTHRESH_256BYTES, VR_BCR1_TXTHRESH256BYTES, 256 },
>
> Modified: head/sys/dev/wb/if_wb.c
> ==============================================================================
> --- head/sys/dev/wb/if_wb.c Mon Nov 5 19:08:18 2012 (r242624)
> +++ head/sys/dev/wb/if_wb.c Mon Nov 5 19:16:27 2012 (r242625)
> @@ -130,7 +130,7 @@ MODULE_DEPEND(wb, miibus, 1, 1, 1);
> /*
> * Various supported device vendors/types and their names.
> */
> -static const struct wb_type const wb_devs[] = {
> +static const struct wb_type wb_devs[] = {
> { WB_VENDORID, WB_DEVICEID_840F,
> "Winbond W89C840F 10/100BaseTX" },
> { CP_VENDORID, CP_DEVICEID_RL100,
>
> Modified: head/sys/dev/xl/if_xl.c
> ==============================================================================
> --- head/sys/dev/xl/if_xl.c Mon Nov 5 19:08:18 2012 (r242624)
> +++ head/sys/dev/xl/if_xl.c Mon Nov 5 19:16:27 2012 (r242625)
> @@ -161,7 +161,7 @@ MODULE_DEPEND(xl, miibus, 1, 1, 1);
> /*
> * Various supported device vendors/types and their names.
> */
> -static const struct xl_type const xl_devs[] = {
> +static const struct xl_type xl_devs[] = {
> { TC_VENDORID, TC_DEVICEID_BOOMERANG_10BT,
> "3Com 3c900-TPO Etherlink XL" },
> { TC_VENDORID, TC_DEVICEID_BOOMERANG_10BT_COMBO,
>
> Modified: head/sys/pci/if_rl.c
> ==============================================================================
> --- head/sys/pci/if_rl.c Mon Nov 5 19:08:18 2012 (r242624)
> +++ head/sys/pci/if_rl.c Mon Nov 5 19:16:27 2012 (r242625)
> @@ -131,7 +131,7 @@ MODULE_DEPEND(rl, miibus, 1, 1, 1);
> /*
> * Various supported device vendors/types and their names.
> */
> -static const struct rl_type const rl_devs[] = {
> +static const struct rl_type rl_devs[] = {
> { RT_VENDORID, RT_DEVICEID_8129, RL_8129,
> "RealTek 8129 10/100BaseTX" },
> { RT_VENDORID, RT_DEVICEID_8139, RL_8139,
>
> Modified: head/sys/sparc64/pci/fire.c
> ==============================================================================
> --- head/sys/sparc64/pci/fire.c Mon Nov 5 19:08:18 2012 (r242624)
> +++ head/sys/sparc64/pci/fire.c Mon Nov 5 19:16:27 2012 (r242625)
> @@ -249,7 +249,7 @@ struct fire_desc {
> const char *fd_name;
> };
>
> -static const struct fire_desc const fire_compats[] = {
> +static const struct fire_desc fire_compats[] = {
> { "pciex108e,80f0", FIRE_MODE_FIRE, "Fire" },
> #if 0
> { "pciex108e,80f8", FIRE_MODE_OBERON, "Oberon" },
>
> Modified: head/sys/sparc64/pci/psycho.c
> ==============================================================================
> --- head/sys/sparc64/pci/psycho.c Mon Nov 5 19:08:18 2012 (r242624)
> +++ head/sys/sparc64/pci/psycho.c Mon Nov 5 19:16:27 2012 (r242625)
> @@ -222,14 +222,14 @@ struct psycho_desc {
> const char *pd_name;
> };
>
> -static const struct psycho_desc const psycho_compats[] = {
> +static const struct psycho_desc psycho_compats[] = {
> { "pci108e,8000", PSYCHO_MODE_PSYCHO, "Psycho compatible" },
> { "pci108e,a000", PSYCHO_MODE_SABRE, "Sabre compatible" },
> { "pci108e,a001", PSYCHO_MODE_SABRE, "Hummingbird compatible" },
> { NULL, 0, NULL }
> };
>
> -static const struct psycho_desc const psycho_models[] = {
> +static const struct psycho_desc psycho_models[] = {
> { "SUNW,psycho", PSYCHO_MODE_PSYCHO, "Psycho" },
> { "SUNW,sabre", PSYCHO_MODE_SABRE, "Sabre" },
> { NULL, 0, NULL }
>
> Modified: head/sys/sparc64/pci/schizo.c
> ==============================================================================
> --- head/sys/sparc64/pci/schizo.c Mon Nov 5 19:08:18 2012 (r242624)
> +++ head/sys/sparc64/pci/schizo.c Mon Nov 5 19:16:27 2012 (r242625)
> @@ -229,7 +229,7 @@ struct schizo_desc {
> const char *sd_name;
> };
>
> -static const struct schizo_desc const schizo_compats[] = {
> +static const struct schizo_desc schizo_compats[] = {
> { "pci108e,8001", SCHIZO_MODE_SCZ, "Schizo" },
> #if 0
> { "pci108e,8002", SCHIZO_MODE_XMS, "XMITS" },
More information about the svn-src-all
mailing list