tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

mmc: replace BUG_ON with WARN_ON

Replace all cases of BUG_ON with WARN_ON where there is a chance
(with varying degrees of slim) that the kernel can continue without
incidence.

Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>

Pierre Ossman d84075c8 9f2fcf99

+13 -15
+6 -6
drivers/mmc/core/core.c
··· 202 202 { 203 203 struct mmc_request mrq; 204 204 205 - BUG_ON(!host->claimed); 205 + WARN_ON(!host->claimed); 206 206 207 207 memset(&mrq, 0, sizeof(struct mmc_request)); 208 208 ··· 333 333 { 334 334 unsigned long flags; 335 335 336 - BUG_ON(!host->claimed); 336 + WARN_ON(!host->claimed); 337 337 338 338 spin_lock_irqsave(&host->lock, flags); 339 339 host->claimed = 0; ··· 531 531 BUG_ON(!host); 532 532 BUG_ON(!ops); 533 533 534 - BUG_ON(!host->claimed); 534 + WARN_ON(!host->claimed); 535 535 536 536 spin_lock_irqsave(&host->lock, flags); 537 537 ··· 555 555 556 556 BUG_ON(!host); 557 557 558 - BUG_ON(!host->claimed); 559 - BUG_ON(!host->bus_ops); 558 + WARN_ON(!host->claimed); 559 + WARN_ON(!host->bus_ops); 560 560 561 561 spin_lock_irqsave(&host->lock, flags); 562 562 ··· 584 584 #ifdef CONFIG_MMC_DEBUG 585 585 unsigned long flags; 586 586 spin_lock_irqsave(&host->lock, flags); 587 - BUG_ON(host->removed); 587 + WARN_ON(host->removed); 588 588 spin_unlock_irqrestore(&host->lock, flags); 589 589 #endif 590 590
+2 -2
drivers/mmc/core/mmc.c
··· 264 264 unsigned int max_dtr; 265 265 266 266 BUG_ON(!host); 267 - BUG_ON(!host->claimed); 267 + WARN_ON(!host->claimed); 268 268 269 269 /* 270 270 * Since we're changing the OCR value, we seem to ··· 558 558 int err; 559 559 560 560 BUG_ON(!host); 561 - BUG_ON(!host->claimed); 561 + WARN_ON(!host->claimed); 562 562 563 563 mmc_attach_bus(host, &mmc_ops); 564 564
+2 -4
drivers/mmc/core/sd.c
··· 166 166 unsigned int scr_struct; 167 167 u32 resp[4]; 168 168 169 - BUG_ON(!mmc_card_sd(card)); 170 - 171 169 resp[3] = card->raw_scr[1]; 172 170 resp[2] = card->raw_scr[0]; 173 171 ··· 298 300 unsigned int max_dtr; 299 301 300 302 BUG_ON(!host); 301 - BUG_ON(!host->claimed); 303 + WARN_ON(!host->claimed); 302 304 303 305 /* 304 306 * Since we're changing the OCR value, we seem to ··· 618 620 int err; 619 621 620 622 BUG_ON(!host); 621 - BUG_ON(!host->claimed); 623 + WARN_ON(!host->claimed); 622 624 623 625 mmc_attach_bus(host, &mmc_sd_ops); 624 626
+1 -1
drivers/mmc/core/sdio.c
··· 230 230 struct mmc_card *card; 231 231 232 232 BUG_ON(!host); 233 - BUG_ON(!host->claimed); 233 + WARN_ON(!host->claimed); 234 234 235 235 mmc_attach_bus(host, &mmc_sdio_ops); 236 236
+2 -2
drivers/mmc/core/sdio_irq.c
··· 125 125 { 126 126 struct mmc_host *host = card->host; 127 127 128 - BUG_ON(!host->claimed); 128 + WARN_ON(!host->claimed); 129 129 130 130 if (!host->sdio_irqs++) { 131 131 atomic_set(&host->sdio_irq_thread_abort, 0); ··· 145 145 { 146 146 struct mmc_host *host = card->host; 147 147 148 - BUG_ON(!host->claimed); 148 + WARN_ON(!host->claimed); 149 149 BUG_ON(host->sdio_irqs < 1); 150 150 151 151 if (!--host->sdio_irqs) {