Commit b0503584 authored by Stephen Boyd's avatar Stephen Boyd Committed by Greg Kroah-Hartman
Browse files

firmware: google: memconsole: Use devm_memremap() 



Use the devm version of memremap so that we can delete the unmapping
code in driver remove, but more importantly so that we can unmap this
memory region if memconsole_sysfs_init() errors out for some reason.

Cc: Wei-Ning Huang <wnhuang@chromium.org>
Cc: Julius Werner <jwerner@chromium.org>
Cc: Brian Norris <briannorris@chromium.org>
Cc: Samuel Holland <samuel@sholland.org>
Cc: Guenter Roeck <groeck@chromium.org>
Signed-off-by: default avatarStephen Boyd <swboyd@chromium.org>
Reviewed-by: default avatarJulius Werner <jwerner@chromium.org>
Reviewed-by: default avatarSamuel Holland <samuel@sholland.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 35463503

drivers/firmware/google/memconsole-coreboot.c

+3 −6
Original line number Diff line number Diff line
@@ -85,13 +85,13 @@ static int memconsole_probe(struct coreboot_device *dev) 


	/* Read size only once to prevent overrun attack through /dev/mem. */

	cbmem_console_size = tmp_cbmc->size_dont_access_after_boot;

	cbmem_console = memremap(dev->cbmem_ref.cbmem_addr,

	cbmem_console = devm_memremap(&dev->dev, dev->cbmem_ref.cbmem_addr,

				 cbmem_console_size + sizeof(*cbmem_console),

				 MEMREMAP_WB);

	memunmap(tmp_cbmc);



	if (!cbmem_console)

		return -ENOMEM;

	if (IS_ERR(cbmem_console))

		return PTR_ERR(cbmem_console);



	memconsole_setup(memconsole_coreboot_read);
@@ -102,9 +102,6 @@ static int memconsole_remove(struct coreboot_device *dev) 
{

	memconsole_exit();



	if (cbmem_console)

		memunmap(cbmem_console);



	return 0;

}