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

Commit e701c67c authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Greg Kroah-Hartman
Browse files

nvmem: remove unneeded IS_ENABLED(CONFIG_NVMEM) conditional 



As you see in drivers/nvmem/Makefile, this C file is compiled only
when CONFIG_NVMEM is y or m.

So, IS_ENABLED(CONFIG_NVMEM) is always evaluated to 1 in this file.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f7c04f16

drivers/nvmem/core.c

+2 −2
Original line number Diff line number Diff line
@@ -615,7 +615,7 @@ static struct nvmem_device *nvmem_find(const char *name) 
	return to_nvmem_device(d);

}



#if IS_ENABLED(CONFIG_NVMEM) && IS_ENABLED(CONFIG_OF)

#if IS_ENABLED(CONFIG_OF)

/**

 * of_nvmem_device_get() - Get nvmem device from a given id

 *
@@ -753,7 +753,7 @@ static struct nvmem_cell *nvmem_cell_get_from_list(const char *cell_id) 
	return cell;

}



#if IS_ENABLED(CONFIG_NVMEM) && IS_ENABLED(CONFIG_OF)

#if IS_ENABLED(CONFIG_OF)

/**

 * of_nvmem_cell_get() - Get a nvmem cell from given device node and cell id

 *