diff options
| author | Philip J Kelleher <pjk1939@linux.vnet.ibm.com> | 2013-02-25 12:27:46 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2013-03-11 19:53:55 +0100 |
| commit | f37912039eb04979f269de0a7dc1a601702df51a (patch) | |
| tree | a9f52fbc05d2f616256d9ae1e323fb66f80b57aa /drivers/block/rsxx/cregs.c | |
| parent | f6161aa153581da4a3867a2d1a7caf4be19b6ec9 (diff) | |
| download | linux-f37912039eb04979f269de0a7dc1a601702df51a.tar.gz linux-f37912039eb04979f269de0a7dc1a601702df51a.tar.bz2 linux-f37912039eb04979f269de0a7dc1a601702df51a.zip | |
block: IBM RamSan 70/80 trivial changes.
This patch includes trivial changes that were recommended by
different members of the Linux Community.
Changes include:
o Removing the redundant wmb().
o Formatting
o Various other little things.
Signed-off-by: Philip J Kelleher <pjk1939@linux.vnet.ibm.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/block/rsxx/cregs.c')
| -rw-r--r-- | drivers/block/rsxx/cregs.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/block/rsxx/cregs.c b/drivers/block/rsxx/cregs.c index 80bbe639fccd..224156435261 100644 --- a/drivers/block/rsxx/cregs.c +++ b/drivers/block/rsxx/cregs.c @@ -126,13 +126,6 @@ static void creg_issue_cmd(struct rsxx_cardinfo *card, struct creg_cmd *cmd) cmd->buf, cmd->stream); } - /* - * Data copy must complete before initiating the command. This is - * needed for weakly ordered processors (i.e. PowerPC), so that all - * neccessary registers are written before we kick the hardware. - */ - wmb(); - /* Setting the valid bit will kick off the command. */ iowrite32(cmd->op, card->regmap + CREG_CMD); } @@ -399,12 +392,12 @@ static int __issue_creg_rw(struct rsxx_cardinfo *card, return st; /* - * This timeout is neccessary for unresponsive hardware. The additional + * This timeout is necessary for unresponsive hardware. The additional * 20 seconds to used to guarantee that each cregs requests has time to * complete. */ - timeout = msecs_to_jiffies((CREG_TIMEOUT_MSEC * - card->creg_ctrl.q_depth) + 20000); + timeout = msecs_to_jiffies(CREG_TIMEOUT_MSEC * + card->creg_ctrl.q_depth + 20000); /* * The creg interface is guaranteed to complete. It has a timeout |