From 1e830cc89e9bd8abadbcf4eae04c7bc67e8130c8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E9=BB=84=E6=B6=9B?= Date: Sun, 13 Feb 2011 15:54:00 +0800 Subject: [PATCH] quiet sdcard insert/remove --- block/blk-core.c | 2 +- drivers/mmc/card/block.c | 12 ++++++------ drivers/mmc/host/rk29_sdmmc.c | 2 +- fs/fat/dir.c | 2 +- fs/fat/fatent.c | 4 ++-- fs/fat/inode.c | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/block/blk-core.c b/block/blk-core.c index ae835b42b6a3..08452083dd2d 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -1971,7 +1971,7 @@ bool blk_update_request(struct request *req, int error, unsigned int nr_bytes) req->errors = 0; if (error && (blk_fs_request(req) && !(req->cmd_flags & REQ_QUIET))) { - printk(KERN_ERR "end_request: I/O error, dev %s, sector %llu\n", + printk(KERN_DEBUG "end_request: I/O error, dev %s, sector %llu\n", req->rq_disk ? req->rq_disk->disk_name : "?", (unsigned long long)blk_rq_pos(req)); } diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index 8d2bd242ac63..98f74b0087b5 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -236,7 +236,7 @@ static u32 get_card_status(struct mmc_card *card, struct request *req) cmd.flags = MMC_RSP_SPI_R2 | MMC_RSP_R1 | MMC_CMD_AC; err = mmc_wait_for_cmd(card->host, &cmd, 0); if (err) - printk(KERN_ERR "%s: error %d sending status comand", + printk(KERN_DEBUG "%s: error %d sending status comand", req->rq_disk->disk_name, err); return cmd.resp[0]; } @@ -379,7 +379,7 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req) if (brq.cmd.error || brq.data.error || brq.stop.error) { if (brq.data.blocks > 1 && rq_data_dir(req) == READ) { /* Redo read one sector at a time */ - printk(KERN_WARNING "%s: retrying using single " + printk(KERN_DEBUG "%s: retrying using single " "block read\n", req->rq_disk->disk_name); disable_multi = 1; continue; @@ -390,7 +390,7 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req) } if (brq.cmd.error) { - printk(KERN_ERR "%s: error %d sending read/write " + printk(KERN_DEBUG "%s: error %d sending read/write " "command, response %#x, card status %#x\n", req->rq_disk->disk_name, brq.cmd.error, brq.cmd.resp[0], status); @@ -400,7 +400,7 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req) if (brq.data.error == -ETIMEDOUT && brq.mrq.stop) /* 'Stop' response contains card status */ status = brq.mrq.stop->resp[0]; - printk(KERN_ERR "%s: error %d transferring data," + printk(KERN_DEBUG "%s: error %d transferring data," " sector %u, nr %u, card status %#x\n", req->rq_disk->disk_name, brq.data.error, (unsigned)blk_rq_pos(req), @@ -408,7 +408,7 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req) } if (brq.stop.error) { - printk(KERN_ERR "%s: error %d sending stop command, " + printk(KERN_DEBUG "%s: error %d sending stop command, " "response %#x, card status %#x\n", req->rq_disk->disk_name, brq.stop.error, brq.stop.resp[0], status); @@ -423,7 +423,7 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req) cmd.flags = MMC_RSP_R1 | MMC_CMD_AC; err = mmc_wait_for_cmd(card->host, &cmd, 5); if (err) { - printk(KERN_ERR "%s: error %d requesting status\n", + printk(KERN_DEBUG "%s: error %d requesting status\n", req->rq_disk->disk_name, err); goto cmd_err; } diff --git a/drivers/mmc/host/rk29_sdmmc.c b/drivers/mmc/host/rk29_sdmmc.c index ec3998bc7a9a..291d05db0bef 100755 --- a/drivers/mmc/host/rk29_sdmmc.c +++ b/drivers/mmc/host/rk29_sdmmc.c @@ -446,7 +446,7 @@ static void rk29_sdmmc_dma_complete(void *arg, int size, enum rk29_dma_buffresul rk29_dma_ctrl(host->dma_chn,RK29_DMAOP_STOP); rk29_dma_ctrl(host->dma_chn,RK29_DMAOP_FLUSH); rk29_sdmmc_write(host->regs, SDMMC_CTRL, (rk29_sdmmc_read(host->regs, SDMMC_CTRL))&(~SDMMC_CTRL_DMA_ENABLE)); - printk("%s: sdio dma complete err\n",__FUNCTION__); + printk(KERN_DEBUG "%s: sdio dma complete err\n",__FUNCTION__); } } diff --git a/fs/fat/dir.c b/fs/fat/dir.c index 4ceff5110417..8b84099e00ca 100644 --- a/fs/fat/dir.c +++ b/fs/fat/dir.c @@ -97,7 +97,7 @@ next: *bh = sb_bread(sb, phys); if (*bh == NULL) { - printk(KERN_ERR "FAT: Directory bread(block %llu) failed\n", + printk(KERN_DEBUG "FAT: Directory bread(block %llu) failed\n", (llu)phys); /* skip this block */ *pos = (iblock + 1) << sb->s_blocksize_bits; diff --git a/fs/fat/fatent.c b/fs/fat/fatent.c index a81037721a6f..4eb027e8e011 100644 --- a/fs/fat/fatent.c +++ b/fs/fat/fatent.c @@ -95,7 +95,7 @@ static int fat12_ent_bread(struct super_block *sb, struct fat_entry *fatent, err_brelse: brelse(bhs[0]); err: - printk(KERN_ERR "FAT: FAT read failed (blocknr %llu)\n", (llu)blocknr); + printk(KERN_DEBUG "FAT: FAT read failed (blocknr %llu)\n", (llu)blocknr); return -EIO; } @@ -108,7 +108,7 @@ static int fat_ent_bread(struct super_block *sb, struct fat_entry *fatent, fatent->fat_inode = MSDOS_SB(sb)->fat_inode; fatent->bhs[0] = sb_bread(sb, blocknr); if (!fatent->bhs[0]) { - printk(KERN_ERR "FAT: FAT read failed (blocknr %llu)\n", + printk(KERN_DEBUG "FAT: FAT read failed (blocknr %llu)\n", (llu)blocknr); return -EIO; } diff --git a/fs/fat/inode.c b/fs/fat/inode.c index 81261eb3215d..031d91f72926 100644 --- a/fs/fat/inode.c +++ b/fs/fat/inode.c @@ -1249,7 +1249,7 @@ int fat_fill_super(struct super_block *sb, void *data, int silent, sb_min_blocksize(sb, 512); bh = sb_bread(sb, 0); if (bh == NULL) { - printk(KERN_ERR "FAT: unable to read boot sector\n"); + printk(KERN_DEBUG "FAT: unable to read boot sector\n"); goto out_fail; } @@ -1315,7 +1315,7 @@ int fat_fill_super(struct super_block *sb, void *data, int silent, } bh = sb_bread(sb, 0); if (bh == NULL) { - printk(KERN_ERR "FAT: unable to read boot sector" + printk(KERN_DEBUG "FAT: unable to read boot sector" " (logical sector size = %lu)\n", sb->s_blocksize); goto out_fail; -- 2.34.1