fimc-is: SPI related functions clean up

Replace explicit memset() calls with initialization to 0 at declaration time.

Change-Id: I56068b22577494c59d85e94af439234f56ed1fdd
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>

diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-companion.c b/drivers/media/platform/exynos/fimc-is/fimc-is-companion.c
index 3e9575b4a006cec55842bb60c68901c530c88722..b69d161b630309e798497a1e5048514d0ad7f4dc 100644 (file)
--- a/drivers/media/platform/exynos/fimc-is/fimc-is-companion.c
+++ b/drivers/media/platform/exynos/fimc-is/fimc-is-companion.c
@@ -51,18 +51,13 @@ static u32 concord_fw_size;
 char companion_crc[10];
 
 static int fimc_is_comp_spi_read(struct spi_device *spi,
-               void *buf, u16 rx_addr, size_t size)
+                                void *buf, u16 rx_addr, size_t size)
 {
-       unsigned char req_data[4] = { 0x03,  };
-       int ret;
-
-       struct spi_transfer t_c;
-       struct spi_transfer t_r;
-
+       unsigned char req_data[4] = { 0x03 };
+       struct spi_transfer t_c = { 0 };
+       struct spi_transfer t_r = { 0 };
        struct spi_message m;
-
-       memset(&t_c, 0x00, sizeof(t_c));
-       memset(&t_r, 0x00, sizeof(t_r));
+       int ret;
 
        req_data[1] = (rx_addr & 0xFF00) >> 8;
        req_data[2] = (rx_addr & 0xFF);
@@ -79,11 +74,10 @@ static int fimc_is_comp_spi_read(struct spi_device *spi,
        spi_message_add_tail(&t_r, &m);
 
        ret = spi_sync(spi, &m);
-       if (ret) {
+       if (ret)
                err("spi sync error - can't read data");
-               return -EIO;
-       } else
-               return 0;
+
+       return ret;
 }
 
 static int fimc_is_comp_spi_single_write(struct spi_device *spi, u16 addr, u16 data)
@@ -137,7 +131,7 @@ static int fimc_is_comp_spi_burst_write(struct spi_device *spi,
                ret = spi_write(spi, &tx_buf[0], j + 3);
                if (ret) {
                        err("spi write error - can't write data");
-                       goto p_err;
+                       return ret;
                }
        }
 
@@ -159,8 +153,6 @@ static int fimc_is_comp_spi_burst_write(struct spi_device *spi,
        if (ret)
                err("spi write error - can't write data");
 
-
-p_err:
        return ret;
 }
 

diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-core.c b/drivers/media/platform/exynos/fimc-is/fimc-is-core.c
index bb38a88697b542a50a4feaa8a36269998db7a10c..dc7f1a9325a9ee38ecfbdd5da3cbb4384ccf7493 100644 (file)
--- a/drivers/media/platform/exynos/fimc-is/fimc-is-core.c
+++ b/drivers/media/platform/exynos/fimc-is/fimc-is-core.c
@@ -1344,8 +1344,8 @@ static int of_fimc_is_spi_dt(struct device *dev, struct fimc_is_spi_gpio *spi_gp
 
 static int fimc_is_spi_probe(struct spi_device *spi)
 {
-       int ret = 0;
        struct fimc_is_core *core;
+       int ret = 0;
 
        BUG_ON(!fimc_is_dev);
 
@@ -1361,8 +1361,7 @@ static int fimc_is_spi_probe(struct spi_device *spi)
        /* spi->bits_per_word = 16; */
        if (spi_setup(spi)) {
                pr_err("failed to setup spi for fimc_is_spi\n");
-               ret = -EINVAL;
-               goto exit;
+               return -EINVAL;
        }
 
        if (!strncmp(spi->modalias, "fimc_is_spi0", 12))
@@ -1371,13 +1370,10 @@ static int fimc_is_spi_probe(struct spi_device *spi)
        if (!strncmp(spi->modalias, "fimc_is_spi1", 12)) {
                core->spi1 = spi;
                ret = of_fimc_is_spi_dt(&spi->dev,&core->spi_gpio, core);
-               if (ret) {
+               if (ret)
                        pr_err("[%s] of_fimc_is_spi_dt parse dt failed\n", __func__);
-                       return ret;
-               }
        }
 
-exit:
        return ret;
 }
 

diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-sec-define.c b/drivers/media/platform/exynos/fimc-is/fimc-is-sec-define.c
index ef8e16b4954bbb5f83894618f2a3d20555d97b74..f7be851bd382bfb51984a2ce20634539eb6d484b 100644 (file)
--- a/drivers/media/platform/exynos/fimc-is/fimc-is-sec-define.c
+++ b/drivers/media/platform/exynos/fimc-is/fimc-is-sec-define.c
@@ -315,13 +315,13 @@ extern int fimc_is_spi_read_module_id(struct spi_device *spi, void *buf, u16 rx_
 
 int fimc_is_sec_read_from_header(struct device *dev)
 {
-       int ret = 0;
        struct fimc_is_core *core = dev_get_drvdata(dev);
-       u8 header_version[12] = {0, };
+       u8 header_version[12] = { 0 };
+       int ret = 0;
 
        ret = fimc_is_spi_read_by_core(core->spi0, header_version, 0x40, 0x0B);
        if (ret < 0) {
-               printk(KERN_ERR "failed to fimc_is_spi_read for header version (%d)\n", ret);
+               printk(KERN_ERR "failed to read FROM header version: %d\n", ret);
                ret = -EINVAL;
        }
 
@@ -1075,14 +1075,15 @@ exit:
        if (core->use_module_check) {
                if (sysfs_finfo.header_ver[3] != 'L') {
                        pr_err("Not supported module. Module ver = %s", sysfs_finfo.header_ver);
-                       return  -EIO;
+                       return -EIO;
                }
        }
 
        return ret;
 }
 
-void fimc_is_set_spi_config(struct fimc_is_spi_gpio *spi_gpio, int func, bool ssn) {
+void fimc_is_set_spi_config(struct fimc_is_spi_gpio *spi_gpio, int func, bool ssn)
+{
 #if 0
        pin_config_set(FIMC_IS_SPI_PINNAME, spi_gpio->spi_sclk,
                        PINCFG_PACK(PINCFG_TYPE_FUNC, func));

diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-spi.c b/drivers/media/platform/exynos/fimc-is/fimc-is-spi.c
index bc552cc8c96568b8fdf5da48b893c41a863bf250..0daf82dde9fea9e244da5f90ddb2150b49edcad0 100644 (file)
--- a/drivers/media/platform/exynos/fimc-is/fimc-is-spi.c
+++ b/drivers/media/platform/exynos/fimc-is/fimc-is-spi.c
@@ -24,15 +24,9 @@
 int fimc_is_spi_reset_by_core(struct spi_device *spi, void *buf, u32 rx_addr, size_t size)
 {
        unsigned char req_rst[1] = { 0x99 };
-       int ret;
-
-       struct spi_transfer t_c;
-       struct spi_transfer t_r;
-
+       struct spi_transfer t_c = { 0 };
        struct spi_message m;
-
-       memset(&t_c, 0x00, sizeof(t_c));
-       memset(&t_r, 0x00, sizeof(t_r));
+       int ret;
 
        t_c.tx_buf = req_rst;
        t_c.len = 1;
@@ -41,31 +35,24 @@ int fimc_is_spi_reset_by_core(struct spi_device *spi, void *buf, u32 rx_addr, si
        spi_message_add_tail(&t_c, &m);
 
        ret = spi_sync(spi, &m);
-       if (ret) {
+       if (ret)
                err("spi sync error - can't get device information");
-               return -EIO;
-       }
 
-       return 0;
+       return ret;
 }
 EXPORT_SYMBOL(fimc_is_spi_reset_by_core);
 
 int fimc_is_spi_read_by_core(struct spi_device *spi, void *buf, u32 rx_addr, size_t size)
 {
-       unsigned char req_data[4] = { 0x03,  };
-       int ret;
-
-       struct spi_transfer t_c;
-       struct spi_transfer t_r;
-
+       unsigned char req_data[4] = { 0x03 };
+       struct spi_transfer t_c = { 0 };
+       struct spi_transfer t_r = { 0 };
        struct spi_message m;
+       int ret;
 
-       memset(&t_c, 0x00, sizeof(t_c));
-       memset(&t_r, 0x00, sizeof(t_r));
-
-       req_data[1] = (rx_addr & 0xFF0000) >> 16;
-       req_data[2] = (rx_addr & 0xFF00) >> 8;
-       req_data[3] = (rx_addr & 0xFF);
+       req_data[1] = (rx_addr & 0xff0000) >> 16;
+       req_data[2] = (rx_addr & 0xff00) >> 8;
+       req_data[3] = (rx_addr & 0xff);
 
        t_c.tx_buf = req_data;
        t_c.len = 4;
@@ -80,29 +67,23 @@ int fimc_is_spi_read_by_core(struct spi_device *spi, void *buf, u32 rx_addr, siz
        spi_message_add_tail(&t_r, &m);
 
        spi->max_speed_hz = 48000000;
+
        ret = spi_sync(spi, &m);
-       if (ret) {
+       if (ret)
                err("spi sync error - can't read data");
-               return -EIO;
-       } else {
-               return 0;
-       }
+
+       return ret;
 }
 EXPORT_SYMBOL(fimc_is_spi_read_by_core);
 
 int fimc_is_spi_read_module_id(struct spi_device *spi, void *buf, u16 rx_addr, size_t size)
 {
        unsigned char req_data[4] = { 0x90,  };
+       struct spi_transfer t_c = { 0 };
+       struct spi_transfer t_r = { 0 };
        int ret;
-
-       struct spi_transfer t_c;
-       struct spi_transfer t_r;
-
        struct spi_message m;
 
-       memset(&t_c, 0x00, sizeof(t_c));
-       memset(&t_r, 0x00, sizeof(t_r));
-
        req_data[1] = (rx_addr & 0xFF00) >> 8;
        req_data[2] = (rx_addr & 0xFF);
 
@@ -114,16 +95,15 @@ int fimc_is_spi_read_module_id(struct spi_device *spi, void *buf, u16 rx_addr, s
        t_r.len = size;
 
        spi_message_init(&m);
+
        spi_message_add_tail(&t_c, &m);
        spi_message_add_tail(&t_r, &m);
 
        spi->max_speed_hz = 48000000;
        ret = spi_sync(spi, &m);
-       if (ret) {
+       if (ret)
                err("spi sync error - can't read data");
-               return -EIO;
-       } else {
-               return 0;
-       }
+
+       return ret;
 }
 EXPORT_SYMBOL(fimc_is_spi_read_module_id);