mtd: rawnand: gpmi: Remove unnecessary variables
this->page_buffer_virt and this->payload_virt are always set to the same value, so drop the former and just use the latter. Same for this->page_buffer_virt and this->payload_virt. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
This commit is contained in:
Родитель
727ab978e5
Коммит
41e2322b25
|
@ -1637,10 +1637,10 @@ static void gpmi_free_dma_buffer(struct gpmi_nand_data *this)
|
|||
{
|
||||
struct device *dev = this->dev;
|
||||
|
||||
if (this->page_buffer_virt && virt_addr_valid(this->page_buffer_virt))
|
||||
if (this->payload_virt && virt_addr_valid(this->payload_virt))
|
||||
dma_free_coherent(dev, this->page_buffer_size,
|
||||
this->page_buffer_virt,
|
||||
this->page_buffer_phys);
|
||||
this->payload_virt,
|
||||
this->payload_phys);
|
||||
kfree(this->cmd_buffer);
|
||||
kfree(this->data_buffer_dma);
|
||||
kfree(this->raw_buffer);
|
||||
|
@ -1648,7 +1648,6 @@ static void gpmi_free_dma_buffer(struct gpmi_nand_data *this)
|
|||
this->cmd_buffer = NULL;
|
||||
this->data_buffer_dma = NULL;
|
||||
this->raw_buffer = NULL;
|
||||
this->page_buffer_virt = NULL;
|
||||
this->page_buffer_size = 0;
|
||||
}
|
||||
|
||||
|
@ -1686,9 +1685,9 @@ static int gpmi_alloc_dma_buffer(struct gpmi_nand_data *this)
|
|||
* auxiliary buffer will appear on a 32-bit boundary.
|
||||
*/
|
||||
this->page_buffer_size = geo->payload_size + geo->auxiliary_size;
|
||||
this->page_buffer_virt = dma_alloc_coherent(dev, this->page_buffer_size,
|
||||
&this->page_buffer_phys, GFP_DMA);
|
||||
if (!this->page_buffer_virt)
|
||||
this->payload_virt = dma_alloc_coherent(dev, this->page_buffer_size,
|
||||
&this->payload_phys, GFP_DMA);
|
||||
if (!this->payload_virt)
|
||||
goto error_alloc;
|
||||
|
||||
this->raw_buffer = kzalloc(mtd->writesize + mtd->oobsize, GFP_KERNEL);
|
||||
|
@ -1696,8 +1695,6 @@ static int gpmi_alloc_dma_buffer(struct gpmi_nand_data *this)
|
|||
goto error_alloc;
|
||||
|
||||
/* Slice up the page buffer. */
|
||||
this->payload_virt = this->page_buffer_virt;
|
||||
this->payload_phys = this->page_buffer_phys;
|
||||
this->auxiliary_virt = this->payload_virt + geo->payload_size;
|
||||
this->auxiliary_phys = this->payload_phys + geo->payload_size;
|
||||
return 0;
|
||||
|
|
|
@ -138,8 +138,6 @@ struct gpmi_nand_data {
|
|||
struct scatterlist data_sgl;
|
||||
char *data_buffer_dma;
|
||||
|
||||
void *page_buffer_virt;
|
||||
dma_addr_t page_buffer_phys;
|
||||
unsigned int page_buffer_size;
|
||||
|
||||
void *payload_virt;
|
||||
|
|
Загрузка…
Ссылка в новой задаче