diff mbox series

[RFC,02/12] core/console: Remove the read/poll_read con_ops

Message ID 20200519054633.113238-3-oohall@gmail.com
State RFC
Headers show
Series [RFC,01/12] platform/mambo: Add a mambo OPAL console driver | expand

Checks

Context Check Description
snowpatch_ozlabs/snowpatch_job_snowpatch-skiboot-dco success Signed-off-by present
snowpatch_ozlabs/snowpatch_job_snowpatch-skiboot success Test snowpatch/job/snowpatch-skiboot on branch master
snowpatch_ozlabs/apply_patch success Successfully applied on branch master (0f1937ef40fca0c3212a9dff1010b832a24fb063)

Commit Message

Oliver O'Halloran May 19, 2020, 5:46 a.m. UTC
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 <oohall@gmail.com>
---
 core/console.c    | 4 ----
 include/console.h | 2 --
 2 files changed, 6 deletions(-)
diff mbox series

Patch

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 {