Commit d1303c1a authored by Shaun Ren's avatar Shaun Ren Committed by Greg Kroah-Hartman

Staging: rts5208: rtsx_transport.c: Align to open parenthesis

This patch fixes the alignment issue reported by checkpatch.pl:

CHECK: Alignment should match open parenthesis

Add a unsigned char *sgbuffer in rtsx_stor_access_xfer_buffer to make the
following memcpy logic easier to read.

Add a struct scatterlist *sg in the use_sg branch of
rtsx_transfer_data_partial to make the parameters of the
rtsx_transfer_sglist_adma_partial call fit in 80 character lines after
aligning them to the open parenthesis.

Refactor memcpy logic in rtsx_stor_access_xfer_buf to make it more legible.
Signed-off-by: default avatarShaun Ren <shaun.ren@linux.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 64cfe606
...@@ -42,22 +42,28 @@ ...@@ -42,22 +42,28 @@
*/ */
unsigned int rtsx_stor_access_xfer_buf(unsigned char *buffer, unsigned int rtsx_stor_access_xfer_buf(unsigned char *buffer,
unsigned int buflen, struct scsi_cmnd *srb, unsigned int *index, unsigned int buflen,
unsigned int *offset, enum xfer_buf_dir dir) struct scsi_cmnd *srb,
unsigned int *index,
unsigned int *offset,
enum xfer_buf_dir dir)
{ {
unsigned int cnt; unsigned int cnt;
/* If not using scatter-gather, just transfer the data directly. */ /* If not using scatter-gather, just transfer the data directly. */
if (scsi_sg_count(srb) == 0) { if (scsi_sg_count(srb) == 0) {
unsigned char *sgbuffer;
if (*offset >= scsi_bufflen(srb)) if (*offset >= scsi_bufflen(srb))
return 0; return 0;
cnt = min(buflen, scsi_bufflen(srb) - *offset); cnt = min(buflen, scsi_bufflen(srb) - *offset);
sgbuffer = (unsigned char *)scsi_sglist(srb) + *offset;
if (dir == TO_XFER_BUF) if (dir == TO_XFER_BUF)
memcpy((unsigned char *) scsi_sglist(srb) + *offset, memcpy(sgbuffer, buffer, cnt);
buffer, cnt);
else else
memcpy(buffer, (unsigned char *) scsi_sglist(srb) + memcpy(buffer, sgbuffer, cnt);
*offset, cnt);
*offset += cnt; *offset += cnt;
/* /*
...@@ -321,9 +327,11 @@ static inline void rtsx_add_sg_tbl( ...@@ -321,9 +327,11 @@ static inline void rtsx_add_sg_tbl(
} }
static int rtsx_transfer_sglist_adma_partial(struct rtsx_chip *chip, u8 card, static int rtsx_transfer_sglist_adma_partial(struct rtsx_chip *chip, u8 card,
struct scatterlist *sg, int num_sg, unsigned int *index, struct scatterlist *sg, int num_sg,
unsigned int *index,
unsigned int *offset, int size, unsigned int *offset, int size,
enum dma_data_direction dma_dir, int timeout) enum dma_data_direction dma_dir,
int timeout)
{ {
struct rtsx_dev *rtsx = chip->rtsx; struct rtsx_dev *rtsx = chip->rtsx;
struct completion trans_done; struct completion trans_done;
...@@ -487,7 +495,8 @@ static int rtsx_transfer_sglist_adma_partial(struct rtsx_chip *chip, u8 card, ...@@ -487,7 +495,8 @@ static int rtsx_transfer_sglist_adma_partial(struct rtsx_chip *chip, u8 card,
static int rtsx_transfer_sglist_adma(struct rtsx_chip *chip, u8 card, static int rtsx_transfer_sglist_adma(struct rtsx_chip *chip, u8 card,
struct scatterlist *sg, int num_sg, struct scatterlist *sg, int num_sg,
enum dma_data_direction dma_dir, int timeout) enum dma_data_direction dma_dir,
int timeout)
{ {
struct rtsx_dev *rtsx = chip->rtsx; struct rtsx_dev *rtsx = chip->rtsx;
struct completion trans_done; struct completion trans_done;
...@@ -633,7 +642,8 @@ static int rtsx_transfer_sglist_adma(struct rtsx_chip *chip, u8 card, ...@@ -633,7 +642,8 @@ static int rtsx_transfer_sglist_adma(struct rtsx_chip *chip, u8 card,
} }
static int rtsx_transfer_buf(struct rtsx_chip *chip, u8 card, void *buf, static int rtsx_transfer_buf(struct rtsx_chip *chip, u8 card, void *buf,
size_t len, enum dma_data_direction dma_dir, int timeout) size_t len, enum dma_data_direction dma_dir,
int timeout)
{ {
struct rtsx_dev *rtsx = chip->rtsx; struct rtsx_dev *rtsx = chip->rtsx;
struct completion trans_done; struct completion trans_done;
...@@ -716,9 +726,9 @@ static int rtsx_transfer_buf(struct rtsx_chip *chip, u8 card, void *buf, ...@@ -716,9 +726,9 @@ static int rtsx_transfer_buf(struct rtsx_chip *chip, u8 card, void *buf,
} }
int rtsx_transfer_data_partial(struct rtsx_chip *chip, u8 card, int rtsx_transfer_data_partial(struct rtsx_chip *chip, u8 card,
void *buf, size_t len, int use_sg, unsigned int *index, void *buf, size_t len, int use_sg,
unsigned int *offset, enum dma_data_direction dma_dir, unsigned int *index, unsigned int *offset,
int timeout) enum dma_data_direction dma_dir, int timeout)
{ {
int err = 0; int err = 0;
...@@ -726,13 +736,16 @@ int rtsx_transfer_data_partial(struct rtsx_chip *chip, u8 card, ...@@ -726,13 +736,16 @@ int rtsx_transfer_data_partial(struct rtsx_chip *chip, u8 card,
if (rtsx_chk_stat(chip, RTSX_STAT_ABORT)) if (rtsx_chk_stat(chip, RTSX_STAT_ABORT))
return -EIO; return -EIO;
if (use_sg) if (use_sg) {
err = rtsx_transfer_sglist_adma_partial(chip, card, struct scatterlist *sg = (struct scatterlist *)buf;
(struct scatterlist *)buf, use_sg,
index, offset, (int)len, dma_dir, timeout); err = rtsx_transfer_sglist_adma_partial(chip, card, sg, use_sg,
else index, offset, (int)len,
dma_dir, timeout);
} else {
err = rtsx_transfer_buf(chip, card, err = rtsx_transfer_buf(chip, card,
buf, len, dma_dir, timeout); buf, len, dma_dir, timeout);
}
if (err < 0) { if (err < 0) {
if (RTSX_TST_DELINK(chip)) { if (RTSX_TST_DELINK(chip)) {
RTSX_CLR_DELINK(chip); RTSX_CLR_DELINK(chip);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment