Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0dba333c authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by David Woodhouse
Browse files

block/spectra: rename nand_release() 



so it does not clash with nand_release() in mtd

Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent b589aece

drivers/block/spectra/lld.c

+1 −1
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ u16 GLOB_LLD_Flash_Init(void) 


int GLOB_LLD_Flash_Release(void)

{

	return nand_release();

	return nand_release_spectra();

}



u16 GLOB_LLD_Erase_Block(u32 block_add)

drivers/block/spectra/lld_nand.c

+1 −1
Original line number Diff line number Diff line
@@ -2588,7 +2588,7 @@ int NAND_Flash_Init(void) 
}



/* Free memory */

int nand_release(void)

int nand_release_spectra(void)

{

	pci_unregister_driver(&nand_pci_driver);

	iounmap(FlashMem);

drivers/block/spectra/lld_nand.h

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ struct mrst_nand_info { 
};



int NAND_Flash_Init(void);

int nand_release(void);

int nand_release_spectra(void);

u16  NAND_Flash_Reset(void);

u16  NAND_Read_Device_ID(void);

u16  NAND_Erase_Block(u32 flash_add);