Skip to contentSkip to conversation

hsmmc: request_irq says which controller is involved

PATCH In review David Brownell 2 participants 2 messages Sep 21, 2008 – Sep 25, 2008

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hsmmc: request_irq says which controller is involved

Make the hsmmc driver irq requests say which controller they're associated with (e.g. "mmc0") so /proc/interrupts is more useful.

drivers/mmc/host/omap_hsmmc.c +4 -4
@@ -908,8 +908,8 @@ static int __init omap_mmc_probe(struct platform_device *pdev)
 			OMAP_HSMMC_READ(host->base, HCTL) | SDBP);
 
 	/* Request IRQ for MMC operations */
-	ret = request_irq(host->irq, mmc_omap_irq, IRQF_DISABLED, pdev->name,
-			 host);
+	ret = request_irq(host->irq, mmc_omap_irq, IRQF_DISABLED,
+			mmc_hostname(mmc), host);
 	if (ret) {
 		dev_dbg(mmc_dev(host->mmc), "Unable to grab HSMMC IRQ\n");
 		goto err_irq;
@@ -918,8 +918,8 @@ static int __init omap_mmc_probe(struct platform_device *pdev)
 	/* Request IRQ for card detect */
 	if ((mmc_slot(host).card_detect_irq) && (mmc_slot(host).card_detect)) {
 		ret = request_irq(mmc_slot(host).card_detect_irq,
-				  omap_mmc_cd_handler, IRQF_DISABLED, "MMC CD",
-				  host);
+				  omap_mmc_cd_handler, IRQF_DISABLED,
+				  mmc_hostname(mmc), host);
 		if (ret) {
 			dev_dbg(mmc_dev(host->mmc),
 				"Unable to grab MMC CD IRQ\n");
#1 lore raw
Quoted 2 lines · David Brownell

Make the hsmmc driver irq requests say which controller they're associated with (e.g. "mmc0") so /proc/interrupts is more useful.

Pushing today.

Tony

Quoted 31 lines
drivers/mmc/host/omap_hsmmc.c +4 -5
@@ -908,8 +908,8 @@ static int __init omap_mmc_probe(struct platform_device *pdev)
 			OMAP_HSMMC_READ(host->base, HCTL) | SDBP);
 
 	/* Request IRQ for MMC operations */
-	ret = request_irq(host->irq, mmc_omap_irq, IRQF_DISABLED, pdev->name,
-			 host);
+	ret = request_irq(host->irq, mmc_omap_irq, IRQF_DISABLED,
+			mmc_hostname(mmc), host);
 	if (ret) {
 		dev_dbg(mmc_dev(host->mmc), "Unable to grab HSMMC IRQ\n");
 		goto err_irq;
@@ -918,8 +918,8 @@ static int __init omap_mmc_probe(struct platform_device *pdev)
 	/* Request IRQ for card detect */
 	if ((mmc_slot(host).card_detect_irq) && (mmc_slot(host).card_detect)) {
 		ret = request_irq(mmc_slot(host).card_detect_irq,
-				  omap_mmc_cd_handler, IRQF_DISABLED, "MMC CD",
-				  host);
+				  omap_mmc_cd_handler, IRQF_DISABLED,
+				  mmc_hostname(mmc), host);
 		if (ret) {
 			dev_dbg(mmc_dev(host->mmc),
 				"Unable to grab MMC CD IRQ\n");
--

To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html