From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by befuddled.reisers.ca (Postfix, from userid 65534) id 1AF4F1F04E8; Mon, 13 Mar 2017 18:09:51 -0400 (EDT) Received: from mail-wr0-x242.google.com (mail-wr0-x242.google.com [IPv6:2a00:1450:400c:c0c::242]) by befuddled.reisers.ca (Postfix) with ESMTPS id 2BC491F0404 for ; Mon, 13 Mar 2017 18:09:34 -0400 (EDT) Received: by mail-wr0-x242.google.com with SMTP id l37so21713590wrc.3 for ; Mon, 13 Mar 2017 15:09:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:user-agent:date:from:to:cc:subject:references :mime-version:content-disposition; bh=UDOisfXducPmknVI+NhKHlO2QNQ30YFrtdg6RHn1HJo=; b=HKbqYEEV/aEiZf9BUy+dl4w8yBh8byQkEK1E7TKAkFfnVRfLgqCzUhcInHdDWKpC8t mpoG0NlfRk23uMA9+l5IvjGG5PfaWWDE0KuJeEFgU+Kb+nY8vyiXJz0hhTqvhZS8ysLi 5Bx+sOQSeerAoCZ9jygWyeA+kSzDW/gov1FJeXdaya11W7ogGWu2Zr2r51VKTGGk4Pyf 3b30bEbghYyZ6MCCGdAtnHgx0ovRV2/XowfDBtmuIiV+AKIpGUbSXfBK4uStIIH1GfPB pVkKQbwcAwxOd4MBsZ+gAo1dMOEp+WV0WmSpxiOqpB271ykwGp9ztB+Izn9G9AJBhBFv iueQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:user-agent:date:from:to:cc:subject :references:mime-version:content-disposition; bh=UDOisfXducPmknVI+NhKHlO2QNQ30YFrtdg6RHn1HJo=; b=tnnWgOzRHE25rXPSMmgQY/tpYGYkGTJtYk6szzGsBReOY+y7xLjWCzeZYifzjaQD65 fbr9i0vhaLDU/fpwfxp7yuuZKSjnRsWsllcQ6/npR2Pc69jyr1GrnrfyaIgzjedwYEzI PJSD/TGnZ44ZppjeDZHxsSoFU4Fjb0KPdFX4utW89eF3lnpKE+Ch+45Mu8FQuluj3ULW CSF577lX3wzdsN4StB0jVhz7W9l4/hub0WDyRDOtm0s1yuk76m/mea/u7kPClWr6nRlF as/pNEcFlsPPuImA5S3x5ZeVbXn+/aBM0tr4T4coym61GDk5XIxs3tFtMy9jNX96CG2e mJ2A== X-Gm-Message-State: AMke39mgmIlSRYh5IHALOwlFYtjpLaGO4mjoJYQttJclWOKz+FKRjZl2fsbLcXNncvUlHA== X-Received: by 10.223.154.44 with SMTP id z41mr29377387wrb.188.1489442973220; Mon, 13 Mar 2017 15:09:33 -0700 (PDT) Received: from sanghar ([2a02:8011:4009:2:6e2f:2cff:fe3b:a5ff]) by smtp.gmail.com with ESMTPSA id q12sm12926417wmd.8.2017.03.13.15.09.32 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 13 Mar 2017 15:09:32 -0700 (PDT) Message-Id: <20170313220931.691981020@gmail.com> User-Agent: quilt/0.63-1 Date: Mon, 13 Mar 2017 22:05:55 +0000 From: okash.khawaja@gmail.com To: Greg Kroah-Hartman , Jiri Slaby , 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 4/7] staging: speakup: move spk_stop_serial_interrupt into synth-specific release function References: <20170313220551.312820470@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Disposition: inline; filename=04_refactor_spk_stop_serial_interrupt X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 X-BeenThere: speakup@linux-speakup.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Speakup is a screen review system for Linux." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Mar 2017 22:09:52 -0000 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 Reviewed-by: Samuel Thibault 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;