diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-11-09 10:55:05 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-11-09 10:55:05 +0100 |
| commit | 227426f16163d3721fee82650980aae0eef01375 (patch) | |
| tree | a64101906c15b814ec942468e88875ce8160e45d /drivers/nvmem | |
| parent | c024f90f5dd5604d3f82dbbc055fd88a69d59187 (diff) | |
| parent | ac7324a0ed12a67fc836b383388f2562d32e55ed (diff) | |
| download | barebox-227426f16163d3721fee82650980aae0eef01375.tar.gz barebox-227426f16163d3721fee82650980aae0eef01375.tar.xz | |
Merge branch 'for-next/net-switch-mv88e6xxx'
Diffstat (limited to 'drivers/nvmem')
| -rw-r--r-- | drivers/nvmem/core.c | 2 | ||||
| -rw-r--r-- | drivers/nvmem/ocotp.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index c0f61f453a..63c0f997b3 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -199,7 +199,7 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) nvmem->read_only = of_property_read_bool(np, "read-only") | config->read_only; - safe_strncpy(nvmem->dev.name, config->name, MAX_DRIVER_NAME); + dev_set_name(&nvmem->dev, config->name); nvmem->dev.id = DEVICE_ID_DYNAMIC; dev_dbg(&nvmem->dev, "Registering nvmem device %s\n", config->name); diff --git a/drivers/nvmem/ocotp.c b/drivers/nvmem/ocotp.c index ba35bef99a..e689559ee3 100644 --- a/drivers/nvmem/ocotp.c +++ b/drivers/nvmem/ocotp.c @@ -531,7 +531,7 @@ static int imx_ocotp_probe(struct device_d *dev) if (IS_ERR(priv->clk)) return PTR_ERR(priv->clk); - strcpy(priv->dev.name, "ocotp"); + dev_set_name(&priv->dev, "ocotp"); priv->dev.parent = dev; register_device(&priv->dev); |