| Message ID | 20240410195618.1632778-1-andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [v1,1/1] mmc: slot-gpio: Use irq_handler_t type | expand |
Am Mittwoch, 10. April 2024, 21:56:18 CEST schrieb Andy Shevchenko: > The irq_handler_t is already defined globally, let's use it > in slot-gpio code. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Looks good to me: Reviewed-by: Alexander Stein <alexander.stein@ew.tq-group.com> > --- > drivers/mmc/core/slot-gpio.c | 5 ++--- > include/linux/mmc/slot-gpio.h | 5 ++--- > 2 files changed, 4 insertions(+), 6 deletions(-) > > diff --git a/drivers/mmc/core/slot-gpio.c b/drivers/mmc/core/slot-gpio.c > index 39f45c2b6de8..8e4750558101 100644 > --- a/drivers/mmc/core/slot-gpio.c > +++ b/drivers/mmc/core/slot-gpio.c > @@ -19,7 +19,7 @@ > struct mmc_gpio { > struct gpio_desc *ro_gpio; > struct gpio_desc *cd_gpio; > - irqreturn_t (*cd_gpio_isr)(int irq, void *dev_id); > + irq_handler_t cd_gpio_isr; > char *ro_label; > char *cd_label; > u32 cd_debounce_delay_ms; > @@ -162,8 +162,7 @@ EXPORT_SYMBOL(mmc_gpio_set_cd_wake); > /* Register an alternate interrupt service routine for > * the card-detect GPIO. > */ > -void mmc_gpio_set_cd_isr(struct mmc_host *host, > - irqreturn_t (*isr)(int irq, void *dev_id)) > +void mmc_gpio_set_cd_isr(struct mmc_host *host, irq_handler_t isr) > { > struct mmc_gpio *ctx = host->slot.handler_priv; > > diff --git a/include/linux/mmc/slot-gpio.h b/include/linux/mmc/slot-gpio.h > index 5d3d15e97868..3e4d4836a2bb 100644 > --- a/include/linux/mmc/slot-gpio.h > +++ b/include/linux/mmc/slot-gpio.h > @@ -8,8 +8,8 @@ > #ifndef MMC_SLOT_GPIO_H > #define MMC_SLOT_GPIO_H > > +#include <linux/interrupt.h> > #include <linux/types.h> > -#include <linux/irqreturn.h> > > struct mmc_host; > > @@ -21,8 +21,7 @@ int mmc_gpiod_request_cd(struct mmc_host *host, const char *con_id, > unsigned int debounce); > int mmc_gpiod_request_ro(struct mmc_host *host, const char *con_id, > unsigned int idx, unsigned int debounce); > -void mmc_gpio_set_cd_isr(struct mmc_host *host, > - irqreturn_t (*isr)(int irq, void *dev_id)); > +void mmc_gpio_set_cd_isr(struct mmc_host *host, irq_handler_t isr); > int mmc_gpio_set_cd_wake(struct mmc_host *host, bool on); > void mmc_gpiod_request_cd_irq(struct mmc_host *host); > bool mmc_can_gpio_cd(struct mmc_host *host); >
On Wed, 10 Apr 2024 at 21:56, Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > > The irq_handler_t is already defined globally, let's use it > in slot-gpio code. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Applied for next, thanks! Kind regards Uffe > --- > drivers/mmc/core/slot-gpio.c | 5 ++--- > include/linux/mmc/slot-gpio.h | 5 ++--- > 2 files changed, 4 insertions(+), 6 deletions(-) > > diff --git a/drivers/mmc/core/slot-gpio.c b/drivers/mmc/core/slot-gpio.c > index 39f45c2b6de8..8e4750558101 100644 > --- a/drivers/mmc/core/slot-gpio.c > +++ b/drivers/mmc/core/slot-gpio.c > @@ -19,7 +19,7 @@ > struct mmc_gpio { > struct gpio_desc *ro_gpio; > struct gpio_desc *cd_gpio; > - irqreturn_t (*cd_gpio_isr)(int irq, void *dev_id); > + irq_handler_t cd_gpio_isr; > char *ro_label; > char *cd_label; > u32 cd_debounce_delay_ms; > @@ -162,8 +162,7 @@ EXPORT_SYMBOL(mmc_gpio_set_cd_wake); > /* Register an alternate interrupt service routine for > * the card-detect GPIO. > */ > -void mmc_gpio_set_cd_isr(struct mmc_host *host, > - irqreturn_t (*isr)(int irq, void *dev_id)) > +void mmc_gpio_set_cd_isr(struct mmc_host *host, irq_handler_t isr) > { > struct mmc_gpio *ctx = host->slot.handler_priv; > > diff --git a/include/linux/mmc/slot-gpio.h b/include/linux/mmc/slot-gpio.h > index 5d3d15e97868..3e4d4836a2bb 100644 > --- a/include/linux/mmc/slot-gpio.h > +++ b/include/linux/mmc/slot-gpio.h > @@ -8,8 +8,8 @@ > #ifndef MMC_SLOT_GPIO_H > #define MMC_SLOT_GPIO_H > > +#include <linux/interrupt.h> > #include <linux/types.h> > -#include <linux/irqreturn.h> > > struct mmc_host; > > @@ -21,8 +21,7 @@ int mmc_gpiod_request_cd(struct mmc_host *host, const char *con_id, > unsigned int debounce); > int mmc_gpiod_request_ro(struct mmc_host *host, const char *con_id, > unsigned int idx, unsigned int debounce); > -void mmc_gpio_set_cd_isr(struct mmc_host *host, > - irqreturn_t (*isr)(int irq, void *dev_id)); > +void mmc_gpio_set_cd_isr(struct mmc_host *host, irq_handler_t isr); > int mmc_gpio_set_cd_wake(struct mmc_host *host, bool on); > void mmc_gpiod_request_cd_irq(struct mmc_host *host); > bool mmc_can_gpio_cd(struct mmc_host *host); > -- > 2.43.0.rc1.1336.g36b5255a03ac >
diff --git a/drivers/mmc/core/slot-gpio.c b/drivers/mmc/core/slot-gpio.c index 39f45c2b6de8..8e4750558101 100644 --- a/drivers/mmc/core/slot-gpio.c +++ b/drivers/mmc/core/slot-gpio.c @@ -19,7 +19,7 @@ struct mmc_gpio { struct gpio_desc *ro_gpio; struct gpio_desc *cd_gpio; - irqreturn_t (*cd_gpio_isr)(int irq, void *dev_id); + irq_handler_t cd_gpio_isr; char *ro_label; char *cd_label; u32 cd_debounce_delay_ms; @@ -162,8 +162,7 @@ EXPORT_SYMBOL(mmc_gpio_set_cd_wake); /* Register an alternate interrupt service routine for * the card-detect GPIO. */ -void mmc_gpio_set_cd_isr(struct mmc_host *host, - irqreturn_t (*isr)(int irq, void *dev_id)) +void mmc_gpio_set_cd_isr(struct mmc_host *host, irq_handler_t isr) { struct mmc_gpio *ctx = host->slot.handler_priv; diff --git a/include/linux/mmc/slot-gpio.h b/include/linux/mmc/slot-gpio.h index 5d3d15e97868..3e4d4836a2bb 100644 --- a/include/linux/mmc/slot-gpio.h +++ b/include/linux/mmc/slot-gpio.h @@ -8,8 +8,8 @@ #ifndef MMC_SLOT_GPIO_H #define MMC_SLOT_GPIO_H +#include <linux/interrupt.h> #include <linux/types.h> -#include <linux/irqreturn.h> struct mmc_host; @@ -21,8 +21,7 @@ int mmc_gpiod_request_cd(struct mmc_host *host, const char *con_id, unsigned int debounce); int mmc_gpiod_request_ro(struct mmc_host *host, const char *con_id, unsigned int idx, unsigned int debounce); -void mmc_gpio_set_cd_isr(struct mmc_host *host, - irqreturn_t (*isr)(int irq, void *dev_id)); +void mmc_gpio_set_cd_isr(struct mmc_host *host, irq_handler_t isr); int mmc_gpio_set_cd_wake(struct mmc_host *host, bool on); void mmc_gpiod_request_cd_irq(struct mmc_host *host); bool mmc_can_gpio_cd(struct mmc_host *host);
The irq_handler_t is already defined globally, let's use it in slot-gpio code. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/mmc/core/slot-gpio.c | 5 ++--- include/linux/mmc/slot-gpio.h | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-)