iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

skd: Remove useless barrier() calls

Browse Source 
The purpose of barrier() is to prevent reordering by the compiler.
Since the compiler does not reorder calls to non-pure functions,
remove the barrier() calls from skd_reg_{read,write}{32,64}().

Since pr_debug() is able to report file name and line number
information, remove __FILE__ and __LINE__ from the pr_debug() calls.

Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Hannes Reinecke <hare@suse.de>
Cc: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Bart Van Assche
2017-08-17 13:12:57 -07:00
committed by Jens Axboe
parent 55712aeb2c
commit 14262a4bbc
1 changed files with 10 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/block/skd_main.c
View File

@ -341,49 +341,27 @@ struct skd_device {
static inline u32 skd_reg_read32(struct skd_device *skdev, u32 offset) static inline u32 skd_reg_read32(struct skd_device *skdev, u32 offset)
{ {
u32 val; u32 val = readl(skdev->mem_map[1] + offset);
if (likely(skdev->dbg_level < 2))
return readl(skdev->mem_map[1] + offset);
else {
barrier();
val = readl(skdev->mem_map[1] + offset);
barrier();
pr_debug("%s:%s:%d offset %x = %x\n",
skdev->name, __func__, __LINE__, offset, val);
return val;
}
if (unlikely(skdev->dbg_level >= 2))
pr_debug("%s offset %x = %x\n", skdev->name, offset, val);
return val;
} }
static inline void skd_reg_write32(struct skd_device *skdev, u32 val, static inline void skd_reg_write32(struct skd_device *skdev, u32 val,
u32 offset) u32 offset)
{ {
if (likely(skdev->dbg_level < 2)) { writel(val, skdev->mem_map[1] + offset);
writel(val, skdev->mem_map[1] + offset); if (unlikely(skdev->dbg_level >= 2))
barrier(); pr_debug("%s offset %x = %x\n", skdev->name, offset, val);
} else {
barrier();
writel(val, skdev->mem_map[1] + offset);
barrier();
pr_debug("%s:%s:%d offset %x = %x\n",
skdev->name, __func__, __LINE__, offset, val);
}
} }
static inline void skd_reg_write64(struct skd_device *skdev, u64 val, static inline void skd_reg_write64(struct skd_device *skdev, u64 val,
u32 offset) u32 offset)
{ {
if (likely(skdev->dbg_level < 2)) { writeq(val, skdev->mem_map[1] + offset);
writeq(val, skdev->mem_map[1] + offset); if (unlikely(skdev->dbg_level >= 2))
barrier(); pr_debug("%s offset %x = %016llx\n", skdev->name, offset, val);
} else {
barrier();
writeq(val, skdev->mem_map[1] + offset);
barrier();
pr_debug("%s:%s:%d offset %x = %016llx\n",
skdev->name, __func__, __LINE__, offset, val);
}
} }