From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by befuddled.reisers.ca (Postfix, from userid 65534) id BA1E41EFD44; Sat, 19 Nov 2016 13:45:56 -0500 (EST) Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by befuddled.reisers.ca (Postfix) with ESMTPS id 2BF4E1EF729 for ; Sat, 19 Nov 2016 13:45:55 -0500 (EST) Received: by mail-wm0-x241.google.com with SMTP id g23so15082426wme.1 for ; Sat, 19 Nov 2016 10:45:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :in-reply-to:user-agent; bh=peraaE52I+2A2pivpyo3cpkab9z7PPHCFduoPXvpeoI=; b=gPac0DQ6zl6pNBAUEoSqXfwEfj3C1rvNh/bx7UiUIfl/ZzxEyoRhfuAx0c/BBeeMEa DV9y8YgbQgDolRr84SbFJcZym3KNKkBM6F8lJz92y7H3ubCKUEPsU+Iyw/BZ4efONFZJ k0FmGwx9os3quRBOLtnP1uQ14rdfdVJWdEFuw99VpeWSA96LF58iz9hCw9XfLDzolj50 5XiPCwv1qOTjTpL72p7uo/vGCD0/X6xle/QP5QCJ0bUTEJ3EvnsuRc+KBM4yqFS/Efet pSV+M7LRgECumFrYoz7NgCoY099iBapg3eqMGfNv95AZ60DxSf7EwPMtGl3RsnBrmawK IGTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:in-reply-to:user-agent; bh=peraaE52I+2A2pivpyo3cpkab9z7PPHCFduoPXvpeoI=; b=dOKOVWM2rkf7WILZ06L2R8Kb4q9uw5Ve8QibU77UJ6r85nrfIqLrsI4sX7aiFTtPok qfEK54pcsW4JxDNUOLi7C7batIaRiXBo4DSeNEafgGucnUa/x/6HN8rrYrjjCayQGAXc V7rKmrFfDHIyUAvpXc/VGif7zYiNc0z/YE202op1ha7KuLJaEqg4Ziy54gBVgomWegev YGUnbmbcWC6MSURF7PCnOKXJf6yIhvwtmhsEL5HKfzxGe6cHtbdgUqQn+uBrkjA0bHxz riyeQ/F+JzKM9PFfca+w9sf/LQMPc1fUzP59MK13HDGslJohW2/yKV5sLXNN5HQRGUw3 HeTQ== X-Gm-Message-State: AKaTC02jWcucSmbcFNHP7U1Qdafvw/oeGOIC0qkg/y8GdA+0Lh3aY86xYmZaYQgkyImYVg== X-Received: by 10.194.186.177 with SMTP id fl17mr3504884wjc.143.1479581154140; Sat, 19 Nov 2016 10:45:54 -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 h2sm15480541wjy.40.2016.11.19.10.45.53 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 19 Nov 2016 10:45:53 -0800 (PST) Date: Sat, 19 Nov 2016 18:45:52 +0000 From: Okash Khawaja To: kirk@reisers.ca, samuel.thibault@ens-lyon.org, david.a.borowski@gmail.com, chris@the-brannons.com, w.d.hubbs@gmail.com, gregkh@linuxfoundation.org Cc: speakup@linux-speakup.org, devel@driverdev.osuosl.org Subject: [PATCH v2 4/4] staging: speakup: replace spk_serial_out() calls with serial_out() Message-ID: <20161119184552.GA2103@sanghar> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20161119184158.GA2095@sanghar> User-Agent: Mutt/1.7.1 (2016-10-04) 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, 19 Nov 2016 18:45:56 -0000 This replaces calls to spk_serial_out() in spk_do_catch_up() and spk_synth_flush() with calls to serial_out(). spk_do_catch_up() and spk_synth_flush() are the only functions through which speakup_dummy calls into spk_serial_out(). Calls to spk_serial_out() in other drivers can stay for now. Signed-off-by: Okash Khawaja --- drivers/staging/speakup/synth.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/speakup/synth.c b/drivers/staging/speakup/synth.c index 4f462c3..cef6591 100644 --- a/drivers/staging/speakup/synth.c +++ b/drivers/staging/speakup/synth.c @@ -118,7 +118,7 @@ void spk_do_catch_up(struct spk_synth *synth) spin_unlock_irqrestore(&speakup_info.spinlock, flags); if (ch == '\n') ch = synth->procspeech; - if (!spk_serial_out(ch)) { + if (!synth->serial_out(ch)) { schedule_timeout(msecs_to_jiffies(full_time_val)); continue; } @@ -128,7 +128,7 @@ void spk_do_catch_up(struct spk_synth *synth) delay_time_val = delay_time->u.n.value; full_time_val = full_time->u.n.value; spin_unlock_irqrestore(&speakup_info.spinlock, flags); - if (spk_serial_out(synth->procspeech)) + if (synth->serial_out(synth->procspeech)) schedule_timeout( msecs_to_jiffies(delay_time_val)); else @@ -141,7 +141,7 @@ void spk_do_catch_up(struct spk_synth *synth) synth_buffer_getc(); spin_unlock_irqrestore(&speakup_info.spinlock, flags); } - spk_serial_out(synth->procspeech); + synth->serial_out(synth->procspeech); } EXPORT_SYMBOL_GPL(spk_do_catch_up); @@ -164,7 +164,7 @@ EXPORT_SYMBOL_GPL(spk_synth_immediate); void spk_synth_flush(struct spk_synth *synth) { - spk_serial_out(synth->clear); + synth->serial_out(synth->clear); } EXPORT_SYMBOL_GPL(spk_synth_flush); -- 2.10.2