aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/rts_pstor/spi.c
diff options
context:
space:
mode:
authorAlexander Beregalov <a.beregalov@gmail.com>2011-03-26 13:18:11 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-04-20 16:45:57 -0400
commitf7468e2995dbd914817c780941750f0ac668ac50 (patch)
tree241a9e54539b88d6875dee1450a5e5c68c01fc11 /drivers/staging/rts_pstor/spi.c
parent24c92eac7e5976b07f663e1149d73075aff96c0d (diff)
Staging: rts_pstor: s/rtsx_free_dma_buf/kfree/
Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rts_pstor/spi.c')
-rw-r--r--drivers/staging/rts_pstor/spi.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/staging/rts_pstor/spi.c b/drivers/staging/rts_pstor/spi.c
index 8a8689b327a..3daab9ad48b 100644
--- a/drivers/staging/rts_pstor/spi.c
+++ b/drivers/staging/rts_pstor/spi.c
@@ -543,7 +543,7 @@ int spi_read_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip)
543 543
544 retval = rtsx_transfer_data(chip, 0, buf, pagelen, 0, DMA_FROM_DEVICE, 10000); 544 retval = rtsx_transfer_data(chip, 0, buf, pagelen, 0, DMA_FROM_DEVICE, 10000);
545 if (retval < 0) { 545 if (retval < 0) {
546 rtsx_free_dma_buf(chip, buf); 546 kfree(buf);
547 rtsx_clear_spi_error(chip); 547 rtsx_clear_spi_error(chip);
548 spi_set_err_code(chip, SPI_HW_ERR); 548 spi_set_err_code(chip, SPI_HW_ERR);
549 TRACE_RET(chip, STATUS_FAIL); 549 TRACE_RET(chip, STATUS_FAIL);
@@ -556,7 +556,7 @@ int spi_read_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip)
556 } 556 }
557 557
558 scsi_set_resid(srb, 0); 558 scsi_set_resid(srb, 0);
559 rtsx_free_dma_buf(chip, buf); 559 kfree(buf);
560 560
561 return STATUS_SUCCESS; 561 return STATUS_SUCCESS;
562} 562}
@@ -591,7 +591,7 @@ int spi_write_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip)
591 while (len) { 591 while (len) {
592 retval = sf_enable_write(chip, SPI_WREN); 592 retval = sf_enable_write(chip, SPI_WREN);
593 if (retval != STATUS_SUCCESS) { 593 if (retval != STATUS_SUCCESS) {
594 rtsx_free_dma_buf(chip, buf); 594 kfree(buf);
595 TRACE_RET(chip, STATUS_FAIL); 595 TRACE_RET(chip, STATUS_FAIL);
596 } 596 }
597 597
@@ -605,7 +605,7 @@ int spi_write_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip)
605 605
606 retval = rtsx_send_cmd(chip, 0, 100); 606 retval = rtsx_send_cmd(chip, 0, 100);
607 if (retval < 0) { 607 if (retval < 0) {
608 rtsx_free_dma_buf(chip, buf); 608 kfree(buf);
609 rtsx_clear_spi_error(chip); 609 rtsx_clear_spi_error(chip);
610 spi_set_err_code(chip, SPI_HW_ERR); 610 spi_set_err_code(chip, SPI_HW_ERR);
611 TRACE_RET(chip, STATUS_FAIL); 611 TRACE_RET(chip, STATUS_FAIL);
@@ -613,7 +613,7 @@ int spi_write_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip)
613 613
614 retval = sf_polling_status(chip, 100); 614 retval = sf_polling_status(chip, 100);
615 if (retval != STATUS_SUCCESS) { 615 if (retval != STATUS_SUCCESS) {
616 rtsx_free_dma_buf(chip, buf); 616 kfree(buf);
617 TRACE_RET(chip, STATUS_FAIL); 617 TRACE_RET(chip, STATUS_FAIL);
618 } 618 }
619 619
@@ -621,7 +621,7 @@ int spi_write_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip)
621 len--; 621 len--;
622 } 622 }
623 623
624 rtsx_free_dma_buf(chip, buf); 624 kfree(buf);
625 625
626 } else if (program_mode == AAI_PROGRAM) { 626 } else if (program_mode == AAI_PROGRAM) {
627 int first_byte = 1; 627 int first_byte = 1;
@@ -650,7 +650,7 @@ int spi_write_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip)
650 650
651 retval = rtsx_send_cmd(chip, 0, 100); 651 retval = rtsx_send_cmd(chip, 0, 100);
652 if (retval < 0) { 652 if (retval < 0) {
653 rtsx_free_dma_buf(chip, buf); 653 kfree(buf);
654 rtsx_clear_spi_error(chip); 654 rtsx_clear_spi_error(chip);
655 spi_set_err_code(chip, SPI_HW_ERR); 655 spi_set_err_code(chip, SPI_HW_ERR);
656 TRACE_RET(chip, STATUS_FAIL); 656 TRACE_RET(chip, STATUS_FAIL);
@@ -658,14 +658,14 @@ int spi_write_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip)
658 658
659 retval = sf_polling_status(chip, 100); 659 retval = sf_polling_status(chip, 100);
660 if (retval != STATUS_SUCCESS) { 660 if (retval != STATUS_SUCCESS) {
661 rtsx_free_dma_buf(chip, buf); 661 kfree(buf);
662 TRACE_RET(chip, STATUS_FAIL); 662 TRACE_RET(chip, STATUS_FAIL);
663 } 663 }
664 664
665 len--; 665 len--;
666 } 666 }
667 667
668 rtsx_free_dma_buf(chip, buf); 668 kfree(buf);
669 669
670 retval = sf_disable_write(chip, SPI_WRDI); 670 retval = sf_disable_write(chip, SPI_WRDI);
671 if (retval != STATUS_SUCCESS) 671 if (retval != STATUS_SUCCESS)
@@ -687,7 +687,7 @@ int spi_write_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip)
687 687
688 retval = sf_enable_write(chip, SPI_WREN); 688 retval = sf_enable_write(chip, SPI_WREN);
689 if (retval != STATUS_SUCCESS) { 689 if (retval != STATUS_SUCCESS) {
690 rtsx_free_dma_buf(chip, buf); 690 kfree(buf);
691 TRACE_RET(chip, STATUS_FAIL); 691 TRACE_RET(chip, STATUS_FAIL);
692 } 692 }
693 693
@@ -702,7 +702,7 @@ int spi_write_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip)
702 702
703 retval = rtsx_transfer_data(chip, 0, buf, pagelen, 0, DMA_TO_DEVICE, 100); 703 retval = rtsx_transfer_data(chip, 0, buf, pagelen, 0, DMA_TO_DEVICE, 100);
704 if (retval < 0) { 704 if (retval < 0) {
705 rtsx_free_dma_buf(chip, buf); 705 kfree(buf);
706 rtsx_clear_spi_error(chip); 706 rtsx_clear_spi_error(chip);
707 spi_set_err_code(chip, SPI_HW_ERR); 707 spi_set_err_code(chip, SPI_HW_ERR);
708 TRACE_RET(chip, STATUS_FAIL); 708 TRACE_RET(chip, STATUS_FAIL);
@@ -710,7 +710,7 @@ int spi_write_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip)
710 710
711 retval = sf_polling_status(chip, 100); 711 retval = sf_polling_status(chip, 100);
712 if (retval != STATUS_SUCCESS) { 712 if (retval != STATUS_SUCCESS) {
713 rtsx_free_dma_buf(chip, buf); 713 kfree(buf);
714 TRACE_RET(chip, STATUS_FAIL); 714 TRACE_RET(chip, STATUS_FAIL);
715 } 715 }
716 716
@@ -718,7 +718,7 @@ int spi_write_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip)
718 len -= pagelen; 718 len -= pagelen;
719 } 719 }
720 720
721 rtsx_free_dma_buf(chip, buf); 721 kfree(buf);
722 } else { 722 } else {
723 spi_set_err_code(chip, SPI_INVALID_COMMAND); 723 spi_set_err_code(chip, SPI_INVALID_COMMAND);
724 TRACE_RET(chip, STATUS_FAIL); 724 TRACE_RET(chip, STATUS_FAIL);