Commit 7b4e76cb authored Mar 09, 2018 by Andrey Smirnov Committed by Greg Kroah-Hartman Mar 14, 2018

nvmem: rockchip-efuse: Make use of of_device_get_match_data()



Simplify code a bit by using of_device_get_match_data() instead of
of_match_device().

Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Cc: Heiko Stuebner <heiko@sntech.de>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Carlo Caione <carlo@caione.org>
Cc: Kevin Hilman <khilman@baylibre.com>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: cphealy@gmail.com
Cc: linux-kernel@vger.kernel.org
Cc: linux-mediatek@lists.infradead.org
Cc: linux-rockchip@lists.infradead.org
Cc: linux-amlogic@lists.infradead.org
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 0e189891

drivers/nvmem/rockchip-efuse.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -259,11 +259,11 @@ static int rockchip_efuse_probe(struct platform_device *pdev)
		struct resource *res;
		struct nvmem_device *nvmem;
		struct rockchip_efuse_chip *efuse;
		const struct of_device_id *match;
		const void *data;
		struct device *dev = &pdev->dev;

		match = of_match_device(dev->driver->of_match_table, dev);
		if (!match \|\| !match->data) {
		data = of_device_get_match_data(dev);
		if (!data) {
		dev_err(dev, "failed to get match data\n");
		return -EINVAL;
		}
		@@ -286,7 +286,7 @@ static int rockchip_efuse_probe(struct platform_device *pdev)
		if (of_property_read_u32(dev->of_node, "rockchip,efuse-size",
		&econfig.size))
		econfig.size = resource_size(res);
		econfig.reg_read = match->data;
		econfig.reg_read = data;
		econfig.priv = efuse;
		econfig.dev = efuse->dev;
		nvmem = devm_nvmem_register(dev, &econfig);

Admin message