Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1599880

[patch 4/7] staging: speakup: move spk_stop_serial_interrupt into synth-specific release function

Show all headers | View raw

This moves call to spk_stop_serial_interrupt() function out of synth_release()
and into release() method of specific spk_synth instances. This is because
a TTY-based synth implementation wouldn't need spk_stop_serial_interrupt()
call. Moving it into each synth's release() method gives the decision of
calling  spk_stop_serial_interrupt() to that synth. TTY-based synths which
follow in this patchset simply wouldn't call it.

Signed-off-by: Okash Khawaja <okash.khawaja@gmail.com>

Reviewed-by: Samuel Thibault <samuel.thibault@ens-lyon.org>

Index: linux-4.10.1/drivers/staging/speakup/serialio.c
===================================================================
--- linux-4.10.1.orig/drivers/staging/speakup/serialio.c
+++ linux-4.10.1/drivers/staging/speakup/serialio.c
@@ -149,6 +149,7 @@
 	/* Free IRQ */
 	free_irq(serstate->irq, (void *)synth_readbuf_handler);
 }
+EXPORT_SYMBOL_GPL(spk_stop_serial_interrupt);
 
 int spk_wait_for_xmitr(struct spk_synth *in_synth)
 {
@@ -224,6 +225,7 @@
 
 void spk_serial_release(void)
 {
+	spk_stop_serial_interrupt();
 	if (speakup_info.port_tts == 0)
 		return;
 	synth_release_region(speakup_info.port_tts, 8);
Index: linux-4.10.1/drivers/staging/speakup/speakup_acntpc.c
===================================================================
--- linux-4.10.1.orig/drivers/staging/speakup/speakup_acntpc.c
+++ linux-4.10.1/drivers/staging/speakup/speakup_acntpc.c
@@ -304,6 +304,7 @@
 
 static void accent_release(void)
 {
+	spk_stop_serial_interrupt();
 	if (speakup_info.port_tts)
 		synth_release_region(speakup_info.port_tts-1, SYNTH_IO_EXTENT);
 	speakup_info.port_tts = 0;
Index: linux-4.10.1/drivers/staging/speakup/synth.c
===================================================================
--- linux-4.10.1.orig/drivers/staging/speakup/synth.c
+++ linux-4.10.1/drivers/staging/speakup/synth.c
@@ -462,7 +462,6 @@
 		sysfs_remove_group(speakup_kobj, &synth->attributes);
 	for (var = synth->vars; var->var_id != MAXVARS; var++)
 		speakup_unregister_var(var->var_id);
-	spk_stop_serial_interrupt();
 	synth->release();
 	synth = NULL;
 }
Index: linux-4.10.1/drivers/staging/speakup/speakup_decpc.c
===================================================================
--- linux-4.10.1.orig/drivers/staging/speakup/speakup_decpc.c
+++ linux-4.10.1/drivers/staging/speakup/speakup_decpc.c
@@ -483,6 +483,7 @@
 
 static void dtpc_release(void)
 {
+	spk_stop_serial_interrupt();
 	if (speakup_info.port_tts)
 		synth_release_region(speakup_info.port_tts, SYNTH_IO_EXTENT);
 	speakup_info.port_tts = 0;
Index: linux-4.10.1/drivers/staging/speakup/speakup_dtlk.c
===================================================================
--- linux-4.10.1.orig/drivers/staging/speakup/speakup_dtlk.c
+++ linux-4.10.1/drivers/staging/speakup/speakup_dtlk.c
@@ -375,6 +375,7 @@
 
 static void dtlk_release(void)
 {
+	spk_stop_serial_interrupt();
 	if (speakup_info.port_tts)
 		synth_release_region(speakup_info.port_tts-1, SYNTH_IO_EXTENT);
 	speakup_info.port_tts = 0;
Index: linux-4.10.1/drivers/staging/speakup/speakup_keypc.c
===================================================================
--- linux-4.10.1.orig/drivers/staging/speakup/speakup_keypc.c
+++ linux-4.10.1/drivers/staging/speakup/speakup_keypc.c
@@ -306,6 +306,7 @@
 
 static void keynote_release(void)
 {
+	spk_stop_serial_interrupt();
 	if (synth_port)
 		synth_release_region(synth_port, SYNTH_IO_EXTENT);
 	synth_port = 0;

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[patch 0/7] staging: speakup: introduce tty-based comms okash.khawaja@gmail.com - 2017-03-13 23:10 +0100
  Re: [patch 0/7] staging: speakup: introduce tty-based comms Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-03-13 23:20 +0100
    Re: [patch 0/7] staging: speakup: introduce tty-based comms Samuel Thibault <samuel.thibault@ens-lyon.org> - 2017-03-13 23:30 +0100
      Re: [patch 0/7] staging: speakup: introduce tty-based comms Samuel Thibault <samuel.thibault@ens-lyon.org> - 2017-03-14 00:50 +0100
      Re: [patch 0/7] staging: speakup: introduce tty-based comms Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-03-14 00:50 +0100
      Re: [patch 0/7] staging: speakup: introduce tty-based comms Samuel Thibault <samuel.thibault@ens-lyon.org> - 2017-03-14 01:10 +0100
    Re: [patch 0/7] staging: speakup: introduce tty-based comms Samuel Thibault <samuel.thibault@ens-lyon.org> - 2017-03-14 01:50 +0100
      Re: [patch 0/7] staging: speakup: introduce tty-based comms Samuel Thibault <samuel.thibault@ens-lyon.org> - 2017-03-14 02:20 +0100
        Re: [patch 0/7] staging: speakup: introduce tty-based comms Rob Herring <robh@kernel.org> - 2017-03-15 15:50 +0100
          Re: [patch 0/7] staging: speakup: introduce tty-based comms Samuel Thibault <samuel.thibault@ens-lyon.org> - 2017-03-15 16:10 +0100
            Re: [patch 0/7] staging: speakup: introduce tty-based comms Samuel Thibault <samuel.thibault@ens-lyon.org> - 2017-03-22 01:10 +0100
      Re: [patch 0/7] staging: speakup: introduce tty-based comms Samuel Thibault <samuel.thibault@ens-lyon.org> - 2017-03-16 10:30 +0100
  Re: [patch 1/7] tty_port: allow a port to be opened with a tty that  has no file handle Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-03-13 23:20 +0100
    Re: [patch 1/7] tty_port: allow a port to be opened with a tty that  has no file handle Okash Khawaja <okash.khawaja@gmail.com> - 2017-03-13 23:40 +0100
  [patch 6/7] staging: speakup: add tty-based comms functions okash.khawaja@gmail.com - 2017-03-13 23:20 +0100
  [patch 3/7] staging: serial: add spk_io_ops struct to spk_synth okash.khawaja@gmail.com - 2017-03-13 23:20 +0100
  [patch 4/7] staging: speakup: move spk_stop_serial_interrupt into synth-specific release function okash.khawaja@gmail.com - 2017-03-13 23:20 +0100
  [patch 7/7] staging: speakup: migrate acntsa, bns, dummy and txprt to ttyio okash.khawaja@gmail.com - 2017-03-13 23:20 +0100
  [patch 2/7] staging: speakup: spk_serial_out and spk_wait_for_xmitr to take synth arg okash.khawaja@gmail.com - 2017-03-13 23:20 +0100
  [patch 1/7] tty_port: allow a port to be opened with a tty that has no file handle okash.khawaja@gmail.com - 2017-03-13 23:20 +0100
    Re: [patch 1/7] tty_port: allow a port to be opened with a tty that  has no file handle Dan Carpenter <dan.carpenter@oracle.com> - 2017-03-14 10:20 +0100
  [patch 5/7] staging: speakup: move those functions which do outgoing serial comms, into serialio.c okash.khawaja@gmail.com - 2017-03-13 23:20 +0100
  Re: [patch 0/7] staging: speakup: introduce tty-based comms Samuel Thibault <samuel.thibault@ens-lyon.org> - 2017-03-14 01:30 +0100

csiph-web