* [PATCH] PCI/AER: Use list_first_entry_or_null() to simplify code
@ 2016-01-22 14:50 Geliang Tang
2016-02-04 22:04 ` Bjorn Helgaas
0 siblings, 1 reply; 2+ messages in thread
From: Geliang Tang @ 2016-01-22 14:50 UTC (permalink / raw)
To: Bjorn Helgaas, Keith Busch; +Cc: Geliang Tang, linux-pci, linux-kernel
Use list_first_entry_or_null() instead of list_empty() + list_entry()
to simplify the code.
Signed-off-by: Geliang Tang <geliangtang@163.com>
---
drivers/pci/pcie/aer/aer_inject.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/drivers/pci/pcie/aer/aer_inject.c b/drivers/pci/pcie/aer/aer_inject.c
index 20db790..f5a245f 100644
--- a/drivers/pci/pcie/aer/aer_inject.c
+++ b/drivers/pci/pcie/aer/aer_inject.c
@@ -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;
}
--
2.5.0
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] PCI/AER: Use list_first_entry_or_null() to simplify code
2016-01-22 14:50 [PATCH] PCI/AER: Use list_first_entry_or_null() to simplify code Geliang Tang
@ 2016-02-04 22:04 ` Bjorn Helgaas
0 siblings, 0 replies; 2+ messages in thread
From: Bjorn Helgaas @ 2016-02-04 22:04 UTC (permalink / raw)
To: Geliang Tang; +Cc: Bjorn Helgaas, Keith Busch, linux-pci, linux-kernel
On Fri, Jan 22, 2016 at 10:50:19PM +0800, Geliang Tang wrote:
> Use list_first_entry_or_null() instead of list_empty() + list_entry()
> to simplify the code.
>
> Signed-off-by: Geliang Tang <geliangtang@163.com>
Applied to pci/aer for v4.6, thanks, Geliang!
> ---
> drivers/pci/pcie/aer/aer_inject.c | 13 +++++--------
> 1 file changed, 5 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/pci/pcie/aer/aer_inject.c b/drivers/pci/pcie/aer/aer_inject.c
> index 20db790..f5a245f 100644
> --- a/drivers/pci/pcie/aer/aer_inject.c
> +++ b/drivers/pci/pcie/aer/aer_inject.c
> @@ -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;
> }
> --
> 2.5.0
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-02-04 22:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-22 14:50 [PATCH] PCI/AER: Use list_first_entry_or_null() to simplify code Geliang Tang
2016-02-04 22:04 ` Bjorn Helgaas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).