From patchwork Sat Jul 12 11:49:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bastian Hecht X-Patchwork-Id: 4539241 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8BAC69F333 for ; Sat, 12 Jul 2014 11:49:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B1778201F7 for ; Sat, 12 Jul 2014 11:49:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D11BC201FE for ; Sat, 12 Jul 2014 11:49:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752310AbaGLLtn (ORCPT ); Sat, 12 Jul 2014 07:49:43 -0400 Received: from mail-we0-f169.google.com ([74.125.82.169]:53673 "EHLO mail-we0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751720AbaGLLtm (ORCPT ); Sat, 12 Jul 2014 07:49:42 -0400 Received: by mail-we0-f169.google.com with SMTP id t60so2183245wes.0 for ; Sat, 12 Jul 2014 04:49:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=GoOUFbpJ2T1Mh4oZN4NCv0gHeUGEZQP4Aei2S9eNZpc=; b=shb+y5psc376xkER8aXZIQ1W+fslqPWCHCqbs+u30fqR3PO5zgcXJezI07izt1hy1Z Q0aupmetkYQBUSUxlT4cMejmMUrLfK0PkQucvDzo7iI16rkMEBLWSuQF83lgmJY/TG6a /utp97e3SaVRyZFnOQiH4BpHPCM6PnmooRFrswifFthCE3KMwneSctjPRfsnAzQU19Fk nrR8k6ur2oe53N0KeIefnHrcvn2BeUfUlKviDxx3JLeAHSmYXG/NKfuk3SudiMioMvGn QxlQPcBzkyk2STqdc/M+lBfi0voqJfRWvGwIY+j36DTeZEi9Bi89IV3WaTViX9a3mPFM Diyg== X-Received: by 10.194.92.244 with SMTP id cp20mr6236142wjb.109.1405165781261; Sat, 12 Jul 2014 04:49:41 -0700 (PDT) Received: from ipanema.Speedport_W723_V_Typ_A_1_01_001 (p4FD2114D.dip0.t-ipconnect.de. [79.210.17.77]) by mx.google.com with ESMTPSA id ey16sm5962198wid.14.2014.07.12.04.49.39 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 12 Jul 2014 04:49:40 -0700 (PDT) From: Bastian Hecht To: linux-i2c@vger.kernel.org, Wolfram Sang Cc: Linux-SH , Tomoya MORINAGA , Naveen Krishna Chatradhi , Taekgyun Ko , Ben Dooks , Magnus Damm Subject: [PATCH 2/5] i2c: eg20t: Remove suspension check Date: Sat, 12 Jul 2014 13:49:28 +0200 Message-Id: <1405165771-8732-2-git-send-email-hechtb@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1405165771-8732-1-git-send-email-hechtb@gmail.com> References: <1405165771-8732-1-git-send-email-hechtb@gmail.com> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We now take care of suspension in the i2c core code. So we can remove this check here. Signed-off-by: Bastian Hecht --- drivers/i2c/busses/i2c-eg20t.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/drivers/i2c/busses/i2c-eg20t.c b/drivers/i2c/busses/i2c-eg20t.c index a44ea13..aae0413 100644 --- a/drivers/i2c/busses/i2c-eg20t.c +++ b/drivers/i2c/busses/i2c-eg20t.c @@ -162,15 +162,12 @@ struct i2c_algo_pch_data { * struct adapter_info - This structure holds the adapter information for the PCH i2c controller * @pch_data: stores a list of i2c_algo_pch_data - * @pch_i2c_suspended: specifies whether the system is suspended or not - * perhaps with more lines and words. * @ch_num: specifies the number of i2c instance * * pch_data has as many elements as maximum I2C channels */ struct adapter_info { struct i2c_algo_pch_data pch_data[PCH_I2C_MAX_DEV]; - bool pch_i2c_suspended; int ch_num; }; @@ -677,13 +674,6 @@ static s32 pch_i2c_xfer(struct i2c_adapter *i2c_adap, if (ret) return ret; - if (adap->p_adapter_info->pch_i2c_suspended) { - mutex_unlock(&pch_mutex); - return -EBUSY; - } - - pch_dbg(adap, "adap->p_adapter_info->pch_i2c_suspended is %d\n", - adap->p_adapter_info->pch_i2c_suspended); /* transfer not completed */ adap->pch_i2c_xfer_in_progress = true; @@ -786,7 +776,6 @@ static int pch_i2c_probe(struct pci_dev *pdev, for (i = 0; i < adap_info->ch_num; i++) { pch_adap = &adap_info->pch_data[i].pch_adapter; - adap_info->pch_i2c_suspended = false; adap_info->pch_data[i].p_adapter_info = adap_info; @@ -862,8 +851,6 @@ static int pch_i2c_suspend(struct pci_dev *pdev, pm_message_t state) struct adapter_info *adap_info = pci_get_drvdata(pdev); void __iomem *p = adap_info->pch_data[0].pch_base_address; - adap_info->pch_i2c_suspended = true; - for (i = 0; i < adap_info->ch_num; i++) { while ((adap_info->pch_data[i].pch_i2c_xfer_in_progress)) { /* Wait until all channel transfers are completed */ @@ -912,8 +899,6 @@ static int pch_i2c_resume(struct pci_dev *pdev) for (i = 0; i < adap_info->ch_num; i++) pch_i2c_init(&adap_info->pch_data[i]); - adap_info->pch_i2c_suspended = false; - return 0; } #else