[COMMON] Fix various files for build error

modified: drivers/media/platform/exynos/fimc-is2/fimc-is-devicemgr.c
modified: drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-uvsp-cac.c
modified: drivers/media/radio/s610/radio-s610.c
modified: drivers/soc/samsung/debug/exynos9610-itmon.c
modified: drivers/staging/nanohub/chub.c
modified: drivers/staging/nanohub/main.c
modified: drivers/usb/dwc3/core.c
modified: drivers/usb/dwc3/gadget.c

Change-Id: I9a3c871cf7af204d7ada67d041ade593794cf98c
Signed-off-by: Jaehyoung Choi <jkkkkk.choi@samsung.com>

diff --git a/drivers/media/platform/exynos/fimc-is2/fimc-is-devicemgr.c b/drivers/media/platform/exynos/fimc-is2/fimc-is-devicemgr.c
index e92caf6e48fe02de520570cd0925496a86c31b9d..18c85b55864bc3cd44dac7f9a08abb6664c609b2 100644 (file)
--- a/drivers/media/platform/exynos/fimc-is2/fimc-is-devicemgr.c
+++ b/drivers/media/platform/exynos/fimc-is2/fimc-is-devicemgr.c
@@ -284,9 +284,8 @@ int fimc_is_devicemgr_start(struct fimc_is_devicemgr *devicemgr,
        struct fimc_is_group *child_group;
        struct devicemgr_sensor_tag_data *tag_data;
        u32 stream;
-#endif
        int i;
-
+#endif
        switch (type) {
        case FIMC_IS_DEVICE_SENSOR:
                sensor = (struct fimc_is_device_sensor *)device;
@@ -342,8 +341,9 @@ int fimc_is_devicemgr_stop(struct fimc_is_devicemgr *devicemgr,
 #ifndef ENABLE_SENSOR_VC_FUNCTION
        struct fimc_is_group *child_group;
        u32 stream;
-#endif
        int i;
+#endif
+
 
        switch (type) {
        case FIMC_IS_DEVICE_SENSOR:

diff --git a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-uvsp-cac.c b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-uvsp-cac.c
index a45c3e122d86af72127d28469300a11dffe0dc47..28a3c61112c1ad4d626296d76ea6976f2ee7b91c 100644 (file)
--- a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-uvsp-cac.c
+++ b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-uvsp-cac.c
@@ -146,10 +146,12 @@ int fimc_is_hw_mcsc_update_cac_register(struct fimc_is_hw_ip *hw_ip,
        struct fimc_is_hw_mcsc *hw_mcsc;
        struct fimc_is_hw_mcsc_cap *cap;
        struct hw_mcsc_setfile *setfile;
-       struct cac_setfile_contents *cac;
        enum exynos_sensor_position sensor_position;
        u32 ni, backup_in;
 
+#if defined(USE_UVSP_CAC)
+       struct cac_setfile_contents *cac;
+#endif
        BUG_ON(!hw_ip);
        BUG_ON(!hw_ip->priv_info);
 
@@ -508,7 +510,9 @@ int fimc_is_hw_mcsc_update_uvsp_register(struct fimc_is_hw_ip *hw_ip,
        struct fimc_is_hw_mcsc *hw_mcsc;
        struct fimc_is_hw_mcsc_cap *cap;
        struct hw_mcsc_setfile *setfile;
+#if defined(USE_UVSP_CAC)
        struct uvsp_setfile_contents *uvsp;
+#endif
        struct cal_info *cal_info;
        enum exynos_sensor_position sensor_position;
        u32 ni;

diff --git a/drivers/media/radio/s610/radio-s610.c b/drivers/media/radio/s610/radio-s610.c
index 3d80bc319a09bc3fdeccdeefd6b250178f2af9f3..87c335771ec61e478c605d48c19bd589a3c96819 100644 (file)
--- a/drivers/media/radio/s610/radio-s610.c
+++ b/drivers/media/radio/s610/radio-s610.c
@@ -2514,18 +2514,18 @@ static int fm_radio_runtime_resume(struct device *dev)
 #ifdef CONFIG_PM_SLEEP
 static int fm_radio_suspend(struct device *dev)
 {
-       struct s610_radio *radio = dev_get_drvdata(dev);
+//     struct s610_radio *radio = dev_get_drvdata(dev);
 
-       FUNC_ENTRY(radio);
+//     FUNC_ENTRY(radio);
 
        return 0;
 }
 
 static int fm_radio_resume(struct device *dev)
 {
-       struct s610_radio *radio = dev_get_drvdata(dev);
+//     struct s610_radio *radio = dev_get_drvdata(dev);
 
-       FUNC_ENTRY(radio);
+//     FUNC_ENTRY(radio);
 
        return 0;
 }

diff --git a/drivers/soc/samsung/debug/exynos9610-itmon.c b/drivers/soc/samsung/debug/exynos9610-itmon.c
index 99f8a1e7a64e79fd87a28a8ae45ceb59b29a8295..ee71ef07b090d300c716a561d835dc51e23a15ff 100644 (file)
--- a/drivers/soc/samsung/debug/exynos9610-itmon.c
+++ b/drivers/soc/samsung/debug/exynos9610-itmon.c
@@ -848,10 +848,9 @@ static void itmon_report_tracedata(struct itmon_dev *itmon,
        struct itmon_platdata *pdata = itmon->pdata;
        struct itmon_tracedata *tracedata = &node->tracedata;
        struct itmon_traceinfo *traceinfo = &pdata->traceinfo[trans_type];
-       struct itmon_nodegroup *group = node->group;
        struct itmon_masterinfo *master;
        struct itmon_rpathinfo *port;
-       unsigned int errcode, axid, val;
+       unsigned int errcode, axid;
 
        errcode = BIT_ERR_CODE(tracedata->int_info);
        axid = BIT_AXID(tracedata->int_info);

diff --git a/drivers/staging/nanohub/chub.c b/drivers/staging/nanohub/chub.c
index 5fad14964679737f8a5b697cddd0a3a9129fa511..4540c64b56bcf0c07782894fa1378610c198d9dd 100644 (file)
--- a/drivers/staging/nanohub/chub.c
+++ b/drivers/staging/nanohub/chub.c
@@ -157,7 +157,6 @@ static int contexthub_read_process(uint8_t *rx, u8 *raw_rx, u32 size)
 static int contexthub_ipc_drv_init(struct contexthub_ipc_info *chub)
 {
        struct device *chub_dev = chub->dev;
-       int i;
 
        chub->ipc_map = ipc_get_chub_map();
        if (!chub->ipc_map)
@@ -243,11 +242,9 @@ int contexthub_ipc_read(struct contexthub_ipc_info *ipc, uint8_t *rx, int max_le
                                int timeout)
 {
        unsigned long flag;
-       int ret;
 #ifdef USE_IPC_BUF
        int size = 0;
-       int lock;
-       struct ipc_buf *ipc_buf = ipc_get_base(IPC_REG_IPC_C2A);
+       int ret;
 
        if (!ipc->read_lock.flag) {
                spin_lock_irqsave(&ipc->read_lock.event.lock, flag);
@@ -851,7 +848,9 @@ static void handle_debug_work_func(struct work_struct *work)
        bool need_reset = 0;
        bool alive = contexthub_lowlevel_alive(ipc);
        int err = 0;
+#ifdef CHUB_RESET_ENABLE
        int ret;
+#endif
        int i;
 
        dev_info(ipc->dev, "%s: fw_err:%d, alive:%d\n",
@@ -937,8 +936,9 @@ do_reset:
 
 static void handle_irq(struct contexthub_ipc_info *ipc, enum irq_evt_chub evt)
 {
+#ifndef USE_IPC_BUF
        struct ipc_content *content;
-
+#endif
        switch (evt) {
        case IRQ_EVT_C2A_DEBUG:
                schedule_work(&ipc->debug_work);

diff --git a/drivers/staging/nanohub/main.c b/drivers/staging/nanohub/main.c
index a3878dac6ec37e78f1fd86179542ad8617495969..48f4b81f7301cac5ff5611a03255b363d581a12b 100644 (file)
--- a/drivers/staging/nanohub/main.c
+++ b/drivers/staging/nanohub/main.c
@@ -1380,11 +1380,6 @@ static int nanohub_kthread(void *arg)
        static const struct sched_param param = {
                .sched_priority = (MAX_USER_RT_PRIO/2)-1,
        };
-#ifdef CONFIG_NANOHUB_MAILBOX
-#ifndef CHUB_RESET_ENABLE
-       struct contexthub_ipc_info *ipc;
-#endif
-#endif
 
        data->kthread_err_cnt = 0;
        sched_setscheduler(current, SCHED_FIFO, &param);

diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index 1ea48534533048e8ed9c75b8679f92f9641df232..4aa43bd9b15e65ab1d90f149abfe0855ae21caa6 100644 (file)
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -388,7 +388,7 @@ static int dwc3_core_soft_reset(struct dwc3 *dwc)
        do {
                reg = dwc3_readl(dwc->regs, DWC3_DCTL);
                if (!(reg & DWC3_DCTL_CSFTRST))
-                       goto done;
+                       return 0;
 
                udelay(1);
        } while (--retries);

diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index d4e0718a40472da7019f62b2b53a840777d1db6c..394f6d6479778a4fb9cfeb5f83ee917f1d224ce6 100644 (file)
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -181,7 +181,6 @@ void dwc3_gadget_del_and_unmap_request(struct dwc3_ep *dep,
                struct dwc3_request *req, int status)
 {
        struct dwc3                     *dwc = dep->dwc;
-       unsigned int                    unmap_after_complete = false;
 
        req->started = false;
        /* Only delete from the list if the item isn't poisoned. */