Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752760AbdCNNrA (ORCPT ); Tue, 14 Mar 2017 09:47:00 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:33891 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752540AbdCNNpZ (ORCPT ); Tue, 14 Mar 2017 09:45:25 -0400 Message-Id: <20170314134521.466524315@gmail.com> User-Agent: quilt/0.63-1 Date: Tue, 14 Mar 2017 13:41:54 +0000 From: Okash Khawaja To: Greg Kroah-Hartman , Samuel Thibault , linux-kernel@vger.kernel.org Cc: William Hubbs , Chris Brannon , Kirk Reiser , speakup@linux-speakup.org, devel@driverdev.osuosl.org, Okash Khawaja Subject: [patch 3/4] staging: speakup: move spk_stop_serial_interrupt into synth-specific release function References: <20170314134151.603195427@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Disposition: inline; filename=03_refactor_spk_stop_serial_interrupt Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3405 Lines: 90 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 the spk_stop_serial_interrupt() call is specific to current serial i/o implementation. Moving it into each synth's release() method gives the decision of calling spk_stop_serial_interrupt() to that synth. Signed-off-by: Okash Khawaja Reviewed-by: Samuel Thibault Index: linux-4.11-rc2/drivers/staging/speakup/serialio.c =================================================================== --- linux-4.11-rc2.orig/drivers/staging/speakup/serialio.c +++ linux-4.11-rc2/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.11-rc2/drivers/staging/speakup/speakup_acntpc.c =================================================================== --- linux-4.11-rc2.orig/drivers/staging/speakup/speakup_acntpc.c +++ linux-4.11-rc2/drivers/staging/speakup/speakup_acntpc.c @@ -303,6 +303,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.11-rc2/drivers/staging/speakup/synth.c =================================================================== --- linux-4.11-rc2.orig/drivers/staging/speakup/synth.c +++ linux-4.11-rc2/drivers/staging/speakup/synth.c @@ -432,7 +432,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.11-rc2/drivers/staging/speakup/speakup_decpc.c =================================================================== --- linux-4.11-rc2.orig/drivers/staging/speakup/speakup_decpc.c +++ linux-4.11-rc2/drivers/staging/speakup/speakup_decpc.c @@ -482,6 +482,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.11-rc2/drivers/staging/speakup/speakup_dtlk.c =================================================================== --- linux-4.11-rc2.orig/drivers/staging/speakup/speakup_dtlk.c +++ linux-4.11-rc2/drivers/staging/speakup/speakup_dtlk.c @@ -374,6 +374,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.11-rc2/drivers/staging/speakup/speakup_keypc.c =================================================================== --- linux-4.11-rc2.orig/drivers/staging/speakup/speakup_keypc.c +++ linux-4.11-rc2/drivers/staging/speakup/speakup_keypc.c @@ -305,6 +305,7 @@ static void keynote_release(void) { + spk_stop_serial_interrupt(); if (synth_port) synth_release_region(synth_port, SYNTH_IO_EXTENT); synth_port = 0;