Skip to content

Commit 34739a2

Browse files
maciej-w-rozyckiKAGA-KOKO
authored andcommitted
x86: Fix typo s/ECLR/ELCR/ for the PIC register
The proper spelling for the acronym referring to the Edge/Level Control Register is ELCR rather than ECLR. Adjust references accordingly. No functional change. Signed-off-by: Maciej W. Rozycki <macro@orcam.me.uk> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Link: https://lore.kernel.org/r/alpine.DEB.2.21.2107200251080.9461@angie.orcam.me.uk
1 parent d253166 commit 34739a2

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

arch/x86/kernel/acpi/boot.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -558,10 +558,10 @@ acpi_parse_nmi_src(union acpi_subtable_headers * header, const unsigned long end
558558
* If a PIC-mode SCI is not recognized or gives spurious IRQ7's
559559
* it may require Edge Trigger -- use "acpi_sci=edge"
560560
*
561-
* Port 0x4d0-4d1 are ECLR1 and ECLR2, the Edge/Level Control Registers
561+
* Port 0x4d0-4d1 are ELCR1 and ELCR2, the Edge/Level Control Registers
562562
* for the 8259 PIC. bit[n] = 1 means irq[n] is Level, otherwise Edge.
563-
* ECLR1 is IRQs 0-7 (IRQ 0, 1, 2 must be 0)
564-
* ECLR2 is IRQs 8-15 (IRQ 8, 13 must be 0)
563+
* ELCR1 is IRQs 0-7 (IRQ 0, 1, 2 must be 0)
564+
* ELCR2 is IRQs 8-15 (IRQ 8, 13 must be 0)
565565
*/
566566

567567
void __init acpi_pic_sci_set_trigger(unsigned int irq, u16 trigger)

arch/x86/kvm/i8259.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -541,17 +541,17 @@ static int picdev_slave_read(struct kvm_vcpu *vcpu, struct kvm_io_device *dev,
541541
addr, len, val);
542542
}
543543

544-
static int picdev_eclr_write(struct kvm_vcpu *vcpu, struct kvm_io_device *dev,
544+
static int picdev_elcr_write(struct kvm_vcpu *vcpu, struct kvm_io_device *dev,
545545
gpa_t addr, int len, const void *val)
546546
{
547-
return picdev_write(container_of(dev, struct kvm_pic, dev_eclr),
547+
return picdev_write(container_of(dev, struct kvm_pic, dev_elcr),
548548
addr, len, val);
549549
}
550550

551-
static int picdev_eclr_read(struct kvm_vcpu *vcpu, struct kvm_io_device *dev,
551+
static int picdev_elcr_read(struct kvm_vcpu *vcpu, struct kvm_io_device *dev,
552552
gpa_t addr, int len, void *val)
553553
{
554-
return picdev_read(container_of(dev, struct kvm_pic, dev_eclr),
554+
return picdev_read(container_of(dev, struct kvm_pic, dev_elcr),
555555
addr, len, val);
556556
}
557557

@@ -577,9 +577,9 @@ static const struct kvm_io_device_ops picdev_slave_ops = {
577577
.write = picdev_slave_write,
578578
};
579579

580-
static const struct kvm_io_device_ops picdev_eclr_ops = {
581-
.read = picdev_eclr_read,
582-
.write = picdev_eclr_write,
580+
static const struct kvm_io_device_ops picdev_elcr_ops = {
581+
.read = picdev_elcr_read,
582+
.write = picdev_elcr_write,
583583
};
584584

585585
int kvm_pic_init(struct kvm *kvm)
@@ -602,7 +602,7 @@ int kvm_pic_init(struct kvm *kvm)
602602
*/
603603
kvm_iodevice_init(&s->dev_master, &picdev_master_ops);
604604
kvm_iodevice_init(&s->dev_slave, &picdev_slave_ops);
605-
kvm_iodevice_init(&s->dev_eclr, &picdev_eclr_ops);
605+
kvm_iodevice_init(&s->dev_elcr, &picdev_elcr_ops);
606606
mutex_lock(&kvm->slots_lock);
607607
ret = kvm_io_bus_register_dev(kvm, KVM_PIO_BUS, 0x20, 2,
608608
&s->dev_master);
@@ -613,7 +613,7 @@ int kvm_pic_init(struct kvm *kvm)
613613
if (ret < 0)
614614
goto fail_unreg_2;
615615

616-
ret = kvm_io_bus_register_dev(kvm, KVM_PIO_BUS, 0x4d0, 2, &s->dev_eclr);
616+
ret = kvm_io_bus_register_dev(kvm, KVM_PIO_BUS, 0x4d0, 2, &s->dev_elcr);
617617
if (ret < 0)
618618
goto fail_unreg_1;
619619

@@ -647,7 +647,7 @@ void kvm_pic_destroy(struct kvm *kvm)
647647
mutex_lock(&kvm->slots_lock);
648648
kvm_io_bus_unregister_dev(vpic->kvm, KVM_PIO_BUS, &vpic->dev_master);
649649
kvm_io_bus_unregister_dev(vpic->kvm, KVM_PIO_BUS, &vpic->dev_slave);
650-
kvm_io_bus_unregister_dev(vpic->kvm, KVM_PIO_BUS, &vpic->dev_eclr);
650+
kvm_io_bus_unregister_dev(vpic->kvm, KVM_PIO_BUS, &vpic->dev_elcr);
651651
mutex_unlock(&kvm->slots_lock);
652652

653653
kvm->arch.vpic = NULL;

arch/x86/kvm/irq.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ struct kvm_pic {
5555
int output; /* intr from master PIC */
5656
struct kvm_io_device dev_master;
5757
struct kvm_io_device dev_slave;
58-
struct kvm_io_device dev_eclr;
58+
struct kvm_io_device dev_elcr;
5959
void (*ack_notifier)(void *opaque, int irq);
6060
unsigned long irq_states[PIC_NUM_PINS];
6161
};

0 commit comments

Comments
 (0)