/* The code below handles cstate entry with monitor-mwait pair on Intel*/
 
-struct cstate_entry_s {
+struct cstate_entry {
        struct {
                unsigned int eax;
                unsigned int ecx;
        } states[ACPI_PROCESSOR_MAX_POWER];
 };
-static struct cstate_entry_s *cpu_cstate_entry;        /* per CPU ptr */
+static struct cstate_entry *cpu_cstate_entry;  /* per CPU ptr */
 
 static short mwait_supported[ACPI_PROCESSOR_MAX_POWER];
 
 int acpi_processor_ffh_cstate_probe(unsigned int cpu,
                struct acpi_processor_cx *cx, struct acpi_power_register *reg)
 {
-       struct cstate_entry_s *percpu_entry;
+       struct cstate_entry *percpu_entry;
        struct cpuinfo_x86 *c = cpu_data + cpu;
 
        cpumask_t saved_mask;
 void acpi_processor_ffh_cstate_enter(struct acpi_processor_cx *cx)
 {
        unsigned int cpu = smp_processor_id();
-       struct cstate_entry_s *percpu_entry;
+       struct cstate_entry *percpu_entry;
 
        percpu_entry = per_cpu_ptr(cpu_cstate_entry, cpu);
        mwait_idle_with_hints(percpu_entry->states[cx->index].eax,
        if (c->x86_vendor != X86_VENDOR_INTEL)
                return -1;
 
-       cpu_cstate_entry = alloc_percpu(struct cstate_entry_s);
+       cpu_cstate_entry = alloc_percpu(struct cstate_entry);
        return 0;
 }