| Message ID | 20230817070932.341667-1-ruanjinjie@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Krzysztof Wilczyński |
| Headers | show |
| Series | [-next] PCI: endpoint: Use helper function IS_ERR_OR_NULL() | expand |
On Thu, Aug 17, 2023 at 03:09:31PM +0800, Ruan Jinjie wrote: > Use IS_ERR_OR_NULL() instead of open-coding it > to simplify the code. > > Signed-off-by: Ruan Jinjie <ruanjinjie@huawei.com> Reviewed-by: Manivannan Sadhasivam <mani@kernel.org> - Mani > --- > drivers/pci/endpoint/pci-epc-core.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/pci/endpoint/pci-epc-core.c b/drivers/pci/endpoint/pci-epc-core.c > index 5a4a8b0be626..fe421d46a8a4 100644 > --- a/drivers/pci/endpoint/pci-epc-core.c > +++ b/drivers/pci/endpoint/pci-epc-core.c > @@ -38,7 +38,7 @@ static int devm_pci_epc_match(struct device *dev, void *res, void *match_data) > */ > void pci_epc_put(struct pci_epc *epc) > { > - if (!epc || IS_ERR(epc)) > + if (IS_ERR_OR_NULL(epc)) > return; > > module_put(epc->ops->owner); > @@ -660,7 +660,7 @@ void pci_epc_remove_epf(struct pci_epc *epc, struct pci_epf *epf, > struct list_head *list; > u32 func_no = 0; > > - if (!epc || IS_ERR(epc) || !epf) > + if (IS_ERR_OR_NULL(epc) || !epf) > return; > > if (type == PRIMARY_INTERFACE) { > @@ -691,7 +691,7 @@ void pci_epc_linkup(struct pci_epc *epc) > { > struct pci_epf *epf; > > - if (!epc || IS_ERR(epc)) > + if (IS_ERR_OR_NULL(epc)) > return; > > mutex_lock(&epc->list_lock); > @@ -717,7 +717,7 @@ void pci_epc_linkdown(struct pci_epc *epc) > { > struct pci_epf *epf; > > - if (!epc || IS_ERR(epc)) > + if (IS_ERR_OR_NULL(epc)) > return; > > mutex_lock(&epc->list_lock); > @@ -743,7 +743,7 @@ void pci_epc_init_notify(struct pci_epc *epc) > { > struct pci_epf *epf; > > - if (!epc || IS_ERR(epc)) > + if (IS_ERR_OR_NULL(epc)) > return; > > mutex_lock(&epc->list_lock); > @@ -769,7 +769,7 @@ void pci_epc_bme_notify(struct pci_epc *epc) > { > struct pci_epf *epf; > > - if (!epc || IS_ERR(epc)) > + if (IS_ERR_OR_NULL(epc)) > return; > > mutex_lock(&epc->list_lock); > -- > 2.34.1 >
Hello, > Use IS_ERR_OR_NULL() instead of open-coding it > to simplify the code. Applied to endpoint, thank you! [1/1] PCI: endpoint: Use IS_ERR_OR_NULL() helper function https://git.kernel.org/pci/pci/c/6f6a75878e64 Krzysztof
diff --git a/drivers/pci/endpoint/pci-epc-core.c b/drivers/pci/endpoint/pci-epc-core.c index 5a4a8b0be626..fe421d46a8a4 100644 --- a/drivers/pci/endpoint/pci-epc-core.c +++ b/drivers/pci/endpoint/pci-epc-core.c @@ -38,7 +38,7 @@ static int devm_pci_epc_match(struct device *dev, void *res, void *match_data) */ void pci_epc_put(struct pci_epc *epc) { - if (!epc || IS_ERR(epc)) + if (IS_ERR_OR_NULL(epc)) return; module_put(epc->ops->owner); @@ -660,7 +660,7 @@ void pci_epc_remove_epf(struct pci_epc *epc, struct pci_epf *epf, struct list_head *list; u32 func_no = 0; - if (!epc || IS_ERR(epc) || !epf) + if (IS_ERR_OR_NULL(epc) || !epf) return; if (type == PRIMARY_INTERFACE) { @@ -691,7 +691,7 @@ void pci_epc_linkup(struct pci_epc *epc) { struct pci_epf *epf; - if (!epc || IS_ERR(epc)) + if (IS_ERR_OR_NULL(epc)) return; mutex_lock(&epc->list_lock); @@ -717,7 +717,7 @@ void pci_epc_linkdown(struct pci_epc *epc) { struct pci_epf *epf; - if (!epc || IS_ERR(epc)) + if (IS_ERR_OR_NULL(epc)) return; mutex_lock(&epc->list_lock); @@ -743,7 +743,7 @@ void pci_epc_init_notify(struct pci_epc *epc) { struct pci_epf *epf; - if (!epc || IS_ERR(epc)) + if (IS_ERR_OR_NULL(epc)) return; mutex_lock(&epc->list_lock); @@ -769,7 +769,7 @@ void pci_epc_bme_notify(struct pci_epc *epc) { struct pci_epf *epf; - if (!epc || IS_ERR(epc)) + if (IS_ERR_OR_NULL(epc)) return; mutex_lock(&epc->list_lock);
Use IS_ERR_OR_NULL() instead of open-coding it to simplify the code. Signed-off-by: Ruan Jinjie <ruanjinjie@huawei.com> --- drivers/pci/endpoint/pci-epc-core.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)