From patchwork Tue May 19 05:46:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver O'Halloran X-Patchwork-Id: 1292948 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49R4gN0znbz9sTc for ; Tue, 19 May 2020 15:48:32 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=i65JDhaG; dkim-atps=neutral Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 49R4gM5jB7zDqWq for ; Tue, 19 May 2020 15:48:31 +1000 (AEST) X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::642; helo=mail-pl1-x642.google.com; envelope-from=oohall@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=i65JDhaG; dkim-atps=neutral Received: from mail-pl1-x642.google.com (mail-pl1-x642.google.com [IPv6:2607:f8b0:4864:20::642]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 49R4dn2B17zDqfv for ; Tue, 19 May 2020 15:47:09 +1000 (AEST) Received: by mail-pl1-x642.google.com with SMTP id f15so5168480plr.3 for ; Mon, 18 May 2020 22:47:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bQSrRudTnQRYdfooVA5oIptrT3A1XhDFiaWsPondvzA=; b=i65JDhaGkaioY9IUwd7m5PbxFtLHHQV7ok8BDNIlkMmKRBNk2bjy4H/gdI3S0C75Tx ivCc9QTng+zUXhB+YfF5F8Q3OYbwQEoDxltqTJCIz1n/S2Lvsj688p6B49UYsH0kAcrX VOYVfTe0aS0Qn3zkAzmTLPKXKQSm5xQiAe9ry0Z72VqFF8asXyU9quOcj099Nof9Px7c GaQdcGmtZp//3g1DGkKib8aAS8T8QanpnEN0d9TKzDYpbNYqNC2zPeTBAFnc1cJ6wiTP KgkgLyhFJHfE19xZqNwxoC9RzJXplm/WoXVqSzAyeh7O+e+7x1EaQeUnUUvrjGadsERP XvYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bQSrRudTnQRYdfooVA5oIptrT3A1XhDFiaWsPondvzA=; b=OIRAz+XYnFpbomnFrenEpCWX/9XZA4ygqmpvk8QcSt/TXb787DHHCWySPb8wenXrko SAQUJomzGtzpEPFou7lIOiDCv1dSm4DvtsjEM7aGkm1WvxZX95fc2opHB8hcQiHA2AzY dNps8qkMZDie/OYWFXvxQOujST6chhzsH9ujDscPosm5tM0NyyTH88d3x6SptWALt9ix ad2XsvoWki4vAJcpKNnts51ijNCefb37hJnJSoJ8rKz7q2iOEyY/2feDvGWnpWUc9Pkf VpysiqwYnkFrjAXxizZkcNOm8+GgQt4rNl/LITewinLxCkYLTuEs0deA5v4UCeAYxZnM TWGQ== X-Gm-Message-State: AOAM533I52NUnRx4hUKRGQSfzEEQEaKHPCioMIB9ODgzb4lkTiYaJUPg na4mGbaWKGKTAygTjfEGzWXysIjn X-Google-Smtp-Source: ABdhPJxTN5s+O2R72Qjr5H4xMmHwQ0hJUeyrCSiKBa5naqSYN+Q5QyRjxPquez/eb/1EZoog7BqTnA== X-Received: by 2002:a17:90a:344c:: with SMTP id o70mr3404838pjb.23.1589867226268; Mon, 18 May 2020 22:47:06 -0700 (PDT) Received: from 192-168-1-12.tpgi.com.au ([203.221.252.191]) by smtp.gmail.com with ESMTPSA id p12sm2798358pgj.22.2020.05.18.22.47.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 May 2020 22:47:05 -0700 (PDT) From: Oliver O'Halloran To: skiboot@lists.ozlabs.org Date: Tue, 19 May 2020 15:46:23 +1000 Message-Id: <20200519054633.113238-3-oohall@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200519054633.113238-1-oohall@gmail.com> References: <20200519054633.113238-1-oohall@gmail.com> MIME-Version: 1.0 Subject: [Skiboot] [RFC PATCH 02/12] core/console: Remove the read/poll_read con_ops X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" These were only ever used for the dummy console backed by the mambo console. Now that we have an actual OPAL console driver for mambo we don't need them. Signed-off-by: Oliver O'Halloran --- core/console.c | 4 ---- include/console.h | 2 -- 2 files changed, 6 deletions(-) diff --git a/core/console.c b/core/console.c index 2a1509025b56..42328dbe2d2e 100644 --- a/core/console.c +++ b/core/console.c @@ -260,8 +260,6 @@ ssize_t read(int fd __unused, void *buf, size_t req_count) bool need_unlock = lock_recursive(&con_lock); size_t count = 0; - if (con_driver && con_driver->read) - count = con_driver->read(buf, req_count); if (!count) count = inmem_read(buf, req_count); if (need_unlock) @@ -412,8 +410,6 @@ static void dummy_console_poll(void *data __unused) bool has_data = false; lock(&con_lock); - if (con_driver && con_driver->poll_read) - has_data = con_driver->poll_read(); if (memcons.in_prod != memcons.in_cons) has_data = true; if (has_data) diff --git a/include/console.h b/include/console.h index c14a2e598191..6abd04b77d78 100644 --- a/include/console.h +++ b/include/console.h @@ -35,8 +35,6 @@ extern struct memcons memcons; /* Console driver */ struct con_ops { size_t (*write)(const char *buf, size_t len); - size_t (*read)(char *buf, size_t len); - bool (*poll_read)(void); }; struct opal_con_ops {