diff mbox series

[v3,3/8] xen/pci: Drop some checks that are always true

Message ID 20210811080637.2596434-4-u.kleine-koenig@pengutronix.de (mailing list archive)
State Superseded
Delegated to: Bjorn Helgaas
Headers show
Series PCI: Drop duplicated tracking of a pci_dev's bound driver | expand

Commit Message

Uwe Kleine-König Aug. 11, 2021, 8:06 a.m. UTC 
<boris.ostrovsky@oracle.com>, Juergen Gross <jgross@suse.com>
Cc: linux-pci@vger.kernel.org, kernel@pengutronix.de, Stefano Stabellini <sstabellini@kernel.org>, Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>, xen-devel@lists.xenproject.org

pcifront_common_process() has a check at the start that exits early if
pcidev or pdidev->driver are NULL. So simplify the following code by not
checking these two again.

Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 drivers/pci/xen-pcifront.c | 57 +++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 32 deletions(-)

Comments

Uwe Kleine-König Aug. 11, 2021, 9:51 a.m. UTC | #1 
This mail didn't reach all intended recipients as there was a newline at
the wrong place in the input for git send-email. I fixed this up for
this reply, please make sure to do the same if you reply to this patch.
The other patches in this thread should be fine. I'm keeping the mail
content below to facilitate replying.

Sorry for the inconvenience,
Uwe

On Wed, Aug 11, 2021 at 10:06:32AM +0200, Uwe Kleine-König wrote:
> pcifront_common_process() has a check at the start that exits early if
> pcidev or pdidev->driver are NULL. So simplify the following code by not
> checking these two again.
> 
> Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> ---
>  drivers/pci/xen-pcifront.c | 57 +++++++++++++++++---------------------
>  1 file changed, 25 insertions(+), 32 deletions(-)
> 
> diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c
> index b7a8f3a1921f..3c648e6cb8f8 100644
> --- a/drivers/pci/xen-pcifront.c
> +++ b/drivers/pci/xen-pcifront.c
> @@ -591,7 +591,6 @@ static pci_ers_result_t pcifront_common_process(int cmd,
>  	int devfn = pdev->sh_info->aer_op.devfn;
>  	int domain = pdev->sh_info->aer_op.domain;
>  	struct pci_dev *pcidev;
> -	int flag = 0;
>  
>  	dev_dbg(&pdev->xdev->dev,
>  		"pcifront AER process: cmd %x (bus:%x, devfn%x)",
> @@ -606,40 +605,34 @@ static pci_ers_result_t pcifront_common_process(int cmd,
>  	}
>  	pdrv = pcidev->driver;
>  
> -	if (pdrv) {
> -		if (pdrv->err_handler && pdrv->err_handler->error_detected) {
> -			pci_dbg(pcidev, "trying to call AER service\n");
> -			if (pcidev) {
> -				flag = 1;
> -				switch (cmd) {
> -				case XEN_PCI_OP_aer_detected:
> -					result = pdrv->err_handler->
> -						 error_detected(pcidev, state);
> -					break;
> -				case XEN_PCI_OP_aer_mmio:
> -					result = pdrv->err_handler->
> -						 mmio_enabled(pcidev);
> -					break;
> -				case XEN_PCI_OP_aer_slotreset:
> -					result = pdrv->err_handler->
> -						 slot_reset(pcidev);
> -					break;
> -				case XEN_PCI_OP_aer_resume:
> -					pdrv->err_handler->resume(pcidev);
> -					break;
> -				default:
> -					dev_err(&pdev->xdev->dev,
> -						"bad request in aer recovery "
> -						"operation!\n");
> -
> -				}
> -			}
> +	if (pdrv->err_handler && pdrv->err_handler->error_detected) {
> +		pci_dbg(pcidev, "trying to call AER service\n");
> +		switch (cmd) {
> +		case XEN_PCI_OP_aer_detected:
> +			result = pdrv->err_handler->
> +				 error_detected(pcidev, state);
> +			break;
> +		case XEN_PCI_OP_aer_mmio:
> +			result = pdrv->err_handler->
> +				 mmio_enabled(pcidev);
> +			break;
> +		case XEN_PCI_OP_aer_slotreset:
> +			result = pdrv->err_handler->
> +				 slot_reset(pcidev);
> +			break;
> +		case XEN_PCI_OP_aer_resume:
> +			pdrv->err_handler->resume(pcidev);
> +			break;
> +		default:
> +			dev_err(&pdev->xdev->dev,
> +				"bad request in aer recovery "
> +				"operation!\n");
>  		}
> +
> +		return result;
>  	}
> -	if (!flag)
> -		result = PCI_ERS_RESULT_NONE;
>  
> -	return result;
> +	return PCI_ERS_RESULT_NONE;
>  }
>  
>  
> -- 
> 2.30.2
> 
> 
>
Christoph Hellwig Aug. 12, 2021, 6:50 a.m. UTC | #2 
Looks good,

Reviewed-by: Christoph Hellwig <hch@lst.de>
diff mbox series

Patch

diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c
index b7a8f3a1921f..3c648e6cb8f8 100644
--- a/drivers/pci/xen-pcifront.c
+++ b/drivers/pci/xen-pcifront.c
@@ -591,7 +591,6 @@  static pci_ers_result_t pcifront_common_process(int cmd,
 	int devfn = pdev->sh_info->aer_op.devfn;
 	int domain = pdev->sh_info->aer_op.domain;
 	struct pci_dev *pcidev;
-	int flag = 0;
 
 	dev_dbg(&pdev->xdev->dev,
 		"pcifront AER process: cmd %x (bus:%x, devfn%x)",
@@ -606,40 +605,34 @@  static pci_ers_result_t pcifront_common_process(int cmd,
 	}
 	pdrv = pcidev->driver;
 
-	if (pdrv) {
-		if (pdrv->err_handler && pdrv->err_handler->error_detected) {
-			pci_dbg(pcidev, "trying to call AER service\n");
-			if (pcidev) {
-				flag = 1;
-				switch (cmd) {
-				case XEN_PCI_OP_aer_detected:
-					result = pdrv->err_handler->
-						 error_detected(pcidev, state);
-					break;
-				case XEN_PCI_OP_aer_mmio:
-					result = pdrv->err_handler->
-						 mmio_enabled(pcidev);
-					break;
-				case XEN_PCI_OP_aer_slotreset:
-					result = pdrv->err_handler->
-						 slot_reset(pcidev);
-					break;
-				case XEN_PCI_OP_aer_resume:
-					pdrv->err_handler->resume(pcidev);
-					break;
-				default:
-					dev_err(&pdev->xdev->dev,
-						"bad request in aer recovery "
-						"operation!\n");
-
-				}
-			}
+	if (pdrv->err_handler && pdrv->err_handler->error_detected) {
+		pci_dbg(pcidev, "trying to call AER service\n");
+		switch (cmd) {
+		case XEN_PCI_OP_aer_detected:
+			result = pdrv->err_handler->
+				 error_detected(pcidev, state);
+			break;
+		case XEN_PCI_OP_aer_mmio:
+			result = pdrv->err_handler->
+				 mmio_enabled(pcidev);
+			break;
+		case XEN_PCI_OP_aer_slotreset:
+			result = pdrv->err_handler->
+				 slot_reset(pcidev);
+			break;
+		case XEN_PCI_OP_aer_resume:
+			pdrv->err_handler->resume(pcidev);
+			break;
+		default:
+			dev_err(&pdev->xdev->dev,
+				"bad request in aer recovery "
+				"operation!\n");
 		}
+
+		return result;
 	}
-	if (!flag)
-		result = PCI_ERS_RESULT_NONE;
 
-	return result;
+	return PCI_ERS_RESULT_NONE;
 }