summaryrefslogtreecommitdiffstats
path: root/drivers/staging/speakup
Commit message (Collapse)AuthorAgeFilesLines
* Staging: speakup: replacing simple_strtoul with kstrtoulAshvini Varatharaj2013-10-191-3/+5
| | | | | | | | | Fix checkpatch warning: WARNING: simple_strtoul is obsolete, use kstrtoul instead Signed-off-by: Ashvini Varatharaj <ashvinivaratharaj@gmail.com> Reviewed-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* Staging: speakup: removing jiffies comparison in speakup_apollo.cAshvini Varatharaj2013-10-191-1/+1
| | | | | | | | | Fix checkpatch warning: WARNING: Comparing jiffies is almost always wrong; prefer time_after, time_before and friends Signed-off-by: Ashvini Varatharaj <ashvinivaratharaj@gmail.com> Reviewed-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* Staging: speakup: removing jiffies comparison using time_after_eq()Ashvini Varatharaj2013-10-191-1/+1
| | | | | | | | | Fix checkpatch warning: Comparing jiffies is almost always wrong; prefer time_after, time_before and friends Signed-off-by: Ashvini Varatharaj <ashvinivaratharaj@gmail.com> Reviewed-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: speakup: remove unnecessary space before semicolonNandini Hanumanthagowda2013-10-141-3/+3
| | | | | | | | Removed unnecessary space before semicolon which was leading to checkpatch.pl warning. Signed-off-by: Nandini Hanumanthagowda <nandu.hgowda@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: speakup: str initialization replaced with NULL where it was ↵Shalin Mehta2013-10-033-3/+3
| | | | | | | | | initialized with int Fixed warnings in all of three files where the string was initilized with an integer instead of NULL Signed-off-by: Shalin Mehta <shalinmehta85@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: speakup: kobjects.c: Use correct values when changing voice.Christopher Brannon2013-09-171-1/+4
| | | | | | | | | | | | | When a new voice is selected, we set volume and pitch appropriate for the voice. We need to use the numeric index corresponding to the voice when indexing into the volume and pitch tables, rather than the raw user input that was used to select the voice. Note that using the raw input can also lead to an invalid memory read in the case of invalid or malicious user input. Signed-off-by: Christopher Brannon <chris@the-brannons.com> Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging/speakup/kobjects.c: Code improvement.Raphael S.Carvalho2013-09-171-31/+38
| | | | | | | | | | | | | | Well, there is no need to use strcmp since we can make a test of similar semantic by using the var_id field of param. I moved the test into the VAR_NUM:VAR_TIME case since VAR_STRING will never be "voice". spk_xlate isn't used anymore (in line 628), then there is no difference between using cp and buf in VAR_STRING case. Besides, buf is a const char and those changes remove one uneeded line. I created the function spk_reset_default_value because it clarifies the code and allows code reusing. Signed-off-by: Raphael S.Carvalho <raphael.scarv@gmail.com> Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* Staging: speakup: Add dependencies for ISA card driversBen Hutchings2013-09-171-0/+4
| | | | | | | | Several speakup drivers are for ISA cards and are useless on systems without ISA slots. Make them depend on ISA || COMPILE_TEST. Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: speakup: fix warnings by adding __user annotationsEmil Goode2013-05-222-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the following sparse warnings by adding __user annotations. drivers/staging/speakup/speakup_soft.c:248:34: warning: incorrect type in argument 1 (different address spaces) drivers/staging/speakup/speakup_soft.c:248:34: expected void [noderef] <asn:1>*dst drivers/staging/speakup/speakup_soft.c:248:34: got char *[assigned] cp drivers/staging/speakup/speakup_soft.c:272:40: warning: incorrect type in argument 1 (different address spaces) drivers/staging/speakup/speakup_soft.c:272:40: expected char const [noderef] <asn:1>*s drivers/staging/speakup/speakup_soft.c:272:40: got char const *buf drivers/staging/speakup/speakup_soft.c:306:17: warning: incorrect type in initializer (incompatible argument 2 (different address spaces)) drivers/staging/speakup/speakup_soft.c:306:17: expected long ( *read )( ... ) drivers/staging/speakup/speakup_soft.c:306:17: got long ( static [toplevel] *<noident> )( ... ) drivers/staging/speakup/speakup_soft.c:307:18: warning: incorrect type in initializer (incompatible argument 2 (different address spaces)) drivers/staging/speakup/speakup_soft.c:307:18: expected long ( *write )( ... ) drivers/staging/speakup/speakup_soft.c:307:18: got long ( static [toplevel] *<nfile_operationsoident> )( ... ) drivers/staging/speakup/devsynth.c:29:41: warning: incorrect type in argument 2 (different address spaces) drivers/staging/speakup/devsynth.c:29:41: expected void const [noderef] <asn:1>*from drivers/staging/speakup/devsynth.c:29:41: got char const *ptr drivers/staging/speakup/devsynth.c:62:17: warning: incorrect type in initializer (incompatible argument 2 (different address spaces)) drivers/staging/speakup/devsynth.c:62:17: expected long ( *read )( ... ) drivers/staging/speakup/devsynth.c:62:17: got long ( static [toplevel] *<noident> )( ... ) drivers/staging/speakup/devsynth.c:63:18: warning: incorrect type in initializer (incompatible argument 2 (different address spaces)) drivers/staging/speakup/devsynth.c:63:18: expected long ( *write )( ... ) drivers/staging/speakup/devsynth.c:63:18: got long ( static [toplevel] *<noident> )( ... ) Signed-off-by: Emil Goode <emilgoode@gmail.com> Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* Staging: speakup/main: Staticize local symbolsSachin Kamat2013-05-221-6/+7
| | | | | | | Symbols referenced only in this file are made static. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* Staging: speakup/kobjects: Use NULL instead of 0Sachin Kamat2013-05-221-1/+1
| | | | | | | Use NULL instead of 0 for pointers. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* Staging: speakup/main: Use NULL instead of 0Sachin Kamat2013-05-221-2/+2
| | | | | | | Use NULL instead of 0 for pointers. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* Staging: speakup/speakup_keypc: Return NULL instead of 0Sachin Kamat2013-05-221-1/+1
| | | | | | | The function returns a pointer. Hence return NULL instead of 0. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* Staging: speakup/speakup_dtlk: Return NULL instead of 0Sachin Kamat2013-05-221-1/+1
| | | | | | | The function returns a pointer. Hence return NULL instead of 0. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* Staging: speakup/speakup_acntpc: Return NULL instead of 0Sachin Kamat2013-05-221-1/+1
| | | | | | | The function returns a pointer. Hence return NULL instead of 0. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging/speakup: Changed parameters in kstrtol()Lisa Nguyen2013-05-211-1/+1
| | | | | | | | | Changed parameters in the kstrtol() function inside main.c to resolve warnings re: mismatched data types used. Signed-off-by: Lisa Nguyen <lisa@xenapiadmin.com> Reported-by: kbuild test robot <fengguang.wu@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging/speakup: Remove trailing whitespace in KconfigLisa Nguyen2013-05-171-16/+16
| | | | | | | | Removed trailing whitespace in Kconfig to meet kernel documentation standards. Signed-off-by: Lisa Nguyen <lisa@xenapiadmin.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging/speakup: Replaced deprecated functionLisa Nguyen2013-05-171-1/+1
| | | | | | | | Replaced simple_strtol() function with kstrtol() function in main.c Signed-off-by: Lisa Nguyen <lisa@xenapiadmin.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging/speakup: Reformatted pointer variablesLisa Nguyen2013-05-171-1/+1
| | | | | | | | Reformatted pointer variables in main.c to meet kernel coding standards. Signed-off-by: Lisa Nguyen <lisa@xenapiadmin.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* Staging: speakup: Fix return value in synth.cSachin Kamat2013-05-161-1/+1
| | | | | | | | | The function return type is a pointer. Hence return NULL instead of 0. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* Staging: speakup: Fix sparse warning in varhandlers.cSachin Kamat2013-05-161-1/+1
| | | | | | | | | | | 'cp' is a pointer. Fix the incorrect comparison with integer to avoid the below warning: drivers/staging/speakup/varhandlers.c:283:19: warning: Using plain integer as NULL pointer Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* Staging: speakup: Return NULL instead of 0 in speakup_decpc.cSachin Kamat2013-05-161-1/+1
| | | | | | | | The function returns a pointer. Hence return NULL instead of 0. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: speakup: remove custom locking macro definitionsWilliam Hubbs2013-05-162-12/+12
| | | | | Signed-off-by: William Hubbs <w.d.hubbs@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: speakup: synth: remove custom locking macrosWilliam Hubbs2013-05-161-12/+12
| | | | | Signed-off-by: William Hubbs <w.d.hubbs@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: speakup: thread: remove custom locking macrosWilliam Hubbs2013-05-161-2/+2
| | | | | Signed-off-by: William Hubbs <w.d.hubbs@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: speakup: soft: remove custom locking macrosWilliam Hubbs2013-05-161-13/+13
| | | | | Signed-off-by: William Hubbs <w.d.hubbs@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: speakup: keypc: remove custom locking macrosWilliam Hubbs2013-05-161-10/+10
| | | | | Signed-off-by: William Hubbs <w.d.hubbs@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: speakup: dtlk: remove custom locking macrosWilliam Hubbs2013-05-161-10/+10
| | | | | Signed-off-by: William Hubbs <w.d.hubbs@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: speakup: dectlk: remove custom locking macrosWilliam Hubbs2013-05-161-10/+10
| | | | | Signed-off-by: William Hubbs <w.d.hubbs@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: speakup: decpc: remove custom locking macrosWilliam Hubbs2013-05-161-10/+10
| | | | | Signed-off-by: William Hubbs <w.d.hubbs@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: speakup: decext: remove custom locking macrosWilliam Hubbs2013-05-161-10/+10
| | | | | Signed-off-by: William Hubbs <w.d.hubbs@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: speakup: apollo: remove custom locking macrosWilliam Hubbs2013-05-161-10/+10
| | | | | Signed-off-by: William Hubbs <w.d.hubbs@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: speakup: acntpc: remove custom locking macrosWilliam Hubbs2013-05-161-10/+10
| | | | | Signed-off-by: William Hubbs <w.d.hubbs@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: speakup: serialio: remove custom locking macrosWilliam Hubbs2013-05-161-2/+2
| | | | | Signed-off-by: William Hubbs <w.d.hubbs@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: speakup: remove spk_trylock macro definitionWilliam Hubbs2013-05-161-1/+0
| | | | | Signed-off-by: William Hubbs <w.d.hubbs@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: speakup: main: remove custom locking macrosWilliam Hubbs2013-05-161-29/+29
| | | | | Signed-off-by: William Hubbs <w.d.hubbs@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: speakup: i18n: remove custom locking macrosWilliam Hubbs2013-05-161-6/+6
| | | | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: speakup: devsynth: remove custom locking macrosWilliam Hubbs2013-05-161-2/+2
| | | | | Signed-off-by: William Hubbs <w.d.hubbs@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: speakup: kobjects: remove custom locking macrosWilliam Hubbs2013-05-161-23/+23
| | | | | Signed-off-by: William Hubbs <w.d.hubbs@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: speakup: cleanup spk_var_header_by_name()Dan Carpenter2013-05-131-10/+7
| | | | | | | | | | There is a confusing while loop here and I have re-written it in canonical for loop format. Also I reversed the NULL check on "name" and pulled everything in one tab stop. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: speakup: remove custom string_unescape_any_inplaceAndy Shevchenko2013-04-303-49/+4
| | | | | | | | | | | | | There is generic implementation of the function to unescape strings. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: Samuel Thibault <samuel.thibault@ens-lyon.org> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: William Hubbs <w.d.hubbs@gmail.com> Cc: Chris Brannon <chris@the-brannons.com> Cc: Kirk Reiser <kirk@braille.uwo.ca> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* staging: speakup: fix a bug when translate octal numbersAndy Shevchenko2013-04-091-2/+2
| | | | | | | | | There are actually overflow bug and typo. And bug was never happened due to the typo. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: speakup: selection.c fix typo in commentValentin Ilie2013-04-051-1/+1
| | | | | | | Replace disallocated with deallocated Signed-off-by: Valentin Ilie <valentin.ilie@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: speakup: use native error codesAndy Shevchenko2013-03-293-21/+16
| | | | | | | | | | | | | | | The mapping as follows: E_RANGE -> ERANGE E_UNDEF -> ENODATA E_TOOLONG -> E2BIG SET_DEFAULT -> ERESTART As a side effect it fixes a bug in spk_var_store() where return code was mistakenly compared to negative value instead of positive. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: speakup: reuse native kernel functionsAndy Shevchenko2013-03-294-32/+3
| | | | | | | | | We have simple_strtoul and simple_strtol. Don't repeat their functionality here. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* Merge tag 'tty-3.9-rc1' of ↵Linus Torvalds2013-02-211-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty Pull tty/serial patches from Greg Kroah-Hartman: "Here's the big tty/serial driver patches for 3.9-rc1. More tty port rework and fixes from Jiri here, as well as lots of individual serial driver updates and fixes. All of these have been in the linux-next tree for a while." * tag 'tty-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (140 commits) tty: mxser: improve error handling in mxser_probe() and mxser_module_init() serial: imx: fix uninitialized variable warning serial: tegra: assume CONFIG_OF TTY: do not update atime/mtime on read/write lguest: select CONFIG_TTY to build properly. ARM defconfigs: add missing inclusions of linux/platform_device.h fb/exynos: include platform_device.h ARM: sa1100/assabet: include platform_device.h directly serial: imx: Fix recursive locking bug pps: Fix build breakage from decoupling pps from tty tty: Remove ancient hardpps() pps: Additional cleanups in uart_handle_dcd_change pps: Move timestamp read into PPS code proper pps: Don't crash the machine when exiting will do pps: Fix a use-after free bug when unregistering a source. pps: Use pps_lookup_dev to reduce ldisc coupling pps: Add pps_lookup_dev() function tty: serial: uartlite: Support uartlite on big and little endian systems tty: serial: uartlite: Fix sparse and checkpatch warnings serial/arc-uart: Miscll DT related updates (Grant's review comments) ... Fix up trivial conflicts, mostly just due to the TTY config option clashing with the EXPERIMENTAL removal.
| * pps: Move timestamp read into PPS code properGeorge Spelvin2013-02-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PPS (Pulse-Per-Second) line discipline has developed a number of unhealthy attachments to core tty data and functions, ultimately leading to its breakage. The previous patches fixed the crashing. This one reduces coupling further by eliminating the timestamp parameter from the dcd_change ldisc method. This reduces header file linkage and makes the extension more generic, and the timestamp read is delayed only slightly, from just before the ldisc->ops->dcd_change method call to just after. Fix attendant build breakage in drivers/tty/n_tty.c drivers/tty/tty_buffer.c drivers/staging/speakup/selection.c drivers/staging/dgrp/dgrp_*.c Cc: William Hubbs <w.d.hubbs@gmail.com> Cc: Chris Brannon <chris@the-brannons.com> Cc: Kirk Reiser <kirk@braille.uwo.ca> Cc: Samuel Thibault <samuel.thibault@ens-lyon.org> Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: George Spelvin <linux@horizon.com> Acked-by: Rodolfo Giometti <giometti@enneenne.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | staging: Remove unnecessary OOM messagesJoe Perches2013-02-111-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | alloc failures already get standardized OOM messages and a dump_stack. For the affected mallocs around these OOM messages: Converted kzallocs with multiplies to kcalloc. Converted kmallocs with multiplies to kmalloc_array. Converted a kmalloc/strlen/strncpy to kstrdup. Moved a spin_lock below a removed OOM message and removed a now unnecessary spin_unlock. Neatened alignment and whitespace. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | Staging: speakup: kobjects.c: checkpatch.pl fixesLijo Antony2013-01-171-4/+4
| | | | | | | | | | | | | | Fixed two "line over 80 characters" warnings reported by checkpatch.pl Signed-off-by: Lijo Antony <lijo.kernel@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | Staging: speakup: keyhelp.c: checkpatch.pl fixesLijo Antony2013-01-171-2/+5
| | | | | | | | | | | | | | Breaking 2 lines to fit 80 char limit Signed-off-by: Lijo Antony <lijo.kernel@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
OpenPOWER on IntegriCloud