From: Alexandre Belloni Date: Mon, 12 Feb 2018 22:47:21 +0000 (+0100) Subject: rtc: ds1305: put ds1305_nvmem_cfg on the stack X-Git-Tag: v4.19~1240^2~116 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eed9d7a335d67f8d61286fb3bbacce9c61c6dc52;p=platform%2Fkernel%2Flinux-rpi.git rtc: ds1305: put ds1305_nvmem_cfg on the stack This makes to code safer on system using two similar RTCs. Signed-off-by: Alexandre Belloni --- diff --git a/drivers/rtc/rtc-ds1305.c b/drivers/rtc/rtc-ds1305.c index affa90d..3d2400a 100644 --- a/drivers/rtc/rtc-ds1305.c +++ b/drivers/rtc/rtc-ds1305.c @@ -544,15 +544,6 @@ static int ds1305_nvram_write(void *priv, unsigned int off, void *buf, return spi_sync(spi, &m); } -static struct nvmem_config ds1305_nvmem_cfg = { - .name = "ds1305_nvram", - .word_size = 1, - .stride = 1, - .size = DS1305_NVRAM_LEN, - .reg_read = ds1305_nvram_read, - .reg_write = ds1305_nvram_write, -}; - /*----------------------------------------------------------------------*/ /* @@ -566,6 +557,14 @@ static int ds1305_probe(struct spi_device *spi) u8 addr, value; struct ds1305_platform_data *pdata = dev_get_platdata(&spi->dev); bool write_ctrl = false; + struct nvmem_config ds1305_nvmem_cfg = { + .name = "ds1305_nvram", + .word_size = 1, + .stride = 1, + .size = DS1305_NVRAM_LEN, + .reg_read = ds1305_nvram_read, + .reg_write = ds1305_nvram_write, + }; /* Sanity check board setup data. This may be hooked up * in 3wire mode, but we don't care. Note that unless