From: Sylwester Nawrocki Date: Fri, 6 Apr 2018 10:02:31 +0000 (+0200) Subject: fimc-is: Remove unused SPI driver code X-Git-Tag: submit/tizen/20190329.020226~243 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=abfe0aba825ea1e421dfc871a2f5b274e4436bcb;p=platform%2Fkernel%2Flinux-exynos.git fimc-is: Remove unused SPI driver code This patch removes empty/unused SPI related functions and unneeded devinit/devexit attribute definitions. Change-Id: I98055d7947c15d0c6692d8714469f48ed9aeffb0 Signed-off-by: Sylwester Nawrocki --- diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-core.h b/drivers/media/platform/exynos/fimc-is/fimc-is-core.h index 85fe5308ccf6..da6a8eec8a27 100644 --- a/drivers/media/platform/exynos/fimc-is/fimc-is-core.h +++ b/drivers/media/platform/exynos/fimc-is/fimc-is-core.h @@ -298,8 +298,6 @@ int fimc_is_init_set(struct fimc_is_core *dev , u32 val); int fimc_is_load_fw(struct fimc_is_core *dev); int fimc_is_load_setfile(struct fimc_is_core *dev); int fimc_is_otf_close(struct fimc_is_device_ischain *ischain); -int fimc_is_spi_reset(void *buf, u32 rx_addr, size_t size); -int fimc_is_spi_read(void *buf, u32 rx_addr, size_t size); int fimc_is_runtime_suspend(struct device *dev); int fimc_is_runtime_resume(struct device *dev); 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 e5db569da8e8..1e201d05b60b 100644 --- a/drivers/media/platform/exynos/fimc-is/fimc-is-spi.c +++ b/drivers/media/platform/exynos/fimc-is/fimc-is-spi.c @@ -20,90 +20,6 @@ #include "fimc-is-core.h" #include "fimc-is-regs.h" -#define STREAM_TO_U16(var16, p) {(var16) = ((u16)(*((u8 *)p+1)) + \ - ((u8)(*((u8 *)p) << 8))); } - -#ifndef __devinit -#define __devinit -#endif - -#ifndef __devexit -#define __devexit -#endif - -#ifndef __devexit_p -#define __devexit_p(x) x -#endif - -static struct spi_device *g_spi; - -int fimc_is_spi_reset(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_message m; - - memset(&t_c, 0x00, sizeof(t_c)); - memset(&t_r, 0x00, sizeof(t_r)); - - t_c.tx_buf = req_rst; - t_c.len = 1; - t_c.cs_change = 0; - - spi_message_init(&m); - spi_message_add_tail(&t_c, &m); - - ret = spi_sync(g_spi, &m); - if (ret) { - err("spi sync error - can't get device information"); - return -EIO; - } - - return 0; -} - -int fimc_is_spi_read(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; - - struct spi_message m; - - 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); - - t_c.tx_buf = req_data; - t_c.len = 4; - t_c.cs_change = 1; - t_c.bits_per_word = 32; - - t_r.rx_buf = buf; - t_r.len = size; - t_r.cs_change = 0; - t_r.bits_per_word = 32; - - spi_message_init(&m); - spi_message_add_tail(&t_c, &m); - spi_message_add_tail(&t_r, &m); - - ret = spi_sync(g_spi, &m); - if (ret) { - err("spi sync error - can't read data"); - return -EIO; - } else - return 0; -} int fimc_is_spi_reset_by_core(struct spi_device *spi, void *buf, u32 rx_addr, size_t size) { @@ -215,61 +131,3 @@ int fimc_is_spi_read_module_id(struct spi_device *spi, void *buf, u16 rx_addr, s } } EXPORT_SYMBOL(fimc_is_spi_read_module_id); - - -static int __devinit fimc_is_spi_probe(struct spi_device *spi) -{ - int ret = 0; - - dbg_core("%s\n", __func__); - - /* spi->bits_per_word = 16; */ - if (spi_setup(spi)) { - pr_err("failed to setup spi for fimc_is_spi\n"); - ret = -EINVAL; - goto exit; - } - - g_spi = spi; - -exit: - return ret; -} - -static int __devexit fimc_is_spi_remove(struct spi_device *spi) -{ - return 0; -} - -static struct spi_driver fimc_is_spi_driver = { - .driver = { - .name = "fimc_is_spi", - .bus = &spi_bus_type, - .owner = THIS_MODULE, - }, - .probe = fimc_is_spi_probe, - .remove = __devexit_p(fimc_is_spi_remove), -}; - -static int __init fimc_is_spi_init(void) -{ - int ret; - - ret = spi_register_driver(&fimc_is_spi_driver); - - if (ret) - pr_err("failed to register imc_is_spi- %x\n", ret); - - return ret; -} - -static void __exit fimc_is_spi_exit(void) -{ - spi_unregister_driver(&fimc_is_spi_driver); -} - -module_init(fimc_is_spi_init); -module_exit(fimc_is_spi_exit); - -MODULE_DESCRIPTION("FIMC-IS SPI driver"); -MODULE_LICENSE("GPL");