From a833a696f1726fd5d95ded0820612f465a2dad8d Mon Sep 17 00:00:00 2001 From: Josef 'Jeff' Sipek Date: Fri, 25 Apr 2014 17:43:55 -0400 Subject: [PATCH] 4804 apix & pcplusmp are nearly warning free already Reviewed by: Robert Mustacchi Approved by: Dan McDonald --- usr/src/uts/i86pc/apix/Makefile | 3 --- usr/src/uts/i86pc/io/hpet_acpi.c | 45 --------------------------------- usr/src/uts/i86pc/io/mp_platform_misc.c | 2 +- usr/src/uts/i86pc/io/pcplusmp/apic.c | 10 +------- usr/src/uts/i86pc/pcplusmp/Makefile | 6 ----- 5 files changed, 2 insertions(+), 64 deletions(-) diff --git a/usr/src/uts/i86pc/apix/Makefile b/usr/src/uts/i86pc/apix/Makefile index 501e095b4d..e65d4cf1ee 100644 --- a/usr/src/uts/i86pc/apix/Makefile +++ b/usr/src/uts/i86pc/apix/Makefile @@ -63,9 +63,6 @@ $(NOT_RELEASE_BUILD)DEBUG_DEFS += $(DEBUG_FLGS) LDFLAGS += -dy -N misc/acpica CERRWARN += -_gcc=-Wno-uninitialized -CERRWARN += -_gcc=-Wno-unused-variable -CERRWARN += -_gcc=-Wno-unused-function -CERRWARN += -_gcc=-Wno-empty-body # # Default build targets. diff --git a/usr/src/uts/i86pc/io/hpet_acpi.c b/usr/src/uts/i86pc/io/hpet_acpi.c index b618e491e7..d65c514fe4 100644 --- a/usr/src/uts/i86pc/io/hpet_acpi.c +++ b/usr/src/uts/i86pc/io/hpet_acpi.c @@ -54,18 +54,12 @@ static uint64_t hpet_read_gen_config(hpet_info_t *hip); static uint64_t hpet_read_gen_intrpt_stat(hpet_info_t *hip); static uint64_t hpet_read_timer_N_config(hpet_info_t *hip, uint_t n); static hpet_TN_conf_cap_t hpet_convert_timer_N_config(uint64_t conf); -/* LINTED E_STATIC_UNUSED */ -static uint64_t hpet_read_timer_N_comp(hpet_info_t *hip, uint_t n); -/* LINTED E_STATIC_UNUSED */ -static void hpet_write_gen_cap(hpet_info_t *hip, uint64_t l); static void hpet_write_gen_config(hpet_info_t *hip, uint64_t l); static void hpet_write_gen_intrpt_stat(hpet_info_t *hip, uint64_t l); static void hpet_write_timer_N_config(hpet_info_t *hip, uint_t n, uint64_t l); static void hpet_write_timer_N_comp(hpet_info_t *hip, uint_t n, uint64_t l); static void hpet_disable_timer(hpet_info_t *hip, uint32_t timer_n); static void hpet_enable_timer(hpet_info_t *hip, uint32_t timer_n); -/* LINTED E_STATIC_UNUSED */ -static void hpet_write_main_counter_value(hpet_info_t *hip, uint64_t l); static int hpet_get_IOAPIC_intr_capable_timer(hpet_info_t *hip); static int hpet_timer_available(uint32_t allocated_timers, uint32_t n); static void hpet_timer_alloc(uint32_t *allocated_timers, uint32_t n); @@ -526,17 +520,6 @@ hpet_convert_timer_N_config(uint64_t conf) } static uint64_t -hpet_read_timer_N_comp(hpet_info_t *hip, uint_t n) -{ - if (hip->timer_n_config[n].size_cap == 1) - return (*(uint64_t *) - HPET_TIMER_N_COMP_ADDRESS(hip->logical_address, n)); - else - return (*(uint32_t *) - HPET_TIMER_N_COMP_ADDRESS(hip->logical_address, n)); -} - -static uint64_t hpet_read_main_counter_value(hpet_info_t *hip) { uint64_t value; @@ -571,12 +554,6 @@ hpet_read_main_counter_value(hpet_info_t *hip) } static void -hpet_write_gen_cap(hpet_info_t *hip, uint64_t l) -{ - *(uint64_t *)HPET_GEN_CAP_ADDRESS(hip->logical_address) = l; -} - -static void hpet_write_gen_config(hpet_info_t *hip, uint64_t l) { *(uint64_t *)HPET_GEN_CONFIG_ADDRESS(hip->logical_address) = l; @@ -625,28 +602,6 @@ hpet_enable_timer(hpet_info_t *hip, uint32_t timer_n) hpet_write_timer_N_config(hip, timer_n, l); } -static void -hpet_write_main_counter_value(hpet_info_t *hip, uint64_t l) -{ - uint32_t *address; - - /* - * HPET spec 1.0a states main counter register should be halted before - * it is written to. - */ - ASSERT(!(hpet_read_gen_config(hip) & HPET_GCFR_ENABLE_CNF)); - - if (hip->gen_cap.count_size_cap == 1) { - *(uint64_t *)HPET_MAIN_COUNTER_ADDRESS(hip->logical_address) - = l; - } else { - address = (uint32_t *)HPET_MAIN_COUNTER_ADDRESS( - hip->logical_address); - - address[0] = (uint32_t)(l & 0xFFFFFFFF); - } -} - /* * Add the interrupt handler for I/O APIC interrupt number (interrupt line). * diff --git a/usr/src/uts/i86pc/io/mp_platform_misc.c b/usr/src/uts/i86pc/io/mp_platform_misc.c index af0e0cff00..3737a59a8d 100644 --- a/usr/src/uts/i86pc/io/mp_platform_misc.c +++ b/usr/src/uts/i86pc/io/mp_platform_misc.c @@ -553,7 +553,7 @@ apic_delspl_common(int irqno, int ipl, int min_ipl, int max_ipl) if ((irqptr->airq_ipl != max_ipl) && (max_ipl != PSM_INVALID_IPL) && !ioapic_mask_workaround[irqptr->airq_ioapicindex]) { apic_irq_t *irqp; - if (vector = apic_allocate_vector(max_ipl, irqno, 1)) { + if ((vector = apic_allocate_vector(max_ipl, irqno, 1))) { apic_mark_vector(irqheadptr->airq_vector, vector); irqp = irqheadptr; while (irqp) { diff --git a/usr/src/uts/i86pc/io/pcplusmp/apic.c b/usr/src/uts/i86pc/io/pcplusmp/apic.c index db5674aa5a..d65e4db941 100644 --- a/usr/src/uts/i86pc/io/pcplusmp/apic.c +++ b/usr/src/uts/i86pc/io/pcplusmp/apic.c @@ -215,14 +215,6 @@ static struct psm_info apic_psm_info = { static void *apic_hdlp; -/* - * apic_let_idle_redistribute can have the following values: - * 0 - If clock decremented it from 1 to 0, clock has to call redistribute. - * apic_redistribute_lock prevents multiple idle cpus from redistributing - */ -int apic_num_idle_redistributions = 0; -static int apic_let_idle_redistribute = 0; - /* to gather intr data and redistribute */ static void apic_redistribute_compute(void); @@ -798,7 +790,7 @@ apic_get_ipivect(int ipl, int type) int irq; if ((irq = apic_allocate_irq(APIC_VECTOR(ipl))) != -1) { - if (vector = apic_allocate_vector(ipl, irq, 1)) { + if ((vector = apic_allocate_vector(ipl, irq, 1))) { apic_irq_table[irq]->airq_mps_intr_index = RESERVE_INDEX; apic_irq_table[irq]->airq_vector = vector; diff --git a/usr/src/uts/i86pc/pcplusmp/Makefile b/usr/src/uts/i86pc/pcplusmp/Makefile index c65a382e71..6590ef9f28 100644 --- a/usr/src/uts/i86pc/pcplusmp/Makefile +++ b/usr/src/uts/i86pc/pcplusmp/Makefile @@ -65,8 +65,6 @@ $(NOT_RELEASE_BUILD)DEBUG_DEFS += $(DEBUG_FLGS) # LDFLAGS += -dy -N misc/acpica -CFLAGS += -Dbug1157974 -Dbug1155030 - # # For now, disable these lint checks; maintainers should endeavor # to investigate and remove these for maximum lint coverage. @@ -77,11 +75,7 @@ LINTTAGS += -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED LINTTAGS += -erroff=E_STATIC_UNUSED LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV -CERRWARN += -_gcc=-Wno-parentheses CERRWARN += -_gcc=-Wno-uninitialized -CERRWARN += -_gcc=-Wno-unused-function -CERRWARN += -_gcc=-Wno-unused-variable -CERRWARN += -_gcc=-Wno-empty-body # # Default build targets. -- 2.11.4.GIT