2022-01-09 12:34:39

by Christophe JAILLET

[permalink] [raw]
Subject: [PATCH] i2c: amd-mp2: Remove useless DMA-32 fallback configuration

As stated in [1], dma_set_mask() with a 64-bit mask never fails if
dev->dma_mask is non-NULL.
So, if it fails, the 32 bits case will also fail for the same reason.


Simplify code and remove some dead code accordingly.

[1]: https://lkml.org/lkml/2021/6/7/398

Signed-off-by: Christophe JAILLET <[email protected]>
---
drivers/i2c/busses/i2c-amd-mp2-pci.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/i2c/busses/i2c-amd-mp2-pci.c b/drivers/i2c/busses/i2c-amd-mp2-pci.c
index adf0e8c1ec01..f57077a7448d 100644
--- a/drivers/i2c/busses/i2c-amd-mp2-pci.c
+++ b/drivers/i2c/busses/i2c-amd-mp2-pci.c
@@ -308,11 +308,8 @@ static int amd_mp2_pci_init(struct amd_mp2_dev *privdata,
pci_set_master(pci_dev);

rc = dma_set_mask(&pci_dev->dev, DMA_BIT_MASK(64));
- if (rc) {
- rc = dma_set_mask(&pci_dev->dev, DMA_BIT_MASK(32));
- if (rc)
- goto err_dma_mask;
- }
+ if (rc)
+ goto err_dma_mask;

/* Set up intx irq */
writel(0, privdata->mmio + AMD_P2C_MSG_INTEN);
--
2.32.0



2022-01-13 10:28:47

by Shah, Nehal-bakulchandra

[permalink] [raw]
Subject: Re: [PATCH] i2c: amd-mp2: Remove useless DMA-32 fallback configuration

On 1/9/2022 6:04 PM, Christophe JAILLET wrote:
> As stated in [1], dma_set_mask() with a 64-bit mask never fails if
> dev->dma_mask is non-NULL.
> So, if it fails, the 32 bits case will also fail for the same reason.
>
>
> Simplify code and remove some dead code accordingly.
>
> [1]: https://lkml.org/lkml/2021/6/7/398
>
> Signed-off-by: Christophe JAILLET <[email protected]>
> ---
> drivers/i2c/busses/i2c-amd-mp2-pci.c | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-amd-mp2-pci.c b/drivers/i2c/busses/i2c-amd-mp2-pci.c
> index adf0e8c1ec01..f57077a7448d 100644
> --- a/drivers/i2c/busses/i2c-amd-mp2-pci.c
> +++ b/drivers/i2c/busses/i2c-amd-mp2-pci.c
> @@ -308,11 +308,8 @@ static int amd_mp2_pci_init(struct amd_mp2_dev *privdata,
> pci_set_master(pci_dev);
>
> rc = dma_set_mask(&pci_dev->dev, DMA_BIT_MASK(64));
> - if (rc) {
> - rc = dma_set_mask(&pci_dev->dev, DMA_BIT_MASK(32));
> - if (rc)
> - goto err_dma_mask;
> - }
> + if (rc)
> + goto err_dma_mask;
>
> /* Set up intx irq */
> writel(0, privdata->mmio + AMD_P2C_MSG_INTEN);
>
Acked-by: Nehal Bakulchandra Shah<[email protected]>

2022-02-08 01:05:56

by Wolfram Sang

[permalink] [raw]
Subject: Re: [PATCH] i2c: amd-mp2: Remove useless DMA-32 fallback configuration

On Sun, Jan 09, 2022 at 01:34:18PM +0100, Christophe JAILLET wrote:
> As stated in [1], dma_set_mask() with a 64-bit mask never fails if
> dev->dma_mask is non-NULL.
> So, if it fails, the 32 bits case will also fail for the same reason.
>
>
> Simplify code and remove some dead code accordingly.
>
> [1]: https://lkml.org/lkml/2021/6/7/398
>
> Signed-off-by: Christophe JAILLET <[email protected]>

Applied to for-next, thanks!

Attachments:
(No filename) (460.00 B)
 signature.asc (849.00 B)
 Download all attachments