From 389fe985f27b5334110639146016bb6dd273c3f6 Mon Sep 17 00:00:00 2001 From: Alexander Beregalov Date: Sun, 27 Mar 2011 04:06:43 +0400 Subject: [PATCH] Staging: rts_pstor: s/rtsx_alloc_dma_buf/kmalloc/ Replace rtsx_alloc_dma_buf() with kfree() back, chip parameter is not used; remove casts. Signed-off-by: Alexander Beregalov Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rts_pstor/ms.c | 8 ++++---- drivers/staging/rts_pstor/rtsx.h | 2 -- drivers/staging/rts_pstor/spi.c | 8 ++++---- drivers/staging/rts_pstor/xd.c | 2 +- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/drivers/staging/rts_pstor/ms.c b/drivers/staging/rts_pstor/ms.c index 58fc7e075226..9975a59e52a3 100644 --- a/drivers/staging/rts_pstor/ms.c +++ b/drivers/staging/rts_pstor/ms.c @@ -863,7 +863,7 @@ static int ms_read_attribute_info(struct rtsx_chip *chip) TRACE_RET(chip, STATUS_FAIL); } - buf = (u8 *)rtsx_alloc_dma_buf(chip, 64 * 512, GFP_KERNEL); + buf = kmalloc(64 * 512, GFP_KERNEL); if (buf == NULL) { TRACE_RET(chip, STATUS_ERROR); } @@ -3783,7 +3783,7 @@ int mg_get_local_EKB(struct scsi_cmnd *srb, struct rtsx_chip *chip) TRACE_RET(chip, STATUS_FAIL); } - buf = (u8 *)rtsx_alloc_dma_buf(chip, 1540, GFP_KERNEL); + buf = kmalloc(1540, GFP_KERNEL); if (!buf) { TRACE_RET(chip, STATUS_ERROR); } @@ -4021,7 +4021,7 @@ int mg_get_ICV(struct scsi_cmnd *srb, struct rtsx_chip *chip) TRACE_RET(chip, STATUS_FAIL); } - buf = (u8 *)rtsx_alloc_dma_buf(chip, 1028, GFP_KERNEL); + buf = kmalloc(1028, GFP_KERNEL); if (!buf) { TRACE_RET(chip, STATUS_ERROR); } @@ -4080,7 +4080,7 @@ int mg_set_ICV(struct scsi_cmnd *srb, struct rtsx_chip *chip) TRACE_RET(chip, STATUS_FAIL); } - buf = (u8 *)rtsx_alloc_dma_buf(chip, 1028, GFP_KERNEL); + buf = kmalloc(1028, GFP_KERNEL); if (!buf) { TRACE_RET(chip, STATUS_ERROR); } diff --git a/drivers/staging/rts_pstor/rtsx.h b/drivers/staging/rts_pstor/rtsx.h index 263524c45aab..6afb6358e775 100644 --- a/drivers/staging/rts_pstor/rtsx.h +++ b/drivers/staging/rts_pstor/rtsx.h @@ -98,8 +98,6 @@ do { \ #define SCSI_LUN(srb) ((srb)->device->lun) -#define rtsx_alloc_dma_buf(chip, size, flag) kmalloc((size), (flag)) - typedef unsigned long DELAY_PARA_T; struct rtsx_chip; diff --git a/drivers/staging/rts_pstor/spi.c b/drivers/staging/rts_pstor/spi.c index 3daab9ad48b8..c803ba635509 100644 --- a/drivers/staging/rts_pstor/spi.c +++ b/drivers/staging/rts_pstor/spi.c @@ -505,7 +505,7 @@ int spi_read_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip) TRACE_RET(chip, STATUS_FAIL); } - buf = (u8 *)rtsx_alloc_dma_buf(chip, SF_PAGE_LEN, GFP_KERNEL); + buf = kmalloc(SF_PAGE_LEN, GFP_KERNEL); if (buf == NULL) TRACE_RET(chip, STATUS_ERROR); @@ -584,7 +584,7 @@ int spi_write_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip) } if (program_mode == BYTE_PROGRAM) { - buf = rtsx_alloc_dma_buf(chip, 4, GFP_KERNEL); + buf = kmalloc(4, GFP_KERNEL); if (!buf) TRACE_RET(chip, STATUS_ERROR); @@ -630,7 +630,7 @@ int spi_write_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip) if (retval != STATUS_SUCCESS) TRACE_RET(chip, STATUS_FAIL); - buf = rtsx_alloc_dma_buf(chip, 4, GFP_KERNEL); + buf = kmalloc(4, GFP_KERNEL); if (!buf) TRACE_RET(chip, STATUS_ERROR); @@ -675,7 +675,7 @@ int spi_write_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip) if (retval != STATUS_SUCCESS) TRACE_RET(chip, STATUS_FAIL); } else if (program_mode == PAGE_PROGRAM) { - buf = rtsx_alloc_dma_buf(chip, SF_PAGE_LEN, GFP_KERNEL); + buf = kmalloc(SF_PAGE_LEN, GFP_KERNEL); if (!buf) TRACE_RET(chip, STATUS_NOMEM); diff --git a/drivers/staging/rts_pstor/xd.c b/drivers/staging/rts_pstor/xd.c index b9eb072d74ee..a58a689fe9b5 100644 --- a/drivers/staging/rts_pstor/xd.c +++ b/drivers/staging/rts_pstor/xd.c @@ -379,7 +379,7 @@ static void xd_clear_dma_buffer(struct rtsx_chip *chip) RTSX_DEBUGP("xD ECC error, dummy write!\n"); - buf = (u8 *)rtsx_alloc_dma_buf(chip, 512, GFP_KERNEL); + buf = kmalloc(512, GFP_KERNEL); if (!buf) return; -- 2.11.0