2022-01-16 06:46:32

by Christophe JAILLET

Subject: [PATCH] HID: amd_sfh: 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://lore.kernel.org/linux-kernel/[email protected]/#t

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

diff --git a/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c b/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c
index 2503be0253d3..673536d1d9ba 100644
--- a/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c
+++ b/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c
@@ -248,11 +248,8 @@ static int amd_mp2_pci_probe(struct pci_dev *pdev, const struct pci_device_id *i
pci_set_master(pdev);
rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
if (rc) {
- rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
- if (rc) {
- dev_err(&pdev->dev, "failed to set DMA mask\n");
- return rc;
- }
+ dev_err(&pdev->dev, "failed to set DMA mask\n");
+ return rc;
}

privdata->cl_data = devm_kzalloc(&pdev->dev, sizeof(struct amdtp_cl_data), GFP_KERNEL);
--
2.32.0

2022-01-17 17:04:35

by Basavaraj Natikar

Subject: Re: [PATCH] HID: amd_sfh: Remove useless DMA-32 fallback configuration

On 1/15/2022 8:54 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://lore.kernel.org/linux-kernel/[email protected]/#t
>
> Signed-off-by: Christophe JAILLET <[email protected]>
> ---
> drivers/hid/amd-sfh-hid/amd_sfh_pcie.c | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c b/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c
> index 2503be0253d3..673536d1d9ba 100644
> --- a/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c
> +++ b/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c
> @@ -248,11 +248,8 @@ static int amd_mp2_pci_probe(struct pci_dev *pdev, const struct pci_device_id *i
> pci_set_master(pdev);
> rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
> if (rc) {
> - rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
> - if (rc) {
> - dev_err(&pdev->dev, "failed to set DMA mask\n");
> - return rc;
> - }
> + dev_err(&pdev->dev, "failed to set DMA mask\n");
> + return rc;
> }
>
> privdata->cl_data = devm_kzalloc(&pdev->dev, sizeof(struct amdtp_cl_data), GFP_KERNEL);

Acked-by: Basavaraj Natikar <[email protected]>

Thanks,
Basavaraj

2022-01-24 18:51:24

by Jiri Kosina

Subject: Re: [PATCH] HID: amd_sfh: Remove useless DMA-32 fallback configuration

On Sat, 15 Jan 2022, 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://lore.kernel.org/linux-kernel/[email protected]/#t
>
> Signed-off-by: Christophe JAILLET <[email protected]>
> ---
> drivers/hid/amd-sfh-hid/amd_sfh_pcie.c | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c b/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c
> index 2503be0253d3..673536d1d9ba 100644
> --- a/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c
> +++ b/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c
> @@ -248,11 +248,8 @@ static int amd_mp2_pci_probe(struct pci_dev *pdev, const struct pci_device_id *i
> pci_set_master(pdev);
> rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
> if (rc) {
> - rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
> - if (rc) {
> - dev_err(&pdev->dev, "failed to set DMA mask\n");
> - return rc;
> - }
> + dev_err(&pdev->dev, "failed to set DMA mask\n");
> + return rc;
> }

Applied, thank you.

--
Jiri Kosina
SUSE Labs