From patchwork Tue Oct 15 07:20:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 21015 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f197.google.com (mail-ob0-f197.google.com [209.85.214.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 246BE20D84 for ; Tue, 15 Oct 2013 07:20:33 +0000 (UTC) Received: by mail-ob0-f197.google.com with SMTP id uy5sf30567445obc.8 for ; Tue, 15 Oct 2013 00:20:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=mime-version:x-gm-message-state:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=1cQZVBvVqbVUG2DtFrRp1EDGCu8tHTz+0nEt5E+venY=; b=K0nP8PTghKKhDj5AUSYYlHqoVjKTjldJCtiOcahg1p2GblVEF7jxeJ7jt81sIK8XLJ YkIyTQytVZRc512idNQ6oTPrrI2J+4vvaZVpDLF7aW5ZvbradCdEAgIxFv2hvIGZLyvl U9NSBOptAzsxXyArgx2y9+BA/OQkl0WTPdE4eB1KrD1D3fv3gzJxMtuTIQuKNKKuHQXH xzQ6nThfoloKR/MomPoud0rCO3o6y909F09orOCgiuMXxLIJcCTr2oTKQc4DKqLGmuP8 7vMxHDFj+K/Jcf+8qGfjR0RVB78xPBjUToD2r/7QI5o4eTtrJVINNXSD7VjTbk28xGrf +HYw== X-Received: by 10.182.61.109 with SMTP id o13mr13037315obr.6.1381821632515; Tue, 15 Oct 2013 00:20:32 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.17.7 with SMTP id k7ls9120qed.96.gmail; Tue, 15 Oct 2013 00:20:32 -0700 (PDT) X-Received: by 10.58.233.98 with SMTP id tv2mr10883636vec.11.1381821632377; Tue, 15 Oct 2013 00:20:32 -0700 (PDT) Received: from mail-ve0-f169.google.com (mail-ve0-f169.google.com [209.85.128.169]) by mx.google.com with ESMTPS id de6si22281818vcb.34.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 15 Oct 2013 00:20:32 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.169 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.169; Received: by mail-ve0-f169.google.com with SMTP id oy12so467722veb.14 for ; Tue, 15 Oct 2013 00:20:32 -0700 (PDT) X-Gm-Message-State: ALoCoQl30ANgidqfYJLI9mr4J4NIpeDj8tEcb8q96KxgZ8hhKUEU7I1UxH6EriWiqZYbERXaxUwY X-Received: by 10.220.92.8 with SMTP id p8mr288736vcm.20.1381821632236; Tue, 15 Oct 2013 00:20:32 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp278305vcz; Tue, 15 Oct 2013 00:20:31 -0700 (PDT) X-Received: by 10.180.73.134 with SMTP id l6mr17986571wiv.16.1381821631352; Tue, 15 Oct 2013 00:20:31 -0700 (PDT) Received: from mail-wg0-f45.google.com (mail-wg0-f45.google.com [74.125.82.45]) by mx.google.com with ESMTPS id jb13si508915wic.65.2013.10.15.00.20.31 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 15 Oct 2013 00:20:31 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.45 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=74.125.82.45; Received: by mail-wg0-f45.google.com with SMTP id z12so6231968wgg.0 for ; Tue, 15 Oct 2013 00:20:31 -0700 (PDT) X-Received: by 10.180.109.33 with SMTP id hp1mr11669166wib.45.1381821630935; Tue, 15 Oct 2013 00:20:30 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id q17sm3258918wiv.10.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 15 Oct 2013 00:20:30 -0700 (PDT) From: Linus Walleij To: linux-serial@vger.kernel.org, Greg Kroah-Hartman Cc: Linus Walleij , Russell King Subject: [PATCH 2/5] serial: sa1100: delete .set_wake callback Date: Tue, 15 Oct 2013 09:20:26 +0200 Message-Id: <1381821626-19441-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.8.3.1 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.169 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This callback is unused by the serial core since pre-git days and is not coming back. Delete it. Enabling wakeup on the SA1100 platforms should be done in the suspend() callback so the platform hook is left in the serial port struct for later enablement. Cc: Russell King Signed-off-by: Linus Walleij --- drivers/tty/serial/sa1100.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/tty/serial/sa1100.c b/drivers/tty/serial/sa1100.c index ba25722..753d452 100644 --- a/drivers/tty/serial/sa1100.c +++ b/drivers/tty/serial/sa1100.c @@ -647,7 +647,10 @@ void sa1100_register_uart_fns(struct sa1100_port_fns *fns) sa1100_pops.set_mctrl = fns->set_mctrl; sa1100_pops.pm = fns->pm; - sa1100_pops.set_wake = fns->set_wake; + /* + * FIXME: fns->set_wake is unused - this should be called from + * the suspend() callback if device_may_wakeup(dev)) is set. + */ } void __init sa1100_register_uart(int idx, int port)