* [PATCH v1 1/1] mmc: slot-gpio: Use irq_handler_t type
@ 2024-04-10 19:56 Andy Shevchenko
2024-04-11 6:49 ` Alexander Stein
2024-04-25 16:21 ` Ulf Hansson
0 siblings, 2 replies; 3+ messages in thread
From: Andy Shevchenko @ 2024-04-10 19:56 UTC (permalink / raw)
To: Alexander Stein, Andy Shevchenko, linux-mmc, linux-kernel; +Cc: Ulf Hansson
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(-)
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v1 1/1] mmc: slot-gpio: Use irq_handler_t type
2024-04-10 19:56 [PATCH v1 1/1] mmc: slot-gpio: Use irq_handler_t type Andy Shevchenko
@ 2024-04-11 6:49 ` Alexander Stein
2024-04-25 16:21 ` Ulf Hansson
1 sibling, 0 replies; 3+ messages in thread
From: Alexander Stein @ 2024-04-11 6:49 UTC (permalink / raw)
To: Andy Shevchenko, linux-mmc, linux-kernel, Andy Shevchenko; +Cc: Ulf Hansson
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);
>
--
TQ-Systems GmbH | Mühlstraße 2, Gut Delling | 82229 Seefeld, Germany
Amtsgericht München, HRB 105018
Geschäftsführer: Detlef Schneider, Rüdiger Stahl, Stefan Schneider
http://www.tq-group.com/
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH v1 1/1] mmc: slot-gpio: Use irq_handler_t type
2024-04-10 19:56 [PATCH v1 1/1] mmc: slot-gpio: Use irq_handler_t type Andy Shevchenko
2024-04-11 6:49 ` Alexander Stein
@ 2024-04-25 16:21 ` Ulf Hansson
1 sibling, 0 replies; 3+ messages in thread
From: Ulf Hansson @ 2024-04-25 16:21 UTC (permalink / raw)
To: Andy Shevchenko; +Cc: Alexander Stein, linux-mmc, linux-kernel
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
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-04-25 16:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-10 19:56 [PATCH v1 1/1] mmc: slot-gpio: Use irq_handler_t type Andy Shevchenko
2024-04-11 6:49 ` Alexander Stein
2024-04-25 16:21 ` Ulf Hansson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox