Skip to content

Commit d84075c

Browse files
author
Pierre Ossman
committed
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>
1 parent 9f2fcf9 commit d84075c

File tree

5 files changed

+13
-15
lines changed

5 files changed

+13
-15
lines changed

drivers/mmc/core/core.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ int mmc_wait_for_cmd(struct mmc_host *host, struct mmc_command *cmd, int retries
202202
{
203203
struct mmc_request mrq;
204204

205-
BUG_ON(!host->claimed);
205+
WARN_ON(!host->claimed);
206206

207207
memset(&mrq, 0, sizeof(struct mmc_request));
208208

@@ -333,7 +333,7 @@ void mmc_release_host(struct mmc_host *host)
333333
{
334334
unsigned long flags;
335335

336-
BUG_ON(!host->claimed);
336+
WARN_ON(!host->claimed);
337337

338338
spin_lock_irqsave(&host->lock, flags);
339339
host->claimed = 0;
@@ -531,7 +531,7 @@ void mmc_attach_bus(struct mmc_host *host, const struct mmc_bus_ops *ops)
531531
BUG_ON(!host);
532532
BUG_ON(!ops);
533533

534-
BUG_ON(!host->claimed);
534+
WARN_ON(!host->claimed);
535535

536536
spin_lock_irqsave(&host->lock, flags);
537537

@@ -555,8 +555,8 @@ void mmc_detach_bus(struct mmc_host *host)
555555

556556
BUG_ON(!host);
557557

558-
BUG_ON(!host->claimed);
559-
BUG_ON(!host->bus_ops);
558+
WARN_ON(!host->claimed);
559+
WARN_ON(!host->bus_ops);
560560

561561
spin_lock_irqsave(&host->lock, flags);
562562

@@ -584,7 +584,7 @@ void mmc_detect_change(struct mmc_host *host, unsigned long delay)
584584
#ifdef CONFIG_MMC_DEBUG
585585
unsigned long flags;
586586
spin_lock_irqsave(&host->lock, flags);
587-
BUG_ON(host->removed);
587+
WARN_ON(host->removed);
588588
spin_unlock_irqrestore(&host->lock, flags);
589589
#endif
590590

drivers/mmc/core/mmc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
264264
unsigned int max_dtr;
265265

266266
BUG_ON(!host);
267-
BUG_ON(!host->claimed);
267+
WARN_ON(!host->claimed);
268268

269269
/*
270270
* Since we're changing the OCR value, we seem to
@@ -558,7 +558,7 @@ int mmc_attach_mmc(struct mmc_host *host, u32 ocr)
558558
int err;
559559

560560
BUG_ON(!host);
561-
BUG_ON(!host->claimed);
561+
WARN_ON(!host->claimed);
562562

563563
mmc_attach_bus(host, &mmc_ops);
564564

drivers/mmc/core/sd.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,6 @@ static int mmc_decode_scr(struct mmc_card *card)
166166
unsigned int scr_struct;
167167
u32 resp[4];
168168

169-
BUG_ON(!mmc_card_sd(card));
170-
171169
resp[3] = card->raw_scr[1];
172170
resp[2] = card->raw_scr[0];
173171

@@ -300,7 +298,7 @@ static int mmc_sd_init_card(struct mmc_host *host, u32 ocr,
300298
unsigned int max_dtr;
301299

302300
BUG_ON(!host);
303-
BUG_ON(!host->claimed);
301+
WARN_ON(!host->claimed);
304302

305303
/*
306304
* Since we're changing the OCR value, we seem to
@@ -620,7 +618,7 @@ int mmc_attach_sd(struct mmc_host *host, u32 ocr)
620618
int err;
621619

622620
BUG_ON(!host);
623-
BUG_ON(!host->claimed);
621+
WARN_ON(!host->claimed);
624622

625623
mmc_attach_bus(host, &mmc_sd_ops);
626624

drivers/mmc/core/sdio.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ int mmc_attach_sdio(struct mmc_host *host, u32 ocr)
230230
struct mmc_card *card;
231231

232232
BUG_ON(!host);
233-
BUG_ON(!host->claimed);
233+
WARN_ON(!host->claimed);
234234

235235
mmc_attach_bus(host, &mmc_sdio_ops);
236236

drivers/mmc/core/sdio_irq.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ static int sdio_card_irq_get(struct mmc_card *card)
125125
{
126126
struct mmc_host *host = card->host;
127127

128-
BUG_ON(!host->claimed);
128+
WARN_ON(!host->claimed);
129129

130130
if (!host->sdio_irqs++) {
131131
atomic_set(&host->sdio_irq_thread_abort, 0);
@@ -145,7 +145,7 @@ static int sdio_card_irq_put(struct mmc_card *card)
145145
{
146146
struct mmc_host *host = card->host;
147147

148-
BUG_ON(!host->claimed);
148+
WARN_ON(!host->claimed);
149149
BUG_ON(host->sdio_irqs < 1);
150150

151151
if (!--host->sdio_irqs) {

0 commit comments

Comments
 (0)