From patchwork Tue Oct 15 07:20:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 21018 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f71.google.com (mail-yh0-f71.google.com [209.85.213.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id CBA2C20D84 for ; Tue, 15 Oct 2013 07:20:59 +0000 (UTC) Received: by mail-yh0-f71.google.com with SMTP id f64sf9570483yha.10 for ; Tue, 15 Oct 2013 00:20:59 -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=GF5a4AhJ4O1f4EGaovbvCBN382RHVJRFOnHf0rFKFxI=; b=aW8ES4AVAQe+cWJIGXgcO6BT+XO2hKWrguADBAU+X2zd2tKy1JwzkqjHvoFdOJyvJo Tn62HS2NAaMJPNTMYaD5dsoSEwzNVMNUjMFt7+1awZxvfRPC9GWD6r73VcPdJgUlJ6bz Pweo6f14MvNOMlfAYSV5yWcR5ejOLlClzrpLV8soty/AM55L23yzunnkqtY7NuiUs8v0 5rGAbe14cN6qErQMBai5yLe8Uw83fMBVYk+0/O705blk/Yqyn9XyJntdqeDtjgvaL91+ q8+P3fTswKDVcF8/oOvI8n+GlzQvMANaFoya646XhclZNb8w6Uz1v6xiQEwOtsiieDRS qqSA== X-Received: by 10.236.36.39 with SMTP id v27mr34140870yha.5.1381821659651; Tue, 15 Oct 2013 00:20:59 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.0.116 with SMTP id 20ls26269qed.34.gmail; Tue, 15 Oct 2013 00:20:59 -0700 (PDT) X-Received: by 10.52.118.73 with SMTP id kk9mr32167231vdb.13.1381821659553; Tue, 15 Oct 2013 00:20:59 -0700 (PDT) Received: from mail-vc0-f182.google.com (mail-vc0-f182.google.com [209.85.220.182]) by mx.google.com with ESMTPS id fx4si22258813vdc.39.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 15 Oct 2013 00:20:59 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.182 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.182; Received: by mail-vc0-f182.google.com with SMTP id im17so5135919vcb.13 for ; Tue, 15 Oct 2013 00:20:59 -0700 (PDT) X-Gm-Message-State: ALoCoQk+d6uzp2+P4APrCLj6gzqiNJBkTxKa0Am3lPRoCztTazmfqacdzC6bnnQc61gj+EWjSBzv X-Received: by 10.58.255.233 with SMTP id at9mr294312ved.20.1381821659473; Tue, 15 Oct 2013 00:20:59 -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 u4csp278332vcz; Tue, 15 Oct 2013 00:20:58 -0700 (PDT) X-Received: by 10.180.100.202 with SMTP id fa10mr17803053wib.8.1381821658415; Tue, 15 Oct 2013 00:20:58 -0700 (PDT) Received: from mail-we0-f173.google.com (mail-we0-f173.google.com [74.125.82.173]) by mx.google.com with ESMTPS id ao10si10486374wjc.18.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 15 Oct 2013 00:20:58 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.173 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=74.125.82.173; Received: by mail-we0-f173.google.com with SMTP id u57so7958554wes.4 for ; Tue, 15 Oct 2013 00:20:58 -0700 (PDT) X-Received: by 10.194.95.72 with SMTP id di8mr56934wjb.74.1381821658000; Tue, 15 Oct 2013 00:20:58 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id ma3sm3319577wic.1.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 15 Oct 2013 00:20:57 -0700 (PDT) From: Linus Walleij To: linux-serial@vger.kernel.org, Greg Kroah-Hartman Cc: Linus Walleij , "Rafael J. Wysocki" , Len Brown , Pavel Machek , Kevin Hilman , Dmitry Artamonow Subject: [PATCH 5/5] serial: core: delete .set_wake() callback Date: Tue, 15 Oct 2013 09:20:52 +0200 Message-Id: <1381821652-19569-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.220.182 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 deletes the .set_wake() callback in the struct uart_ops. Apparently this has been unused since pre-git times. In the old-2.6-bkcvs it is deleted as part of a changeset removing the PM_SET_WAKEUP from pm_request_t which is since also deleted from the kernel. The apropriate way to set wakeups in the kernel is to have a code snippet like this in .suspend() or .runtime_suspend() callbacks: static int foo_suspend(struct device *dev) { if (device_may_wakeup(dev)) { /* Enable wakeups, set internal states */ } } This specific callback is not coming back. Cc: Rafael J. Wysocki Cc: Len Brown Cc: Pavel Machek Cc: Kevin Hilman Cc: Dmitry Artamonow Signed-off-by: Linus Walleij --- Documentation/serial/driver | 4 ---- include/linux/serial_core.h | 1 - 2 files changed, 5 deletions(-) diff --git a/Documentation/serial/driver b/Documentation/serial/driver index 067c47d..c3a7689 100644 --- a/Documentation/serial/driver +++ b/Documentation/serial/driver @@ -264,10 +264,6 @@ hardware. Locking: none. Interrupts: caller dependent. - set_wake(port,state) - Enable/disable power management wakeup on serial activity. Not - currently implemented. - type(port) Return a pointer to a string constant describing the specified port, or return NULL, in which case the string 'unknown' is diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index b98291a..f729be9 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h @@ -66,7 +66,6 @@ struct uart_ops { void (*set_ldisc)(struct uart_port *, int new); void (*pm)(struct uart_port *, unsigned int state, unsigned int oldstate); - int (*set_wake)(struct uart_port *, unsigned int state); /* * Return a string describing the type of the port