public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

nvmem: zynqmp_nvmem: zynqmp_nvmem_probe cleanup

Browse source 
- Remove static nvmem_config declaration
- Remove zynqmp_nvmem_data

Signed-off-by: Praveen Teja Kundanala <praveen.teja.kundanala@amd.com>
Acked-by: Kalyani Akula <Kalyani.akula@amd.com>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20240224114516.86365-7-srinivas.kandagatla@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Praveen Teja Kundanala 2024-02-24 11:45:11 +00:00 • committed by Greg Kroah-Hartman
parent e34b943068
commit 29be47fcd6
1 changed files with 12 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
drivers/nvmem/zynqmp_nvmem.c
View file

@ -1,6 +1,7 @@
// SPDX-License-Identifier: GPL-2.0+ // SPDX-License-Identifier: GPL-2.0+
/* /*
* Copyright (C) 2019 Xilinx, Inc. * Copyright (C) 2019 Xilinx, Inc.
* Copyright (C) 2022 - 2023, Advanced Micro Devices, Inc.
*/ */
#include <linux/module.h> #include <linux/module.h>
@ -11,36 +12,25 @@
#define SILICON_REVISION_MASK 0xF #define SILICON_REVISION_MASK 0xF
struct zynqmp_nvmem_data {
struct device *dev;
struct nvmem_device *nvmem;
};
static int zynqmp_nvmem_read(void *context, unsigned int offset, static int zynqmp_nvmem_read(void *context, unsigned int offset,
void *val, size_t bytes) void *val, size_t bytes)
{ {
struct device *dev = context;
int ret; int ret;
int idcode, version; int idcode;
struct zynqmp_nvmem_data *priv = context; int version;
ret = zynqmp_pm_get_chipid(&idcode, &version); ret = zynqmp_pm_get_chipid(&idcode, &version);
if (ret < 0) if (ret < 0)
return ret; return ret;
dev_dbg(priv->dev, "Read chipid val %x %x\n", idcode, version); dev_dbg(dev, "Read chipid val %x %x\n", idcode, version);
*(int *)val = version & SILICON_REVISION_MASK; *(int *)val = version & SILICON_REVISION_MASK;
return 0; return 0;
} }
static struct nvmem_config econfig = {
.name = "zynqmp-nvmem",
.owner = THIS_MODULE,
.word_size = 1,
.size = 1,
.read_only = true,
};
static const struct of_device_id zynqmp_nvmem_match[] = { static const struct of_device_id zynqmp_nvmem_match[] = {
{ .compatible = "xlnx,zynqmp-nvmem-fw", }, { .compatible = "xlnx,zynqmp-nvmem-fw", },
{ /* sentinel */ }, { /* sentinel */ },
@ -50,21 +40,18 @@ MODULE_DEVICE_TABLE(of, zynqmp_nvmem_match);
static int zynqmp_nvmem_probe(struct platform_device *pdev) static int zynqmp_nvmem_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct zynqmp_nvmem_data *priv; struct nvmem_config econfig = {};
priv = devm_kzalloc(dev, sizeof(struct zynqmp_nvmem_data), GFP_KERNEL); econfig.name = "zynqmp-nvmem";
if (!priv) econfig.owner = THIS_MODULE;
return -ENOMEM; econfig.word_size = 1;
econfig.size = 1;
priv->dev = dev;
econfig.dev = dev; econfig.dev = dev;
econfig.add_legacy_fixed_of_cells = true; econfig.add_legacy_fixed_of_cells = true;
econfig.read_only = true;
econfig.reg_read = zynqmp_nvmem_read; econfig.reg_read = zynqmp_nvmem_read;
econfig.priv = priv;
priv->nvmem = devm_nvmem_register(dev, &econfig); return PTR_ERR_OR_ZERO(devm_nvmem_register(dev, &econfig));
return PTR_ERR_OR_ZERO(priv->nvmem);
} }
static struct platform_driver zynqmp_nvmem_driver = { static struct platform_driver zynqmp_nvmem_driver = {