diff options
| author | Andrew Stormont <astormont@racktopsystems.com> | 2018-03-10 22:32:26 -0800 |
|---|---|---|
| committer | Joshua M. Clulow <josh@sysmgr.org> | 2018-03-10 22:32:26 -0800 |
| commit | 6e6c7d67bf5ba2efa13619acd59395d0f278ee75 (patch) | |
| tree | 060b0c8704e933310d4286d7229082dc348e9214 | |
| parent | b2be350e700b2900626f0977c47dddefdf617cfd (diff) | |
| download | illumos-joyent-6e6c7d67bf5ba2efa13619acd59395d0f278ee75.tar.gz | |
8659 ata: unused but set warnings with GCC 5.X
Reviewed by: Ken Mays <maybird1776@yahoo.com>
Reviewed by: Yuri Pankov <yuripv@gmx.com>
Reviewed by: Toomas Soome <tsoome@me.com>
Approved by: Joshua M. Clulow <josh@sysmgr.org>
| -rw-r--r-- | usr/src/uts/intel/io/dktp/controller/ata/ata_common.c | 12 | ||||
| -rw-r--r-- | usr/src/uts/intel/io/dktp/controller/ata/sil3xxx.c | 9 |
2 files changed, 13 insertions, 8 deletions
diff --git a/usr/src/uts/intel/io/dktp/controller/ata/ata_common.c b/usr/src/uts/intel/io/dktp/controller/ata/ata_common.c index bd0b2e5374..dcd0cbf8d3 100644 --- a/usr/src/uts/intel/io/dktp/controller/ata/ata_common.c +++ b/usr/src/uts/intel/io/dktp/controller/ata/ata_common.c @@ -22,6 +22,8 @@ /* * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * + * Copyright 2018 RackTop Systems. */ #include <sys/types.h> @@ -3469,7 +3471,7 @@ ata_spec_init_controller(dev_info_t *dip) */ static int ata_prop_lookup_int(dev_t match_dev, dev_info_t *dip, - uint_t flags, char *name, int defvalue) + uint_t flags, char *name, int defvalue) { char *bufp, *cp; @@ -3499,6 +3501,9 @@ ata_prop_lookup_int(dev_t match_dev, dev_info_t *dip, static void ata_init_pm(dev_info_t *dip) { + int instance; + ata_ctl_t *ata_ctlp; +#ifdef ATA_USE_AUTOPM char pmc_name[16]; char *pmc[] = { NULL, @@ -3506,8 +3511,7 @@ ata_init_pm(dev_info_t *dip) "3=PowerOn (PCI D0 State)", NULL }; - int instance; - ata_ctl_t *ata_ctlp; +#endif instance = ddi_get_instance(dip); @@ -3518,10 +3522,10 @@ ata_init_pm(dev_info_t *dip) if (!ata_is_pci(dip)) return; +#ifdef ATA_USE_AUTOPM (void) sprintf(pmc_name, "NAME=ata%d", instance); pmc[0] = pmc_name; -#ifdef ATA_USE_AUTOPM if (ddi_prop_update_string_array(DDI_DEV_T_NONE, dip, "pm-components", pmc, 3) != DDI_PROP_SUCCESS) { return; diff --git a/usr/src/uts/intel/io/dktp/controller/ata/sil3xxx.c b/usr/src/uts/intel/io/dktp/controller/ata/sil3xxx.c index e358a6e1a7..1865c2abf1 100644 --- a/usr/src/uts/intel/io/dktp/controller/ata/sil3xxx.c +++ b/usr/src/uts/intel/io/dktp/controller/ata/sil3xxx.c @@ -22,6 +22,8 @@ /* * Copyright 2004 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * + * Copyright 2018 RackTop Systems. */ /* * Silicon Image 3XXX controller specific processing @@ -55,8 +57,7 @@ sil3xxx_init_controller(dev_info_t *dip, ushort_t vendor_id, ushort_t device_id) uint32_t fifo_cnt_ctl; int ports, i; -#ifdef DEBUG - /* LINTED */ +#ifdef ATA_DEBUG ushort_t sfiscfg_val __unused; #endif @@ -122,7 +123,7 @@ sil3xxx_init_controller(dev_info_t *dip, ushort_t vendor_id, ushort_t device_id) /* * Correct default setting for FIS0cfg */ -#ifdef DEBUG +#ifdef ATA_DEBUG GET_BAR5_INDIRECT(pci_conf_handle, sfiscfg[i], sfiscfg_val); ADBG_WARN(("sil3xxx_init_controller: old val SFISCfg " @@ -130,7 +131,7 @@ sil3xxx_init_controller(dev_info_t *dip, ushort_t vendor_id, ushort_t device_id) #endif PUT_BAR5_INDIRECT(pci_conf_handle, sfiscfg[i], SFISCFG_ERRATA); -#ifdef DEBUG +#ifdef ATA_DEBUG GET_BAR5_INDIRECT(pci_conf_handle, sfiscfg[i], sfiscfg_val); ADBG_WARN(("sil3xxx_init_controller: new val SFISCfg " |