Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e6053dc authored by Geliang Tang's avatar Geliang Tang Committed by Bjorn Helgaas
Browse files

PCI/AER: Use list_first_entry_or_null() to simplify code 



Use list_first_entry_or_null() instead of list_empty() + list_entry() to
simplify the code.

Signed-off-by: default avatarGeliang Tang <geliangtang@163.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 7e8fbdc6

drivers/pci/pcie/aer/aer_inject.c

+5 −8
Original line number Diff line number Diff line
@@ -124,16 +124,13 @@ static struct pci_ops *__find_pci_bus_ops(struct pci_bus *bus) 
static struct pci_bus_ops *pci_bus_ops_pop(void)

{

	unsigned long flags;

	struct pci_bus_ops *bus_ops = NULL;

	struct pci_bus_ops *bus_ops;



	spin_lock_irqsave(&inject_lock, flags);

	if (list_empty(&pci_bus_ops_list))

		bus_ops = NULL;

	else {

		struct list_head *lh = pci_bus_ops_list.next;

		list_del(lh);

		bus_ops = list_entry(lh, struct pci_bus_ops, list);

	}

	bus_ops = list_first_entry_or_null(&pci_bus_ops_list,

					   struct pci_bus_ops, list);

	if (bus_ops)

		list_del(&bus_ops->list);

	spin_unlock_irqrestore(&inject_lock, flags);

	return bus_ops;

}