[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 03/17] ahci: Omit errp for pci_add_capability
From: |
Akihiko Odaki |
Subject: |
[PATCH v2 03/17] ahci: Omit errp for pci_add_capability |
Date: |
Sat, 22 Oct 2022 13:40:39 +0900 |
Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
---
hw/ide/ich.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/hw/ide/ich.c b/hw/ide/ich.c
index 1007a51fcb..3b478b01f8 100644
--- a/hw/ide/ich.c
+++ b/hw/ide/ich.c
@@ -106,7 +106,7 @@ static void pci_ich9_ahci_init(Object *obj)
static void pci_ich9_ahci_realize(PCIDevice *dev, Error **errp)
{
struct AHCIPCIState *d;
- int sata_cap_offset;
+ uint8_t sata_cap_offset;
uint8_t *sata_cap;
d = ICH9_AHCI(dev);
int ret;
@@ -130,11 +130,7 @@ static void pci_ich9_ahci_realize(PCIDevice *dev, Error
**errp)
&d->ahci.mem);
sata_cap_offset = pci_add_capability(dev, PCI_CAP_ID_SATA,
- ICH9_SATA_CAP_OFFSET, SATA_CAP_SIZE,
- errp);
- if (sata_cap_offset < 0) {
- return;
- }
+ ICH9_SATA_CAP_OFFSET, SATA_CAP_SIZE);
sata_cap = dev->config + sata_cap_offset;
pci_set_word(sata_cap + SATA_CAP_REV, 0x10);
--
2.37.3
- [PATCH v2 00/17] pci: Abort if pci_add_capability fails, Akihiko Odaki, 2022/10/22
- [PATCH v2 01/17] pci: Allow to omit errp for pci_add_capability, Akihiko Odaki, 2022/10/22
- [PATCH v2 02/17] hw/i386/amd_iommu: Omit errp for pci_add_capability, Akihiko Odaki, 2022/10/22
- [PATCH v2 03/17] ahci: Omit errp for pci_add_capability,
Akihiko Odaki <=
- [PATCH v2 04/17] e1000e: Omit errp for pci_add_capability, Akihiko Odaki, 2022/10/22
- [PATCH v2 05/17] eepro100: Omit errp for pci_add_capability, Akihiko Odaki, 2022/10/22
- [PATCH v2 06/17] hw/nvme: Omit errp for pci_add_capability, Akihiko Odaki, 2022/10/22
- [PATCH v2 07/17] msi: Omit errp for pci_add_capability, Akihiko Odaki, 2022/10/22
- [PATCH v2 08/17] hw/pci/pci_bridge: Omit errp for pci_add_capability, Akihiko Odaki, 2022/10/22
- [PATCH v2 09/17] pcie: Omit errp for pci_add_capability, Akihiko Odaki, 2022/10/22
- [PATCH v2 10/17] pci/shpc: Omit errp for pci_add_capability, Akihiko Odaki, 2022/10/22
- [PATCH v2 11/17] msix: Omit errp for pci_add_capability, Akihiko Odaki, 2022/10/22
- [PATCH v2 12/17] pci/slotid: Omit errp for pci_add_capability, Akihiko Odaki, 2022/10/22