* [PATCH 0/5] drivers; mmc: card:
@ 2015-02-01 20:06 Sheetal Tigadoli
2015-02-01 20:06 ` [PATCH 1/5] drivers: mmc: card: Fix replaces simple_strtoul func call with kstrtoul Sheetal Tigadoli
0 siblings, 1 reply; 7+ messages in thread
From: Sheetal Tigadoli @ 2015-02-01 20:06 UTC (permalink / raw)
To: chris; +Cc: joe, linux-mmc, ben, kuninori.morimoto.gx, ulf.hansson,
linux-kernel
The patches, fix some coding style err/warnings from file block.c
./scripts/checkpatch.pl --file --terse drivers/mmc/card/block.c
drivers/mmc/card/block.c:45: WARNING: Use #include <linux/uaccess.h> instead of <asm/uaccess.h>
drivers/mmc/card/block.c:102: WARNING: line over 80 characters
drivers/mmc/card/block.c:186: WARNING: Missing a blank line after declarations
drivers/mmc/card/block.c:238: WARNING: line over 80 characters
drivers/mmc/card/block.c:251: WARNING: line over 80 characters
drivers/mmc/card/block.c:279: WARNING: simple_strtoul is obsolete, use kstrtoul instead
drivers/mmc/card/block.c:280: WARNING: Missing a blank line after declarations
drivers/mmc/card/block.c:578: WARNING: line over 80 characters
drivers/mmc/card/block.c:586: WARNING: line over 80 characters
drivers/mmc/card/block.c:620: WARNING: Missing a blank line after declarations
drivers/mmc/card/block.c:1209: WARNING: line over 80 characters
drivers/mmc/card/block.c:1333: WARNING: quoted string split across lines
drivers/mmc/card/block.c:1720: WARNING: Missing a blank line after declarations
drivers/mmc/card/block.c:1734: WARNING: braces {} are not necessary for single statement blocks
drivers/mmc/card/block.c:1881: WARNING: else is not generally useful after a break or return
drivers/mmc/card/block.c:2019: WARNING: braces {} are not necessary for single statement blocks
drivers/mmc/card/block.c:2226: WARNING: line over 80 characters
drivers/mmc/card/block.c:2285: WARNING: line over 80 characters
drivers/mmc/card/block.c:2362: ERROR: that open brace { should be on the previous line
total: 1 errors, 18 warnings, 2587 lines checked
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH 1/5] drivers: mmc: card: Fix replaces simple_strtoul func call with kstrtoul 2015-02-01 20:06 [PATCH 0/5] drivers; mmc: card: Sheetal Tigadoli @ 2015-02-01 20:06 ` Sheetal Tigadoli 2015-02-01 20:06 ` [PATCH 2/5] drivers: mmc: card: Fixes Missing blank line after variable initialization, coding style warning Sheetal Tigadoli 0 siblings, 1 reply; 7+ messages in thread From: Sheetal Tigadoli @ 2015-02-01 20:06 UTC (permalink / raw) To: chris Cc: joe, linux-mmc, ben, kuninori.morimoto.gx, ulf.hansson, linux-kernel, Sheetal Tigadoli This patch fixes following coding style warning in file block.c drivers/mmc/card/block.c:279: WARNING: simple_strtoul is obsolete, use kstrtoul instead Signed-off-by: Sheetal Tigadoli <sheetal.tigadoli@gmail.com> --- drivers/mmc/card/block.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index c69afb5..80f7b4b 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -274,13 +274,12 @@ static ssize_t force_ro_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { int ret; - char *end; struct mmc_blk_data *md = mmc_blk_get(dev_to_disk(dev)); - unsigned long set = simple_strtoul(buf, &end, 0); - if (end == buf) { - ret = -EINVAL; + unsigned long set; + + ret = kstrtoul(buf, 0, &set); + if ((ret == -EINVAL) || (ret == -ERANGE)) goto out; - } set_disk_ro(dev_to_disk(dev), set || md->read_only); ret = count; -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/5] drivers: mmc: card: Fixes Missing blank line after variable initialization, coding style warning 2015-02-01 20:06 ` [PATCH 1/5] drivers: mmc: card: Fix replaces simple_strtoul func call with kstrtoul Sheetal Tigadoli @ 2015-02-01 20:06 ` Sheetal Tigadoli 2015-02-01 20:07 ` [PATCH 3/5] drivers: mmc: card: Fixes WARNING braces are not necessary for single statement Sheetal Tigadoli 2015-02-01 20:20 ` [PATCH 2/5] drivers: mmc: card: Fixes Missing blank line after variable initialization, coding style warning Joe Perches 0 siblings, 2 replies; 7+ messages in thread From: Sheetal Tigadoli @ 2015-02-01 20:06 UTC (permalink / raw) To: chris Cc: joe, linux-mmc, ben, kuninori.morimoto.gx, ulf.hansson, linux-kernel, Sheetal Tigadoli This patch fixes "Missing blank line warnings". Following lines show warnings generated upon running checkpatch.pl script drivers/mmc/card/block.c:186: WARNING: Missing a blank line after declarations drivers/mmc/card/block.c:280: WARNING: Missing a blank line after declarations drivers/mmc/card/block.c:620: WARNING: Missing a blank line after declarations drivers/mmc/card/block.c:1720: WARNING: Missing a blank line after declarations Signed-off-by: Sheetal Tigadoli <sheetal.tigadoli@gmail.com> --- drivers/mmc/card/block.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index 80f7b4b..741a1e1 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -183,6 +183,7 @@ static void mmc_blk_put(struct mmc_blk_data *md) md->usage--; if (md->usage == 0) { int devidx = mmc_get_devidx(md->disk); + blk_cleanup_queue(md->queue.queue); __clear_bit(devidx, dev_use); @@ -616,6 +617,7 @@ static int mmc_blk_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd, unsigned long arg) { int ret = -EINVAL; + if (cmd == MMC_IOC_CMD) ret = mmc_blk_ioctl_cmd(bdev, (struct mmc_ioc_cmd __user *)arg); return ret; @@ -1716,6 +1718,7 @@ static int mmc_blk_cmd_err(struct mmc_blk_data *md, struct mmc_card *card, int ret) { struct mmc_queue_req *mq_rq; + mq_rq = container_of(brq, struct mmc_queue_req, brq); /* -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 3/5] drivers: mmc: card: Fixes WARNING braces are not necessary for single statement 2015-02-01 20:06 ` [PATCH 2/5] drivers: mmc: card: Fixes Missing blank line after variable initialization, coding style warning Sheetal Tigadoli @ 2015-02-01 20:07 ` Sheetal Tigadoli 2015-02-01 20:07 ` [PATCH 4/5] drivers: mmc: card: Fixed ERROR that open brace should be on the previous line Sheetal Tigadoli 2015-02-01 20:20 ` [PATCH 2/5] drivers: mmc: card: Fixes Missing blank line after variable initialization, coding style warning Joe Perches 1 sibling, 1 reply; 7+ messages in thread From: Sheetal Tigadoli @ 2015-02-01 20:07 UTC (permalink / raw) To: chris Cc: joe, linux-mmc, ben, kuninori.morimoto.gx, ulf.hansson, linux-kernel, Sheetal Tigadoli Patch fixes following coding style warnings. drivers/mmc/card/block.c:1734: WARNING: braces {} are not necessary for single statement blocks drivers/mmc/card/block.c:2019: WARNING: braces {} are not necessary for single statement blocks Signed-off-by: Sheetal Tigadoli <sheetal.tigadoli@gmail.com> --- drivers/mmc/card/block.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index 741a1e1..2394d0b 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -1733,9 +1733,8 @@ static int mmc_blk_cmd_err(struct mmc_blk_data *md, struct mmc_card *card, u32 blocks; blocks = mmc_sd_num_wr_blocks(card); - if (blocks != (u32)-1) { + if (blocks != (u32)-1) ret = blk_end_request(req, 0, blocks << 9); - } } else { if (!mmc_packed_cmd(mq_rq->cmd_type)) ret = blk_end_request(req, 0, brq->data.bytes_xfered); @@ -2018,9 +2017,8 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req) ret = mmc_blk_part_switch(card, md); if (ret) { - if (req) { + if (req) blk_end_request_all(req, -EIO); - } ret = 0; goto out; } -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 4/5] drivers: mmc: card: Fixed ERROR that open brace should be on the previous line 2015-02-01 20:07 ` [PATCH 3/5] drivers: mmc: card: Fixes WARNING braces are not necessary for single statement Sheetal Tigadoli @ 2015-02-01 20:07 ` Sheetal Tigadoli 2015-02-01 20:07 ` [PATCH 5/5] drivers: mmc: card: Fixed warning line over 80 characters in file block Sheetal Tigadoli 0 siblings, 1 reply; 7+ messages in thread From: Sheetal Tigadoli @ 2015-02-01 20:07 UTC (permalink / raw) To: chris Cc: joe, linux-mmc, ben, kuninori.morimoto.gx, ulf.hansson, linux-kernel, Sheetal Tigadoli The Patch fixes the below coding style error found using checkpatch.pl script drivers/mmc/card/block.c:2362: ERROR: that open brace { should be on the previous line Signed-off-by: Sheetal Tigadoli <sheetal.tigadoli@gmail.com> --- drivers/mmc/card/block.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index 2394d0b..fe47297 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -2358,8 +2358,7 @@ force_ro_fail: #define CID_MANFID_MICRON 0x13 #define CID_MANFID_SAMSUNG 0x15 -static const struct mmc_fixup blk_fixups[] = -{ +static const struct mmc_fixup blk_fixups[] = { MMC_FIXUP("SEM02G", CID_MANFID_SANDISK, 0x100, add_quirk, MMC_QUIRK_INAND_CMD38), MMC_FIXUP("SEM04G", CID_MANFID_SANDISK, 0x100, add_quirk, -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 5/5] drivers: mmc: card: Fixed warning line over 80 characters in file block 2015-02-01 20:07 ` [PATCH 4/5] drivers: mmc: card: Fixed ERROR that open brace should be on the previous line Sheetal Tigadoli @ 2015-02-01 20:07 ` Sheetal Tigadoli 0 siblings, 0 replies; 7+ messages in thread From: Sheetal Tigadoli @ 2015-02-01 20:07 UTC (permalink / raw) To: chris Cc: joe, linux-mmc, ben, kuninori.morimoto.gx, ulf.hansson, linux-kernel, Sheetal Tigadoli This patch fixes the following warning mesg from file block.c drivers/mmc/card/block.c:102: WARNING: line over 80 characters drivers/mmc/card/block.c:578: WARNING: line over 80 characters drivers/mmc/card/block.c:586: WARNING: line over 80 characters drivers/mmc/card/block.c:1209: WARNING: line over 80 characters drivers/mmc/card/block.c:2226: WARNING: line over 80 characters Signed-off-by: Sheetal Tigadoli <sheetal.tigadoli@gmail.com> --- drivers/mmc/card/block.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index fe47297..43edecb 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -99,7 +99,8 @@ struct mmc_blk_data { struct list_head part; unsigned int flags; -#define MMC_BLK_CMD23 (1 << 0) /* Can do SET_BLOCK_COUNT for multiblock */ +#define MMC_BLK_CMD23 (1 << 0) /* Can do SET_BLOCK_COUNT for + multiblock */ #define MMC_BLK_REL_WR (1 << 1) /* MMC Reliable write support */ #define MMC_BLK_PACKED_CMD (1 << 2) /* MMC packed command support */ @@ -575,7 +576,8 @@ static int mmc_blk_ioctl_cmd(struct block_device *bdev, * issuing the command. */ if (idata->ic.postsleep_min_us) - usleep_range(idata->ic.postsleep_min_us, idata->ic.postsleep_max_us); + usleep_range(idata->ic.postsleep_min_us, + idata->ic.postsleep_max_us); if (copy_to_user(&(ic_ptr->response), cmd.resp, sizeof(cmd.resp))) { err = -EFAULT; @@ -583,8 +585,9 @@ static int mmc_blk_ioctl_cmd(struct block_device *bdev, } if (!idata->ic.write_flag) { - if (copy_to_user((void __user *)(unsigned long) idata->ic.data_ptr, - idata->buf, idata->buf_bytes)) { + if (copy_to_user( + (void __user *)(unsigned long) idata->ic.data_ptr, + idata->buf, idata->buf_bytes)) { err = -EFAULT; goto cmd_rel_host; } @@ -1207,7 +1210,10 @@ static int mmc_blk_err_check(struct mmc_card *card, */ if (brq->sbc.error || brq->cmd.error || brq->stop.error || brq->data.error) { - switch (mmc_blk_cmd_recovery(card, req, brq, &ecc_err, &gen_err)) { + int err; + + err = mmc_blk_cmd_recovery(card, req, brq, &ecc_err, &gen_err); + switch (err) { case ERR_RETRY: return MMC_BLK_RETRY; case ERR_ABORT: @@ -2223,8 +2229,8 @@ static int mmc_blk_alloc_part(struct mmc_card *card, char cap_str[10]; struct mmc_blk_data *part_md; - part_md = mmc_blk_alloc_req(card, disk_to_dev(md->disk), size, default_ro, - subname, area_type); + part_md = mmc_blk_alloc_req(card, disk_to_dev(md->disk), size, + default_ro, subname, area_type); if (IS_ERR(part_md)) return PTR_ERR(part_md); part_md->part_type = part_type; -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 2/5] drivers: mmc: card: Fixes Missing blank line after variable initialization, coding style warning 2015-02-01 20:06 ` [PATCH 2/5] drivers: mmc: card: Fixes Missing blank line after variable initialization, coding style warning Sheetal Tigadoli 2015-02-01 20:07 ` [PATCH 3/5] drivers: mmc: card: Fixes WARNING braces are not necessary for single statement Sheetal Tigadoli @ 2015-02-01 20:20 ` Joe Perches 1 sibling, 0 replies; 7+ messages in thread From: Joe Perches @ 2015-02-01 20:20 UTC (permalink / raw) To: Sheetal Tigadoli Cc: chris, linux-mmc, ben, kuninori.morimoto.gx, ulf.hansson, linux-kernel On Mon, 2015-02-02 at 01:36 +0530, Sheetal Tigadoli wrote: > This patch fixes "Missing blank line warnings". Following lines show warnings > generated upon running checkpatch.pl script > > drivers/mmc/card/block.c:186: WARNING: Missing a blank line after declarations > drivers/mmc/card/block.c:280: WARNING: Missing a blank line after declarations > drivers/mmc/card/block.c:620: WARNING: Missing a blank line after declarations > drivers/mmc/card/block.c:1720: WARNING: Missing a blank line after declarations 4 lines here, 3 changes below? > drivers/mmc/card/block.c | 3 +++ > 1 file changed, 3 insertions(+) btw: checkpatch has a --fix feature that could help For instance, this: $ ./scripts/checkpatch.pl -f --types=line_spacing --fix-inplace drivers/mmc/card/block.c $ git diff drivers/mmc/card/block.c diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index c69afb5..247044f 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -183,6 +183,7 @@ static void mmc_blk_put(struct mmc_blk_data *md) md->usage--; if (md->usage == 0) { int devidx = mmc_get_devidx(md->disk); + blk_cleanup_queue(md->queue.queue); __clear_bit(devidx, dev_use); @@ -277,6 +278,7 @@ static ssize_t force_ro_store(struct device *dev, struct device_attribute *attr, char *end; struct mmc_blk_data *md = mmc_blk_get(dev_to_disk(dev)); unsigned long set = simple_strtoul(buf, &end, 0); + if (end == buf) { ret = -EINVAL; goto out; @@ -617,6 +619,7 @@ static int mmc_blk_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd, unsigned long arg) { int ret = -EINVAL; + if (cmd == MMC_IOC_CMD) ret = mmc_blk_ioctl_cmd(bdev, (struct mmc_ioc_cmd __user *)arg); return ret; @@ -1717,6 +1720,7 @@ static int mmc_blk_cmd_err(struct mmc_blk_data *md, struct mmc_card *card, int ret) { struct mmc_queue_req *mq_rq; + mq_rq = container_of(brq, struct mmc_queue_req, brq); /* ^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2015-02-01 20:20 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-02-01 20:06 [PATCH 0/5] drivers; mmc: card: Sheetal Tigadoli 2015-02-01 20:06 ` [PATCH 1/5] drivers: mmc: card: Fix replaces simple_strtoul func call with kstrtoul Sheetal Tigadoli 2015-02-01 20:06 ` [PATCH 2/5] drivers: mmc: card: Fixes Missing blank line after variable initialization, coding style warning Sheetal Tigadoli 2015-02-01 20:07 ` [PATCH 3/5] drivers: mmc: card: Fixes WARNING braces are not necessary for single statement Sheetal Tigadoli 2015-02-01 20:07 ` [PATCH 4/5] drivers: mmc: card: Fixed ERROR that open brace should be on the previous line Sheetal Tigadoli 2015-02-01 20:07 ` [PATCH 5/5] drivers: mmc: card: Fixed warning line over 80 characters in file block Sheetal Tigadoli 2015-02-01 20:20 ` [PATCH 2/5] drivers: mmc: card: Fixes Missing blank line after variable initialization, coding style warning Joe Perches
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox