From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-pg1-x542.google.com ([2607:f8b0:4864:20::542]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h1nxS-0002xQ-R1 for barebox@lists.infradead.org; Thu, 07 Mar 2019 08:00:55 +0000 Received: by mail-pg1-x542.google.com with SMTP id j3so10625284pgm.11 for ; Thu, 07 Mar 2019 00:00:50 -0800 (PST) From: Andrey Smirnov Date: Thu, 7 Mar 2019 00:00:18 -0800 Message-Id: <20190307080036.28028-9-andrew.smirnov@gmail.com> In-Reply-To: <20190307080036.28028-1-andrew.smirnov@gmail.com> References: <20190307080036.28028-1-andrew.smirnov@gmail.com> MIME-Version: 1.0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [PATCH 08/26] usb: storage: Make usb_stor_write_10() a standalone function To: barebox@lists.infradead.org Cc: Andrey Smirnov Move special preparation steps done before the call to usb_stor_write_10() inside the function itself for clarity and to allow futher code improvements. No functional change intended. Signed-off-by: Andrey Smirnov --- drivers/usb/storage/usb.c | 43 +++++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c index e6f8f30c6..a3442f576 100644 --- a/drivers/usb/storage/usb.c +++ b/drivers/usb/storage/usb.c @@ -195,32 +195,39 @@ static int usb_stor_read_10(struct us_blk_dev *usb_blkdev, return -EIO; } -static int usb_stor_write_10(ccb *srb, struct us_data *us, - unsigned long start, unsigned short blocks) +static int usb_stor_write_10(struct us_blk_dev *usb_blkdev, + unsigned long start, u8 *data, + unsigned short blocks) { + struct us_data *us = usb_blkdev->us; struct device_d *dev = &us->pusb_dev->dev; int retries, result; + ccb srb; + + srb.lun = usb_blkdev->lun; + srb.pdata = data; + srb.datalen = blocks * SECTOR_SIZE; retries = 2; do { dev_dbg(dev, "SCSI_WRITE10: start %lx blocks %x\n", start, blocks); - memset(&srb->cmd[0], 0, 10); - srb->cmdlen = 10; - srb->cmd[0] = SCSI_WRITE10; - srb->cmd[2] = (u8)(start >> 24); - srb->cmd[3] = (u8)(start >> 16); - srb->cmd[4] = (u8)(start >> 8); - srb->cmd[5] = (u8)(start >> 0); - srb->cmd[7] = (u8)(blocks >> 8); - srb->cmd[8] = (u8)(blocks >> 0); - result = us->transport(srb, us); + memset(&srb.cmd[0], 0, 10); + srb.cmdlen = 10; + srb.cmd[0] = SCSI_WRITE10; + srb.cmd[2] = (u8)(start >> 24); + srb.cmd[3] = (u8)(start >> 16); + srb.cmd[4] = (u8)(start >> 8); + srb.cmd[5] = (u8)(start >> 0); + srb.cmd[7] = (u8)(blocks >> 8); + srb.cmd[8] = (u8)(blocks >> 0); + result = us->transport(&srb, us); dev_dbg(dev, "SCSI_WRITE10 returns %d\n", result); if (result == USB_STOR_TRANSPORT_GOOD) return 0; - usb_stor_request_sense(srb, us); + usb_stor_request_sense(&srb, us); } while (retries--); - return us->transport(srb, us); + return us->transport(&srb, us); } @@ -291,15 +298,15 @@ static int usb_stor_blk_io(int io_op, struct block_device *disk_dev, int result; unsigned n = min(sector_count, US_MAX_IO_BLK); u8 *data = buffer + (sectors_done * SECTOR_SIZE); - us_ccb.pdata = data; - us_ccb.datalen = n * SECTOR_SIZE; + if (io_op == io_rd) result = usb_stor_read_10(pblk_dev, (ulong)sector_start, data, n); else - result = usb_stor_write_10(&us_ccb, us, - (ulong)sector_start, n); + result = usb_stor_write_10(pblk_dev, + (ulong)sector_start, + data, n); if (result != 0) { dev_dbg(dev, "I/O error at sector %d\n", sector_start); break; -- 2.20.1 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox