ipmi/pci-ipmi-bt: Rename copy-paste variables

IPMI drivers use p/k suffix in variable names depending on bt or kcs.
The pci bt driver must have come from the kcs driver because it's
still using k suffixes in some cases. Rename.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Message-ID: <20250401140153.685523-2-npiggin@gmail.com>
Signed-off-by: Corey Minyard <corey@minyard.net>
This commit is contained in:
Nicholas Piggin 2025-04-02 00:01:48 +10:00 committed by Corey Minyard
parent d11d904c81
commit 3e0a763136

View file

@ -38,49 +38,49 @@ struct PCIIPMIBTDevice {
uint32_t uuid; uint32_t uuid;
}; };
static void pci_ipmi_raise_irq(IPMIBT *ik) static void pci_ipmi_raise_irq(IPMIBT *ib)
{ {
PCIIPMIBTDevice *pik = ik->opaque; PCIIPMIBTDevice *pib = ib->opaque;
pci_set_irq(&pik->dev, true); pci_set_irq(&pib->dev, true);
} }
static void pci_ipmi_lower_irq(IPMIBT *ik) static void pci_ipmi_lower_irq(IPMIBT *ib)
{ {
PCIIPMIBTDevice *pik = ik->opaque; PCIIPMIBTDevice *pib = ib->opaque;
pci_set_irq(&pik->dev, false); pci_set_irq(&pib->dev, false);
} }
static void pci_ipmi_bt_realize(PCIDevice *pd, Error **errp) static void pci_ipmi_bt_realize(PCIDevice *pd, Error **errp)
{ {
Error *err = NULL; Error *err = NULL;
PCIIPMIBTDevice *pik = PCI_IPMI_BT(pd); PCIIPMIBTDevice *pib = PCI_IPMI_BT(pd);
IPMIInterface *ii = IPMI_INTERFACE(pd); IPMIInterface *ii = IPMI_INTERFACE(pd);
IPMIInterfaceClass *iic = IPMI_INTERFACE_GET_CLASS(ii); IPMIInterfaceClass *iic = IPMI_INTERFACE_GET_CLASS(ii);
if (!pik->bt.bmc) { if (!pib->bt.bmc) {
error_setg(errp, "IPMI device requires a bmc attribute to be set"); error_setg(errp, "IPMI device requires a bmc attribute to be set");
return; return;
} }
pik->uuid = ipmi_next_uuid(); pib->uuid = ipmi_next_uuid();
pik->bt.bmc->intf = ii; pib->bt.bmc->intf = ii;
pik->bt.opaque = pik; pib->bt.opaque = pib;
pci_config_set_prog_interface(pd->config, 0x02); /* BT */ pci_config_set_prog_interface(pd->config, 0x02); /* BT */
pci_config_set_interrupt_pin(pd->config, 0x01); pci_config_set_interrupt_pin(pd->config, 0x01);
pik->bt.use_irq = 1; pib->bt.use_irq = 1;
pik->bt.raise_irq = pci_ipmi_raise_irq; pib->bt.raise_irq = pci_ipmi_raise_irq;
pik->bt.lower_irq = pci_ipmi_lower_irq; pib->bt.lower_irq = pci_ipmi_lower_irq;
iic->init(ii, 8, &err); iic->init(ii, 8, &err);
if (err) { if (err) {
error_propagate(errp, err); error_propagate(errp, err);
return; return;
} }
pci_register_bar(pd, 0, PCI_BASE_ADDRESS_SPACE_IO, &pik->bt.io); pci_register_bar(pd, 0, PCI_BASE_ADDRESS_SPACE_IO, &pib->bt.io);
} }
const VMStateDescription vmstate_PCIIPMIBTDevice = { const VMStateDescription vmstate_PCIIPMIBTDevice = {
@ -96,16 +96,16 @@ const VMStateDescription vmstate_PCIIPMIBTDevice = {
static void pci_ipmi_bt_instance_init(Object *obj) static void pci_ipmi_bt_instance_init(Object *obj)
{ {
PCIIPMIBTDevice *pik = PCI_IPMI_BT(obj); PCIIPMIBTDevice *pib = PCI_IPMI_BT(obj);
ipmi_bmc_find_and_link(obj, (Object **) &pik->bt.bmc); ipmi_bmc_find_and_link(obj, (Object **) &pib->bt.bmc);
} }
static void *pci_ipmi_bt_get_backend_data(IPMIInterface *ii) static void *pci_ipmi_bt_get_backend_data(IPMIInterface *ii)
{ {
PCIIPMIBTDevice *pik = PCI_IPMI_BT(ii); PCIIPMIBTDevice *pib = PCI_IPMI_BT(ii);
return &pik->bt; return &pib->bt;
} }
static void pci_ipmi_bt_class_init(ObjectClass *oc, void *data) static void pci_ipmi_bt_class_init(ObjectClass *oc, void *data)