[14/18] mfd: sprd-sc27xx-spi: Replace irqchip mask_invert with unmask_base

Message ID 20221112151835.39059-15-aidanmacdonald.0x0@gmail.com
State New
Headers
Series mfd: Clean up deprecated regmap-irq functionality |

Commit Message

Aidan MacDonald Nov. 12, 2022, 3:18 p.m. UTC
  Remove use of the deprecated mask_invert flag. Inverted mask
registers (where a '1' bit enables an IRQ) can be described more
directly as an unmask register.

Signed-off-by: Aidan MacDonald <aidanmacdonald.0x0@gmail.com>
---
 drivers/mfd/sprd-sc27xx-spi.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
  

Comments

Baolin Wang Nov. 14, 2022, 6:34 a.m. UTC | #1
On 11/12/2022 11:18 PM, Aidan MacDonald wrote:
> Remove use of the deprecated mask_invert flag. Inverted mask
> registers (where a '1' bit enables an IRQ) can be described more
> directly as an unmask register.
> 
> Signed-off-by: Aidan MacDonald <aidanmacdonald.0x0@gmail.com>

LGTM. Thanks.
Reviewed-by: Baolin Wang <baolin.wang@linux.alibaba.com>

> ---
>   drivers/mfd/sprd-sc27xx-spi.c | 3 +--
>   1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/mfd/sprd-sc27xx-spi.c b/drivers/mfd/sprd-sc27xx-spi.c
> index d05a47c5187f..a4a9b81a952b 100644
> --- a/drivers/mfd/sprd-sc27xx-spi.c
> +++ b/drivers/mfd/sprd-sc27xx-spi.c
> @@ -181,11 +181,10 @@ static int sprd_pmic_probe(struct spi_device *spi)
>   	ddata->irq_chip.name = dev_name(&spi->dev);
>   	ddata->irq_chip.status_base =
>   		pdata->irq_base + SPRD_PMIC_INT_MASK_STATUS;
> -	ddata->irq_chip.mask_base = pdata->irq_base + SPRD_PMIC_INT_EN;
> +	ddata->irq_chip.unmask_base = pdata->irq_base + SPRD_PMIC_INT_EN;
>   	ddata->irq_chip.ack_base = 0;
>   	ddata->irq_chip.num_regs = 1;
>   	ddata->irq_chip.num_irqs = pdata->num_irqs;
> -	ddata->irq_chip.mask_invert = true;
>   
>   	ddata->irqs = devm_kcalloc(&spi->dev,
>   				   pdata->num_irqs, sizeof(struct regmap_irq),
  
Lee Jones Nov. 16, 2022, 5:58 p.m. UTC | #2
On Sat, 12 Nov 2022, Aidan MacDonald wrote:

> Remove use of the deprecated mask_invert flag. Inverted mask
> registers (where a '1' bit enables an IRQ) can be described more
> directly as an unmask register.
> 
> Signed-off-by: Aidan MacDonald <aidanmacdonald.0x0@gmail.com>
> ---
>  drivers/mfd/sprd-sc27xx-spi.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)

Applied, thanks.
  

Patch

diff --git a/drivers/mfd/sprd-sc27xx-spi.c b/drivers/mfd/sprd-sc27xx-spi.c
index d05a47c5187f..a4a9b81a952b 100644
--- a/drivers/mfd/sprd-sc27xx-spi.c
+++ b/drivers/mfd/sprd-sc27xx-spi.c
@@ -181,11 +181,10 @@  static int sprd_pmic_probe(struct spi_device *spi)
 	ddata->irq_chip.name = dev_name(&spi->dev);
 	ddata->irq_chip.status_base =
 		pdata->irq_base + SPRD_PMIC_INT_MASK_STATUS;
-	ddata->irq_chip.mask_base = pdata->irq_base + SPRD_PMIC_INT_EN;
+	ddata->irq_chip.unmask_base = pdata->irq_base + SPRD_PMIC_INT_EN;
 	ddata->irq_chip.ack_base = 0;
 	ddata->irq_chip.num_regs = 1;
 	ddata->irq_chip.num_irqs = pdata->num_irqs;
-	ddata->irq_chip.mask_invert = true;
 
 	ddata->irqs = devm_kcalloc(&spi->dev,
 				   pdata->num_irqs, sizeof(struct regmap_irq),