Commit graph

36 commits

Author SHA1 Message Date
Richard Weinberger 29c56c701d staging,dgap: Add dependency on HAS_IOMEM
On archs like S390 or um this driver cannot build nor work.
Make it depend on HAS_IOMEM to bypass build failures.

drivers/staging/dgap/dgap_driver.c: In function ‘dgap_cleanup_board’:
drivers/staging/dgap/dgap_driver.c:457:3: error: implicit declaration of function ‘iounmap’ [-Werror=implicit-function-declaration]
drivers/staging/dgap/dgap_driver.c: In function ‘dgap_do_remap’:
drivers/staging/dgap/dgap_driver.c:694:2: error: implicit declaration of function ‘ioremap’ [-Werror=implicit-function-declaration]

Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-01-15 14:51:22 -08:00
Sachin Kamat 53fa1f4f1f staging: dgap: dgap_tty: Do not use 0 for pointers
0 should not be used instead of NULL for pointers.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Lidza Louina <lidza.louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-10-11 15:36:30 -07:00
Sachin Kamat fa5cd4cf1b staging: dgap: dgap_fep5: Do not use 0 for NULL pointer
Do not compare NULL pointer with 0.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Lidza Louina <lidza.louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-10-11 15:36:30 -07:00
Sachin Kamat 0b5aff00a7 staging: dgap: dgap_fep5: Remove braces around return
Braces are not needed around return values.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Lidza Louina <lidza.louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-10-11 15:36:30 -07:00
Sachin Kamat 565c509587 staging: dgap: dgap_fep5: Remove braces around single line statements
Single line statements do not require braces.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Lidza Louina <lidza.louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-10-11 15:36:30 -07:00
Lidza Louina fcfeef6c51 staging: dgap: tty.c: removes smatch warnings "redundant null check"
This patch removes these smatch warnings:
redundant null check on dgap_TmpWriteBuf calling kfree()
redundant null check on brd->SerialDriver->ttys calling kfree()
redundant null check on brd->PrintDriver->ttys calling kfree()

The code checked to see if these variables are null
before freeing. This check isn't needed.

Signed-off-by: Lidza Louina <lidza.louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-09-25 16:18:10 -07:00
Lidza Louina 913b6f8e0d staging: dgap: tty.c: removes smatch warning "ignoring unreachable code"
This patch removes this smatch warning:
info: ignoring unreachable code.

There were instances where there was extra code after
the default action in switch statements. These default
actions ended with a break so the code wasn't being run
at anytime. This patch removes that extra code.

Signed-off-by: Lidza Louina <lidza.louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-09-25 16:18:10 -07:00
Lidza Louina 57a42192e6 staging: dgap: driver.c: removes smatch warning "redundant null check"
This patch removes these smatch warnings from dgap_driver.c:

redundant null check on dgap_config_buf calling kfree()
redundant null check on brd->flipbuf calling kfree()
redundant null check on brd->flipflagbuf calling kfree()

Signed-off-by: Lidza Louina <lidza.louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-09-25 16:09:24 -07:00
Chen Gang 6319c61aec drivers: staging: dgap: move DG_NAME and DG_PART from "Makefile" to "dgap_driver.h"
Normally, the macros from command line are system specific macros (e.g
__linux, __KERNEL__ ...), and module own macros are usually defined in
their header files.

DG_NAME and DG_PART are driver 'dgap' owned macros which are used by
multiple files within driver, and need be defined in the driver main
header file.

So move DG_NAME and DG_PART to "dgap_driver.h", it not only can make
code clearer, but also can avoid compiling failure when EXTRA_CFLAGS
appended to make command line (e.g. "EXTRA_CFLAGS=-W").

Signed-off-by: Chen Gang <gang.chen@asianux.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-09-25 16:09:24 -07:00
Greg Kroah-Hartman e2aad1d571 Merge 3.12-rc2 into staging-next.
This resolves the merge problem with two iio drivers that Stephen
Rothwell pointed out.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-09-25 08:59:04 -07:00
Masanari Iida 5fc6f1aebe staging: dgap: Fix typo in staging/dgap
Correct spelling typo in comments.

Signed-off-by: Masanari Iida <standby24x7@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-09-17 07:47:46 -07:00
Jingoo Han 538118b94f staging: dgap: Remove casting the return value which is a void pointer
Casting the return value which is a void pointer is redundant.
The conversion from void pointer to any other pointer type is
guaranteed by the C programming language.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-09-17 07:47:43 -07:00
Sachin Kamat 3b33bd911d staging: dgap: Remove version check in dgap_kcompat.h
Code should be for the kernel version it is merged in.
Version check is not necessary.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-09-17 07:47:43 -07:00
Sachin Kamat 63c7cc2aea staging: dgap: Remove version check in dgap_driver.c
Code should be for the kernel version it is merged in.
Version check is not necessary.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-09-17 07:47:43 -07:00
Kees Cook 1ea12fef83 staging: dgap: fix overflows and format strings
The boot message buffer could potentially overflow the stack and the
heap. Additionally make sure format strings could not leak into printk()
calls.

Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-09-17 07:39:27 -07:00
Geert Uytterhoeven 351699d7eb staging: dgap: Add missing #include <linux/slab.h>
drivers/staging/dgap/dgap_driver.c: In function ‘dgap_cleanup_module’:
drivers/staging/dgap/dgap_driver.c:423: error: implicit declaration of function ‘kfree’
drivers/staging/dgap/dgap_driver.c: In function ‘dgap_driver_kzmalloc’:
drivers/staging/dgap/dgap_driver.c:940: error: implicit declaration of function ‘kmalloc’
drivers/staging/dgap/dgap_driver.c:940: warning: initialization makes pointer from integer without a cast

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-30 11:30:58 -07:00
Sachin Kamat 9bfcc70355 staging: dgap: Remove version.h header inclusion in dgap_trace.c
version.h header inclusion is not necessary as detected by
versioncheck.

Cc: Lidza Louina <lidza.louina@gmail.com>
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-28 15:15:45 -07:00
Sachin Kamat 2702989959 staging: dgap: Remove version.h header inclusion in dgap_sysfs.c
version.h header inclusion is not necessary as detected by
versioncheck.

Cc: Lidza Louina <lidza.louina@gmail.com>
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-28 15:15:45 -07:00
Sachin Kamat e06534fd37 staging: dgap: Remove version.h header inclusion in dgap_parse.c
version.h header inclusion is not necessary as detected by
versioncheck.

Cc: Lidza Louina <lidza.louina@gmail.com>
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-28 15:15:45 -07:00
Lidza Louina f6f92a300e staging: dgap: removes proc.h
This patch removes the proc.h file and removes '#include
dgap_proc.h' from headers in the driver.

Signed-off-by: Lidza Louina <lidza.louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-23 09:52:02 -07:00
Lidza Louina 13db3befdb staging: dgap: removes proc.c
This patch removes proc.c. This code isn't needed anymore because
a previous patch removed references to it and because the kernel
uses sysfs instead of proc.

Signed-off-by: Lidza Louina <lidza.louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-23 09:52:02 -07:00
Lidza Louina cbe0ffb520 staging: dgap: removes references to proc code
This patch removes references to proc functions and
structs in the code. The kernel uses sysfs instead
of proc now.

Signed-off-by: Lidza Louina <lidza.louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-23 09:51:19 -07:00
Lidza Louina 07b96937cf staging: dgap: removes mgmt.h
This patch removes mgmt.h and the headers that include
it of files in dgap. This file isn't needed for the
driver to work with the kernel.

Signed-off-by: Lidza Louina <lidza.louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-23 09:50:23 -07:00
Lidza Louina 6dacb8b687 staging: dgap: removes mgmt.c
This patch removes mgmt.c. This file isn't needed for the
driver to work with the kernel.

Signed-off-by: Lidza Louina <lidza.louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-23 09:50:00 -07:00
Lidza Louina 37351073d8 staging: dgap: removes references to mgmt code
This patch removes references to mgmt functions from
the code. The files mgmt.c and mgmt.h will be
removed in the patches that follow.

Signed-off-by: Lidza Louina <lidza.louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-23 09:49:19 -07:00
Lidza Louina acb8d4056a staging: dgap: ifdef HAVE_UNLOCKED_IOCTL conditionals
This patch removes the HAVE_UNLOCKED_IOCTL conditional
statements from driver.c, mgmt.c and mgmt.h. This was
used to support older kernels. It isn't needed now.

Signed-off-by: Lidza Louina <lidza.louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-22 10:12:43 -07:00
Lidza Louina 6c2f9ab53c staging: dgap: mgmt.c: removes unused variable
This patch removes the unused variable page
in mgmt.c.

Signed-off-by: Lidza Louina <lidza.louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-22 10:12:43 -07:00
Lidza Louina 038bc7ac70 staging: dgap: tty.c: fixes incompatible type error
This patch fixes the error: incompatible types when
assigning to type ‘struct ktermios *’ from type
‘struct ktermios’

Signed-off-by: Lidza Louina <lidza.louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-22 10:12:43 -07:00
Lidza Louina acccb45473 staging: dgap: tty.c: fixes ioctl param list
The declaration for the ioctl function has changed. The previous version
of this declaration took struct file *file as a parameter and the new
one does not. This patch removes that parameter.

It also removes cases for the commands TIOCGETP
TCGETS and TCGETA.

Signed-off-by: Lidza Louina <lidza.louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-22 10:12:43 -07:00
Lidza Louina fd2ada8db8 staging: dgap: tty.c: removes read_cnt, real_raw and rawreadok
This patch removes the use of read_cnt, real_raw and rawreadok.
These variables don't exist in the new API. Reading the data
raw is no longer supported by the tty layer.

Signed-off-by: Lidza Louina <lidza.louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-22 10:12:43 -07:00
Lidza Louina c3dc9dc57d staging: dgap: tty.c: fixes termios error
This patch fixes this error: invalid type
argument of ‘->’ (have ‘struct ktermios’).

Signed-off-by: Lidza Louina <lidza.louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-22 10:12:43 -07:00
Lidza Louina 17c82bce16 staging: dgap: tty.c: fixes errors with tty function calls
This patch fixes errors with the tty function calls
tty_buffer_request_room, tty_insert_flip_string_flags,
tty_insert_flip_string and tty_flip_buffer_push.

They now take struct tty_port as a parameter instead
of tty_struct.

Signed-off-by: Lidza Louina <lidza.louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-22 10:12:42 -07:00
Lidza Louina bb9ebe7073 staging: dgap: fep5.c: fixes errors with tty function calls
This patch fixes errors with the tty function calls
tty_buffer_request_room, tty_insert_flip_char and
tty_flip_buffer_push. They now take struct tty_port
as a parameter instead of tty_struct.

Signed-off-by: Lidza Louina <lidza.louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-22 10:12:42 -07:00
Lidza Louina 1c2aa15ae4 staging: dgap: removes references to proc code
This patch removes references to proc code in this
driver. It still has proc.c, proc.h and a board
state called NEEDS_PROC_CREATION. All three of
these will be removed in another patch.

Signed-off-by: Lidza Louina <lidza.louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-22 10:12:42 -07:00
Lidza Louina fc5a89904c staging: dgap: fixes incompatible type error
This patch fixes the error: incompatible types
when assigning to type ‘struct ktermios *’ from
type ‘struct ktermios’

Signed-off-by: Lidza Louina <lidza.louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-22 10:12:42 -07:00
Scott_Kilau@digi.com c84b8b503e staging: dgap: adds dgap driver to staging
This patch adds the dgap driver to staging. This is
a TTY serial port driver for the EPCA PCI based
product line by Digi International <www.digi.com>.

Signed-off-by: Lidza Louina <lidza.louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-22 10:10:00 -07:00