From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mailout1.w1.samsung.com ([210.118.77.11]:44727 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752676Ab2IYOHH (ORCPT ); Tue, 25 Sep 2012 10:07:07 -0400 Received: from eusync4.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by mailout1.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MAW00K21SKHMO00@mailout1.w1.samsung.com> for linux-media@vger.kernel.org; Tue, 25 Sep 2012 15:07:29 +0100 (BST) Received: from [106.116.147.32] by eusync4.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MAW00BKSSJTY440@eusync4.samsung.com> for linux-media@vger.kernel.org; Tue, 25 Sep 2012 15:07:05 +0100 (BST) Message-id: <5061BA88.8010201@samsung.com> Date: Tue, 25 Sep 2012 16:07:04 +0200 From: Sylwester Nawrocki MIME-version: 1.0 To: Mauro Carvalho Chehab Cc: Linux Media Mailing List , Sachin Kamat , Kamil Debski Subject: Re: Fw: [PATCH] [media] s5p-mfc: Remove unreachable code References: <20120925102839.2a90ab26@redhat.com> In-reply-to: <20120925102839.2a90ab26@redhat.com> Content-type: text/plain; charset=UTF-8 Content-transfer-encoding: 7bit Sender: linux-media-owner@vger.kernel.org List-ID: Hi Mauro, Sachin, On 09/25/2012 03:28 PM, Mauro Carvalho Chehab wrote: > Hi Sylwester, > > Please review. I checked it with Kamil and it seems the code being removed is required for proper driver operation. Thus please hold on with this patch. We will prepare a different fix after testing. Sachin, thanks for reporting that issue. The code below is needed to make sure the MFC is fully suspended after s5p_mfc_suspend() returns. The "return s5p_mfc_sleep(m_dev);" probably just needs to be moved after the while loop. > Thanks! > Mauro > > Forwarded message: > > Date: Fri, 14 Sep 2012 14:50:17 +0530 > From: Sachin Kamat > To: linux-media@vger.kernel.org > Cc: mchehab@infradead.org, s.nawrocki@samsung.com, k.debski@samsung.com, sachin.kamat@linaro.org, patches@linaro.org > Subject: [PATCH] [media] s5p-mfc: Remove unreachable code > > > Code after return statement never gets executed. > Hence can be deleted. > > Signed-off-by: Sachin Kamat > --- > drivers/media/platform/s5p-mfc/s5p_mfc.c | 21 +-------------------- > 1 files changed, 1 insertions(+), 20 deletions(-) > > diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c > index e3e616d..56876be 100644 > --- a/drivers/media/platform/s5p-mfc/s5p_mfc.c > +++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c > @@ -1144,30 +1144,11 @@ static int s5p_mfc_suspend(struct device *dev) > { > struct platform_device *pdev = to_platform_device(dev); > struct s5p_mfc_dev *m_dev = platform_get_drvdata(pdev); > - int ret; > > if (m_dev->num_inst == 0) > return 0; > - return s5p_mfc_sleep(m_dev); > - if (test_and_set_bit(0, &m_dev->enter_suspend) != 0) { > - mfc_err("Error: going to suspend for a second time\n"); > - return -EIO; > - } > > - /* Check if we're processing then wait if it necessary. */ > - while (test_and_set_bit(0, &m_dev->hw_lock) != 0) { > - /* Try and lock the HW */ > - /* Wait on the interrupt waitqueue */ > - ret = wait_event_interruptible_timeout(m_dev->queue, > - m_dev->int_cond || m_dev->ctx[m_dev->curr_ctx]->int_cond, > - msecs_to_jiffies(MFC_INT_TIMEOUT)); > - > - if (ret == 0) { > - mfc_err("Waiting for hardware to finish timed out\n"); > - return -EIO; > - } > - } > - return 0; > + return s5p_mfc_sleep(m_dev); > } > > static int s5p_mfc_resume(struct device *dev) -- Thanks, Sylwester