gpio: crystalcove: make irq_chip immutable
Subsystems (2)
PATCH 1/3 gpio: crystalcove: make irq_chip immutable
Since recently, the kernel is nagging about mutable irq_chips:
"not an immutable chip, please consider fixing it!"
Drop the unneeded copy, flag it as IRQCHIP_IMMUTABLE, add the new helper functions and call the appropriate gpiolib functions.
--- drivers/gpio/gpio-crystalcove.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-)
drivers/gpio/gpio-crystalcove.c +17 -9
@@ -15,6 +15,7 @@#include <linux/platform_device.h> #include <linux/regmap.h> #include <linux/seq_file.h> +#include <linux/types.h> #define CRYSTALCOVE_GPIO_NUM 16#define CRYSTALCOVE_VGPIO_NUM 95
@@ -238,10 +239,13 @@ static void crystalcove_bus_sync_unlock(struct irq_data *data)static void crystalcove_irq_unmask (struct irq_data *data) { -struct crystalcove_gpio *cg = -gpiochip_get_data (irq_data_get_irq_chip_data (data)); +struct gpio_chip *gc =irq_data_get_irq_chip_data (data); +struct crystalcove_gpio *cg =gpiochip_get_data (gc); +irq_hw_number_t hwirq =irqd_to_hwirq (data); + +gpiochip_enable_irq (gc, hwirq); -if (data->hwirq <CRYSTALCOVE_GPIO_NUM ) { +if (hwirq <CRYSTALCOVE_GPIO_NUM ) { cg->set_irq_mask = false; cg->update |=UPDATE_IRQ_MASK ; }
@@ -249,23 +253,27 @@ static void crystalcove_irq_unmask(struct irq_data *data)static void crystalcove_irq_mask (struct irq_data *data) { -struct crystalcove_gpio *cg = -gpiochip_get_data (irq_data_get_irq_chip_data (data)); +struct gpio_chip *gc =irq_data_get_irq_chip_data (data); +struct crystalcove_gpio *cg =gpiochip_get_data (gc); +irq_hw_number_t hwirq =irqd_to_hwirq (data); -if (data->hwirq <CRYSTALCOVE_GPIO_NUM ) { +if (hwirq <CRYSTALCOVE_GPIO_NUM ) { cg->set_irq_mask = true; cg->update |=UPDATE_IRQ_MASK ; } + +gpiochip_disable_irq (gc, hwirq); } -static struct irq_chip crystalcove_irqchip = { +static const struct irq_chip crystalcove_irqchip = { .name ="Crystal Cove" , .irq_mask = crystalcove_irq_mask, .irq_unmask = crystalcove_irq_unmask, .irq_set_type = crystalcove_irq_type, .irq_bus_lock = crystalcove_bus_lock, .irq_bus_sync_unlock = crystalcove_bus_sync_unlock, - .flags =IRQCHIP_SKIP_SET_WAKE , + .flags =IRQCHIP_SKIP_SET_WAKE |IRQCHIP_IMMUTABLE , +GPIOCHIP_IRQ_RESOURCE_HELPERS , };static irqreturn_t crystalcove_gpio_irq_handler (int irq,void *data)
@@ -353,7 +361,7 @@ static int crystalcove_gpio_probe(struct platform_device *pdev) cg->regmap = pmic->regmap; girq = &cg->chip.irq; - girq->chip = &crystalcove_irqchip; +gpio_irq_chip_set_chip (girq, &crystalcove_irqchip);/* This will let us handle the parent IRQ in the driver */ girq->parent_handler =NULL ; girq->num_parents =0 ;
Signature · 1 line
2.35.1
PATCH 2/3 gpio: crystalcove: Use specific type and API for IRQ number
Use specific type and API for IRQ number in the callbacks.
--- drivers/gpio/gpio-crystalcove.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/gpio/gpio-crystalcove.c +5 -4
@@ -188,8 +188,9 @@ static int crystalcove_irq_type(struct irq_data *data, unsigned int type) {struct crystalcove_gpio *cg =gpiochip_get_data (irq_data_get_irq_chip_data (data)); +irq_hw_number_t hwirq =irqd_to_hwirq (data); -if (data->hwirq >=CRYSTALCOVE_GPIO_NUM ) +if (hwirq >=CRYSTALCOVE_GPIO_NUM )return 0 ;switch (type) {
@@ -226,12 +227,12 @@ static void crystalcove_bus_sync_unlock(struct irq_data *data) {struct crystalcove_gpio *cg =gpiochip_get_data (irq_data_get_irq_chip_data (data)); -int gpio = data->hwirq; +irq_hw_number_t hwirq =irqd_to_hwirq (data);if (cg->update &UPDATE_IRQ_TYPE ) -crystalcove_update_irq_ctrl (cg, gpio); +crystalcove_update_irq_ctrl (cg, hwirq);if (cg->update &UPDATE_IRQ_MASK ) -crystalcove_update_irq_mask (cg, gpio); +crystalcove_update_irq_mask (cg, hwirq); cg->update =0 ;mutex_unlock (&cg->buslock);
Signature · 1 line
2.35.1
PATCH 3/3 gpio: crystalcove: Join function declarations and long lines
In reply to Andy ShevchenkoThere is no more hard limit of 80 characters for long lines, so join a few of them for better readability.
--- drivers/gpio/gpio-crystalcove.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-)
drivers/gpio/gpio-crystalcove.c +7 -14
@@ -111,8 +111,7 @@ static inline int to_reg(int gpio, enum ctrl_register reg_type)return reg + gpio %8 ; } -static void crystalcove_update_irq_mask (struct crystalcove_gpio *cg, -int gpio) +static void crystalcove_update_irq_mask (struct crystalcove_gpio *cg,int gpio) {u8 mirqs0 = gpio <8 ?MGPIO0IRQS0 :MGPIO1IRQS0 ;int mask =BIT (gpio %8 );
@@ -141,8 +140,7 @@ static int crystalcove_gpio_dir_in(struct gpio_chip *chip, unsigned int gpio)return regmap_write (cg->regmap, reg,CTLO_INPUT_SET ); } -static int crystalcove_gpio_dir_out (struct gpio_chip *chip,unsigned int gpio, -int value) +static int crystalcove_gpio_dir_out (struct gpio_chip *chip,unsigned int gpio,int value) {struct crystalcove_gpio *cg =gpiochip_get_data (chip);int reg =to_reg (gpio,CTRL_OUT );
@@ -169,8 +167,7 @@ static int crystalcove_gpio_get(struct gpio_chip *chip, unsigned int gpio)return val &0x1 ; } -static void crystalcove_gpio_set (struct gpio_chip *chip, -unsigned int gpio,int value) +static void crystalcove_gpio_set (struct gpio_chip *chip,unsigned int gpio,int value) {struct crystalcove_gpio *cg =gpiochip_get_data (chip);int reg =to_reg (gpio,CTRL_OUT );
@@ -186,8 +183,7 @@ static void crystalcove_gpio_set(struct gpio_chip *chip,static int crystalcove_irq_type (struct irq_data *data,unsigned int type) { -struct crystalcove_gpio *cg = -gpiochip_get_data (irq_data_get_irq_chip_data (data)); +struct crystalcove_gpio *cg =gpiochip_get_data (irq_data_get_irq_chip_data (data));irq_hw_number_t hwirq =irqd_to_hwirq (data);if (hwirq >=CRYSTALCOVE_GPIO_NUM )
@@ -217,16 +213,14 @@ static int crystalcove_irq_type(struct irq_data *data, unsigned int type)static void crystalcove_bus_lock (struct irq_data *data) { -struct crystalcove_gpio *cg = -gpiochip_get_data (irq_data_get_irq_chip_data (data)); +struct crystalcove_gpio *cg =gpiochip_get_data (irq_data_get_irq_chip_data (data));mutex_lock (&cg->buslock); }static void crystalcove_bus_sync_unlock (struct irq_data *data) { -struct crystalcove_gpio *cg = -gpiochip_get_data (irq_data_get_irq_chip_data (data)); +struct crystalcove_gpio *cg =gpiochip_get_data (irq_data_get_irq_chip_data (data));irq_hw_number_t hwirq =irqd_to_hwirq (data);if (cg->update &UPDATE_IRQ_TYPE )
@@ -302,8 +296,7 @@ static irqreturn_t crystalcove_gpio_irq_handler(int irq, void *data)return IRQ_HANDLED ; } -static void crystalcove_gpio_dbg_show (struct seq_file *s, -struct gpio_chip *chip) +static void crystalcove_gpio_dbg_show (struct seq_file *s,struct gpio_chip *chip) {struct crystalcove_gpio *cg =gpiochip_get_data (chip);int gpio, offset;
Signature · 1 line
2.35.1
Quoted 87 lines · Andy Shevchenko
Since recently, the kernel is nagging about mutable
irq_chips:"not an immutable chip, please consider fixing it!"
Drop the unneeded copy, flag it as
IRQCHIP_IMMUTABLE, add the new helper functions and call the appropriate gpiolib functions.Signed-off-by Andy Shevchenko <[email protected]>--- drivers/gpio/gpio-crystalcove.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-)drivers/gpio/gpio-crystalcove.c +17
-10@@ -15,6 +15,7 @@#include <linux/platform_device.h> #include <linux/regmap.h> #include <linux/seq_file.h> +#include <linux/types.h> #define CRYSTALCOVE_GPIO_NUM 16#define CRYSTALCOVE_VGPIO_NUM 95@@ -238,10 +239,13 @@ static void crystalcove_bus_sync_unlock(struct irq_data *data)static void crystalcove_irq_unmask (struct irq_data *data) { -struct crystalcove_gpio *cg = -gpiochip_get_data (irq_data_get_irq_chip_data (data)); +struct gpio_chip *gc =irq_data_get_irq_chip_data (data); +struct crystalcove_gpio *cg =gpiochip_get_data (gc); +irq_hw_number_t hwirq =irqd_to_hwirq (data); + +gpiochip_enable_irq (gc, hwirq); -if (data->hwirq <CRYSTALCOVE_GPIO_NUM ) { +if (hwirq <CRYSTALCOVE_GPIO_NUM ) { cg->set_irq_mask = false; cg->update |=UPDATE_IRQ_MASK ; }@@ -249,23 +253,27 @@ static void crystalcove_irq_unmask(struct irq_data *data)static void crystalcove_irq_mask (struct irq_data *data) { -struct crystalcove_gpio *cg = -gpiochip_get_data (irq_data_get_irq_chip_data (data)); +struct gpio_chip *gc =irq_data_get_irq_chip_data (data); +struct crystalcove_gpio *cg =gpiochip_get_data (gc); +irq_hw_number_t hwirq =irqd_to_hwirq (data); -if (data->hwirq <CRYSTALCOVE_GPIO_NUM ) { +if (hwirq <CRYSTALCOVE_GPIO_NUM ) { cg->set_irq_mask = true; cg->update |=UPDATE_IRQ_MASK ; } + +gpiochip_disable_irq (gc, hwirq); } -static struct irq_chip crystalcove_irqchip = { +static const struct irq_chip crystalcove_irqchip = { .name ="Crystal Cove" , .irq_mask = crystalcove_irq_mask, .irq_unmask = crystalcove_irq_unmask, .irq_set_type = crystalcove_irq_type, .irq_bus_lock = crystalcove_bus_lock, .irq_bus_sync_unlock = crystalcove_bus_sync_unlock, - .flags =IRQCHIP_SKIP_SET_WAKE , + .flags =IRQCHIP_SKIP_SET_WAKE |IRQCHIP_IMMUTABLE , +GPIOCHIP_IRQ_RESOURCE_HELPERS , };static irqreturn_t crystalcove_gpio_irq_handler (int irq,void *data)@@ -353,7 +361,7 @@ static int crystalcove_gpio_probe(struct platform_device *pdev) cg->regmap = pmic->regmap; girq = &cg->chip.irq; - girq->chip = &crystalcove_irqchip; +gpio_irq_chip_set_chip (girq, &crystalcove_irqchip);/* This will let us handle the parent IRQ in the driver */ girq->parent_handler =NULL ; girq->num_parents =0 ; --2.35.1
Signature · 2 lines
With Best Regards, Andy Shevchenko
On Wed, Jun 1, 2022 at 5:04 PM Andy Shevchenko
<[email protected]> wrote:
...
Quoted 1 line
+
gpiochip_enable_irq(gc, hwirq);
I think we do not need to do this for pins that we do not touch as IRQs (they are vGPIOs with GPE capabilities, AFAIR).
Quoted 5 lines
drivers/gpio/gpio-crystalcove.c +1
-1-if (data->hwirq <CRYSTALCOVE_GPIO_NUM ) { +if (hwirq <CRYSTALCOVE_GPIO_NUM ) { cg->set_irq_mask = false; cg->update |=UPDATE_IRQ_MASK ; }
...
drivers/gpio/gpio-crystalcove.c static void crystalcove_irq_unmask(struct irq_data *data) · line 265
Quoted 7 lines
drivers/gpio/gpio-crystalcove.c +3
-1-if (data->hwirq <CRYSTALCOVE_GPIO_NUM ) { +if (hwirq <CRYSTALCOVE_GPIO_NUM ) { cg->set_irq_mask = true; cg->update |=UPDATE_IRQ_MASK ; } + +gpiochip_disable_irq (gc, hwirq);
Ditto.
Signature · 2 lines
With Best Regards, Andy Shevchenko