From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by befuddled.reisers.ca (Postfix, from userid 65534) id B9F601F08DF; Sat, 25 Feb 2017 14:25:30 -0500 (EST) Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by befuddled.reisers.ca (Postfix) with ESMTPS id 4AD121F07B1 for ; Sat, 25 Feb 2017 14:25:29 -0500 (EST) Received: by mail-wm0-x244.google.com with SMTP id u63so7672204wmu.2 for ; Sat, 25 Feb 2017 11:25:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :in-reply-to:user-agent; bh=SQnMn8npc2HGWCQPxSG6BQ6mOVTb4XlC4g/nj87Kwnw=; b=VkbpIfYia55Cf3fRhZsRPCqDEY0dKQChMXy40PcFNwZWGtEbFGDuxvIon2GoeE9goh J6I+0oAdVu+EfxZwGdgwNDKr5bz5CLgBTMsaNJ1oQo6f4gdbc6BP+09iL/q0GxcssTg9 iSQpNcplyD80nc4UP/ak61TxV0ajx06vxZnswtqAdSgfzcI5N2/dsq838t1sBoXrJJXF zZJv5D5q/zM6xfqZDccf0mjKofK/nrwXTG3tCK1DVcyWzecSsswmbAJqr4RS5+97UdYH H2VTBMMzLL6tPYteK4fZKzKpzBtLAWtQbvHbK3IZCBTlMsRL2mMUjM0frIEH/8DtB0By u4Hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:in-reply-to:user-agent; bh=SQnMn8npc2HGWCQPxSG6BQ6mOVTb4XlC4g/nj87Kwnw=; b=GB+OYxcHzrx2J8vF1JUOp9m76an8rwvQ4rBHJGQQyyedRJStRBfgYVJgWU/baQvW92 556jRvjGTAVU3QRrH19w5K3SEuv4QlTcOLd7gk8WVsHEdtjwMKJ9YG4xEulOI2lwjs4c Z+F4UAp4SUBOloif/yCfRToQjzBWi4HN5FeIo43F/1ge5z4l0F0Ea78lvP6pXnwCXL+p I54H97DVP6V7Npf7bBljY0pyTpyybAGF+0JsloSlpSPvnwa8xc7VqdjYfu6ZcdHMzVLY ny+hUx1lq62T3YzChv/W6J7ech1l5QJgotc3g3G+zRu2D0hg1q1pydkov5n/Q2jxRFXL 5GfA== X-Gm-Message-State: AMke39kSVpQv1ZdQ6m9V1g3ypLYmGcX6oXmxHc7+89lKy+mBbcqurlVp2hVAdF3/btTFsw== X-Received: by 10.28.62.144 with SMTP id l138mr7538489wma.50.1488050728094; Sat, 25 Feb 2017 11:25:28 -0800 (PST) Received: from sanghar (cpc91372-watf11-2-0-cust614.15-2.cable.virginm.net. [86.14.2.103]) by smtp.gmail.com with ESMTPSA id o70sm7400868wmi.26.2017.02.25.11.25.27 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 25 Feb 2017 11:25:27 -0800 (PST) Date: Sat, 25 Feb 2017 19:25:26 +0000 From: Okash Khawaja To: samuel.thibault@ens-lyon.org Cc: speakup@linux-speakup.org Subject: [patch 3/6] staging: speakup: refactor spk_stop_serial_interrupt Message-ID: <20170225192526.GA4507@sanghar> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170225192358.GA4499@sanghar> User-Agent: Mutt/1.7.2 (2016-11-26) 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: Sat, 25 Feb 2017 19:25:30 -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 woudn't call it. Signed-off-by: Okash Khawaja Index: linux-stable/drivers/staging/speakup/serialio.c =================================================================== --- linux-stable.orig/drivers/staging/speakup/serialio.c +++ linux-stable/drivers/staging/speakup/serialio.c @@ -219,6 +219,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-stable/drivers/staging/speakup/speakup_acntpc.c =================================================================== --- linux-stable.orig/drivers/staging/speakup/speakup_acntpc.c +++ linux-stable/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-stable/drivers/staging/speakup/speakup_decpc.c =================================================================== --- linux-stable.orig/drivers/staging/speakup/speakup_decpc.c +++ linux-stable/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-stable/drivers/staging/speakup/speakup_dtlk.c =================================================================== --- linux-stable.orig/drivers/staging/speakup/speakup_dtlk.c +++ linux-stable/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-stable/drivers/staging/speakup/speakup_keypc.c =================================================================== --- linux-stable.orig/drivers/staging/speakup/speakup_keypc.c +++ linux-stable/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; Index: linux-stable/drivers/staging/speakup/synth.c =================================================================== --- linux-stable.orig/drivers/staging/speakup/synth.c +++ linux-stable/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; }