Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9b0546a authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Chris Ball
Browse files

mmc: simplify mmc_cd_gpio_request() by removing two parameters 



Calculate the IRQ number, using gpio_to_irq() and use fixed flags: trigger
on both edges. This makes two out of four arguments of the
mmc_cd_gpio_request() function redundant.

Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 296e0b03

drivers/mmc/core/cd-gpio.c

+9 −4
Original line number Diff line number Diff line
@@ -28,13 +28,17 @@ static irqreturn_t mmc_cd_gpio_irqt(int irq, void *dev_id) 
	return IRQ_HANDLED;

}



int mmc_cd_gpio_request(struct mmc_host *host, unsigned int gpio,

			unsigned int irq, unsigned long flags)

int mmc_cd_gpio_request(struct mmc_host *host, unsigned int gpio)

{

	size_t len = strlen(dev_name(host->parent)) + 4;

	struct mmc_cd_gpio *cd = kmalloc(sizeof(*cd) + len, GFP_KERNEL);

	struct mmc_cd_gpio *cd;

	int irq = gpio_to_irq(gpio);

	int ret;



	if (irq < 0)

		return irq;



	cd = kmalloc(sizeof(*cd) + len, GFP_KERNEL);

	if (!cd)

		return -ENOMEM;
@@ -45,7 +49,8 @@ int mmc_cd_gpio_request(struct mmc_host *host, unsigned int gpio, 
		goto egpioreq;



	ret = request_threaded_irq(irq, NULL, mmc_cd_gpio_irqt,

				   flags, cd->label, host);

				   IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,

				   cd->label, host);

	if (ret < 0)

		goto eirqreq;

include/linux/mmc/cd-gpio.h

+1 −2
Original line number Diff line number Diff line
@@ -12,8 +12,7 @@ 
#define MMC_CD_GPIO_H



struct mmc_host;

int mmc_cd_gpio_request(struct mmc_host *host, unsigned int gpio,

			unsigned int irq, unsigned long flags);

int mmc_cd_gpio_request(struct mmc_host *host, unsigned int gpio);

void mmc_cd_gpio_free(struct mmc_host *host);



#endif