Commit 389fe985 authored by Alexander Beregalov's avatar Alexander Beregalov Committed by Greg Kroah-Hartman

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: default avatarAlexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent f7468e29
...@@ -863,7 +863,7 @@ static int ms_read_attribute_info(struct rtsx_chip *chip) ...@@ -863,7 +863,7 @@ static int ms_read_attribute_info(struct rtsx_chip *chip)
TRACE_RET(chip, STATUS_FAIL); 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) { if (buf == NULL) {
TRACE_RET(chip, STATUS_ERROR); TRACE_RET(chip, STATUS_ERROR);
} }
...@@ -3783,7 +3783,7 @@ int mg_get_local_EKB(struct scsi_cmnd *srb, struct rtsx_chip *chip) ...@@ -3783,7 +3783,7 @@ int mg_get_local_EKB(struct scsi_cmnd *srb, struct rtsx_chip *chip)
TRACE_RET(chip, STATUS_FAIL); TRACE_RET(chip, STATUS_FAIL);
} }
buf = (u8 *)rtsx_alloc_dma_buf(chip, 1540, GFP_KERNEL); buf = kmalloc(1540, GFP_KERNEL);
if (!buf) { if (!buf) {
TRACE_RET(chip, STATUS_ERROR); TRACE_RET(chip, STATUS_ERROR);
} }
...@@ -4021,7 +4021,7 @@ int mg_get_ICV(struct scsi_cmnd *srb, struct rtsx_chip *chip) ...@@ -4021,7 +4021,7 @@ int mg_get_ICV(struct scsi_cmnd *srb, struct rtsx_chip *chip)
TRACE_RET(chip, STATUS_FAIL); TRACE_RET(chip, STATUS_FAIL);
} }
buf = (u8 *)rtsx_alloc_dma_buf(chip, 1028, GFP_KERNEL); buf = kmalloc(1028, GFP_KERNEL);
if (!buf) { if (!buf) {
TRACE_RET(chip, STATUS_ERROR); TRACE_RET(chip, STATUS_ERROR);
} }
...@@ -4080,7 +4080,7 @@ int mg_set_ICV(struct scsi_cmnd *srb, struct rtsx_chip *chip) ...@@ -4080,7 +4080,7 @@ int mg_set_ICV(struct scsi_cmnd *srb, struct rtsx_chip *chip)
TRACE_RET(chip, STATUS_FAIL); TRACE_RET(chip, STATUS_FAIL);
} }
buf = (u8 *)rtsx_alloc_dma_buf(chip, 1028, GFP_KERNEL); buf = kmalloc(1028, GFP_KERNEL);
if (!buf) { if (!buf) {
TRACE_RET(chip, STATUS_ERROR); TRACE_RET(chip, STATUS_ERROR);
} }
......
...@@ -98,8 +98,6 @@ do { \ ...@@ -98,8 +98,6 @@ do { \
#define SCSI_LUN(srb) ((srb)->device->lun) #define SCSI_LUN(srb) ((srb)->device->lun)
#define rtsx_alloc_dma_buf(chip, size, flag) kmalloc((size), (flag))
typedef unsigned long DELAY_PARA_T; typedef unsigned long DELAY_PARA_T;
struct rtsx_chip; struct rtsx_chip;
......
...@@ -505,7 +505,7 @@ int spi_read_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip) ...@@ -505,7 +505,7 @@ int spi_read_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip)
TRACE_RET(chip, STATUS_FAIL); 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) if (buf == NULL)
TRACE_RET(chip, STATUS_ERROR); TRACE_RET(chip, STATUS_ERROR);
...@@ -584,7 +584,7 @@ int spi_write_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip) ...@@ -584,7 +584,7 @@ int spi_write_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip)
} }
if (program_mode == BYTE_PROGRAM) { if (program_mode == BYTE_PROGRAM) {
buf = rtsx_alloc_dma_buf(chip, 4, GFP_KERNEL); buf = kmalloc(4, GFP_KERNEL);
if (!buf) if (!buf)
TRACE_RET(chip, STATUS_ERROR); TRACE_RET(chip, STATUS_ERROR);
...@@ -630,7 +630,7 @@ int spi_write_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip) ...@@ -630,7 +630,7 @@ int spi_write_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip)
if (retval != STATUS_SUCCESS) if (retval != STATUS_SUCCESS)
TRACE_RET(chip, STATUS_FAIL); TRACE_RET(chip, STATUS_FAIL);
buf = rtsx_alloc_dma_buf(chip, 4, GFP_KERNEL); buf = kmalloc(4, GFP_KERNEL);
if (!buf) if (!buf)
TRACE_RET(chip, STATUS_ERROR); TRACE_RET(chip, STATUS_ERROR);
...@@ -675,7 +675,7 @@ int spi_write_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip) ...@@ -675,7 +675,7 @@ int spi_write_flash(struct scsi_cmnd *srb, struct rtsx_chip *chip)
if (retval != STATUS_SUCCESS) if (retval != STATUS_SUCCESS)
TRACE_RET(chip, STATUS_FAIL); TRACE_RET(chip, STATUS_FAIL);
} else if (program_mode == PAGE_PROGRAM) { } 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) if (!buf)
TRACE_RET(chip, STATUS_NOMEM); TRACE_RET(chip, STATUS_NOMEM);
......
...@@ -379,7 +379,7 @@ static void xd_clear_dma_buffer(struct rtsx_chip *chip) ...@@ -379,7 +379,7 @@ static void xd_clear_dma_buffer(struct rtsx_chip *chip)
RTSX_DEBUGP("xD ECC error, dummy write!\n"); 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) if (!buf)
return; return;
......
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