summaryrefslogtreecommitdiff
path: root/drivers/staging/dgap
AgeCommit message (Collapse)AuthorFilesLines
2014-02-25staging: dgap: fix compile warnings by remove dead codeMark Hounschell1-145/+0
The last patch series exposed some dead code causing compile warnings. This patch removes that dead code and fixes the warnings Signed-off-by: Mark Hounschell <markh@compro.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-02-25staging: dgap: Add in-kernel firmware loading supportMark Hounschell1-202/+323
This patch adds in-kernel firmware loading support and removes support for the original userland firmware loading process. Signed-off-by: Mark Hounschell <markh@compro.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-02-25staging: dgap: Rename driverMark Hounschell3-5/+1
Renames driver file dgap_driver.c and dgap_driver.h to dgap.c and dgap.h because we are now single source and include file and better fits kernel naming conventions. Signed-off-by: Mark Hounschell <markh@compro.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-02-25staging: dgap: Make merged and local functions and variables staticMark Hounschell2-119/+90
This patch makes all merged and original functions static to dgap.c. Doing so has revealed more dead code via gcc warnings. Signed-off-by: Mark Hounschell <markh@compro.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-02-25staging: dgap: Merge digi.h into dgap_driver.hMark Hounschell2-378/+350
There is a lot of cleanup work to do on these digi drivers and merging as much as is possible will make it easier. I also notice that many merged drivers are single source and header. Signed-off-by: Mark Hounschell <markh@compro.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-02-25staging: dgap: Merge dgap_types.h into dgap_driver.hMark Hounschell3-38/+11
There is a lot of cleanup work to do on these digi drivers and merging as much as is possible will make it easier. I also notice that many merged drivers are single source and header. Signed-off-by: Mark Hounschell <markh@compro.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-02-25staging: dgap: Merge dgap_kcompat.h into dgap_driver.hMark Hounschell2-65/+32
There is a lot of cleanup work to do on these digi drivers and merging as much as is possible will make it easier. I also notice that many merged drivers are single source and header. Signed-off-by: Mark Hounschell <markh@compro.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-02-25staging: dgap: Merge dgap_parse.h into dgap_driver.hMark Hounschell2-36/+11
There is a lot of cleanup work to do on these digi drivers and merging as much as is possible will make it easier. I also notice that many merged drivers are single source and header. Signed-off-by: Mark Hounschell <markh@compro.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-02-25staging: dgap: Merge dgap_conf.h into dgap_driver.hMark Hounschell3-290/+261
There is a lot of cleanup work to do on these digi drivers and merging as much as is possible will make it easier. I also notice that many merged drivers are single source and header. Signed-off-by: Mark Hounschell <markh@compro.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-02-25staging: dgap: Merge dgap_pci.h into dgap_driver.hMark Hounschell3-92/+67
There is a lot of cleanup work to do on these digi drivers and merging as much as is possible will make it easier. I also notice that many merged drivers are single source and header. Signed-off-by: Mark Hounschell <markh@compro.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-02-25staging: dgap: Merge dgap_fep5.h into dgap_driver.hMark Hounschell3-254/+222
There is a lot of cleanup work to do on these digi drivers and merging as much as is possible will make it easier. I also notice that many merged drivers are single source and header. Signed-off-by: Mark Hounschell <markh@compro.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-02-25staging: dgap: Merge dgap_sysfs.h into dgap_driver.cMark Hounschell3-50/+21
There is a lot of cleanup work to do on these digi drivers and merging as much as is possible will make it easier. I also notice that many merged drivers are single source and header. Signed-off-by: Mark Hounschell <markh@compro.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-02-25staging: dgap: Merge dgap_tty.h into dgap_driver.cMark Hounschell2-40/+8
There is a lot of cleanup work to do on these digi drivers and merging as much as is possible will make it easier. I also notice that many merged drivers are single source and header. Signed-off-by: Mark Hounschell <markh@compro.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-02-25staging: dgap: Remove unneeded dgap_trace.c and dgap_trace.hMark Hounschell4-223/+1
Removes unneeded files dgap_trace.c and dgap_trace.h Signed-off-by: Mark Hounschell <markh@compro.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-02-25staging: dgap: Merge dgap_parses.c into dgap_driver.cMark Hounschell3-1374/+1326
There is a lot of cleanup work to do on these digi drivers and merging as much as is possible will make it easier. I also notice that many merged drivers are single source and header. Signed-off-by: Mark Hounschell <markh@compro.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-02-25staging: dgap: Merge dgap_sysfs.c into dgap_driver.cMark Hounschell3-794/+750
There is a lot of cleanup work to do on these digi drivers and merging as much as is possible will make it easier. I also notice that many merged drivers are single source and header. Signed-off-by: Mark Hounschell <markh@compro.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-02-25staging: dgap: Merge dgap_fep5.c into dgap_driver.cMark Hounschell3-1903/+1858
There is a lot of cleanup work to do on these digi drivers and merging as much as is possible will make it easier. I also notice that many merged drivers are single source and header. Signed-off-by: Mark Hounschell <markh@compro.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-02-25staging: dgap: Merge dgap_tty.c into dgap_driver.cMark Hounschell3-3556/+3496
There is a lot of cleanup work to do on these digi drivers and merging as much as is possible will make it easier. I also notice that many merged drivers are single source and header. Signed-off-by: Mark Hounschell <markh@compro.net> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-02-25staging: dgap: Remove userland source code filesMark Hounschell2-865/+0
This patch removes userland source code files downld.c and dgap_downld.h Signed-off-by: Mark Hounschell <markh@compro.net> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-02-25staging: dgap: Remove CVS ID tagsMark Hounschell12-12/+0
This patch removes all the original CVS tags because they are in my way Signed-off-by: Mark Hounschell <markh@compro.net> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-02-07staging: dgap: removes version.h dependencyLidza Louina3-3/+0
This patch removes the version.h dependencies to the driver.h, fep5.c and tty.c files. This header was used to help the driver support different versions of the kernel. The support for different versions was removed in a previous patch. Signed-off-by: Lidza Louina <Lidza.Louina@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-02-07staging: dgap: removes KERNEL_VERSION conditionalsLidza Louina3-63/+2
This patch removes the KERNEL_VERSION conditionals. The driver is built for this kernel version, so the conditionals are not needed. Signed-off-by: Lidza Louina <Lidza.Louina@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-02-07staging: dgap: Fix trailing whitespace in dgap_fep5.hMasanari Iida1-23/+23
This patch fixed trailing whitespace found by checkpatch.pl in staging/dgap/dgap_fep5.h Signed-off-by: Masanari Iida <standby24x7@gmail.com> Acked-by: Lidza Louina <Lidza.Louina@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-02-07staging: dgap: Fix trailing whitespace in dgap_sysfs.hMasanari Iida1-1/+1
This patch fixed trailing whitespace found by checkpatch.pl in staging/dgap/dgap_sysfs.h Signed-off-by: Masanari Iida <standby24x7@gmail.com> Acked-by: Lidza Louina <Lidza.Louina@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-02-07staging: dgap: Fix trailing whitespace in dgap_driver.hMasanari Iida1-11/+11
This patch fixed trailing whitespace found by checkpatch.pl in staging/dgap/dgap_driver.h Signed-off-by: Masanari Iida <standby24x7@gmail.com> Acked-by: Lidza Louina <Lidza.Louina@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-02-07staging: dgap: Fix trailing whitespace in dgap_downld.hMasanari Iida1-2/+2
This patch fixed trailing whitespace found by checkpatch.pl in staging/dgap/dgap_downld.h Signed-off-by: Masanari Iida <standby24x7@gmail.com> Acked-by: Lidza Louina <Lidza.Louina@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-02-07staging: dgap: Fix trailing whitespace in dgap_driver.cMasanari Iida1-20/+20
This patch fixed trailing whitespace found by checkpatch.pl in staging/dgap/dgap_driver.c Signed-off-by: Masanari Iida <standby24x7@gmail.com> Acked-by: Lidza Louina <Lidza.Louina@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-02-07staging: dgap: Fix trailing whitespace in dgap_parse.cMasanari Iida1-8/+8
Thsi patch fixed trailing whitespace found by checkpatch.pl in dgap/dgap_parse.c Signed-off-by: Masanari Iida <standby24x7@gmail.com> Acked-by: Lidza Louina <Lidza.Louina@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-02-07staging: dgap: Fix trailing whitespace in dgap_sysfs.cMasanari Iida1-7/+7
This patch fixed trailing whitespace found by checkpatch.pl in dgap/dgap_sysfs.c Signed-off-by: Masanari Iida <standby24x7@gmail.com> Acked-by: Lidza Louina <Lidza.Louina@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-02-07staging: dgap: Fix trailing whitespace in digi.hMasanari Iida1-12/+12
This patch fixed trailing whitespace error found by checkpatch.pl in dgap/digi.h Signed-off-by: Masanari Iida <standby24x7@gmail.com> Acked-by: Lidza Louina <Lidza.Louina@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-01-25Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds1-1/+1
Pull networking updates from David Miller: 1) BPF debugger and asm tool by Daniel Borkmann. 2) Speed up create/bind in AF_PACKET, also from Daniel Borkmann. 3) Correct reciprocal_divide and update users, from Hannes Frederic Sowa and Daniel Borkmann. 4) Currently we only have a "set" operation for the hw timestamp socket ioctl, add a "get" operation to match. From Ben Hutchings. 5) Add better trace events for debugging driver datapath problems, also from Ben Hutchings. 6) Implement auto corking in TCP, from Eric Dumazet. Basically, if we have a small send and a previous packet is already in the qdisc or device queue, defer until TX completion or we get more data. 7) Allow userspace to manage ipv6 temporary addresses, from Jiri Pirko. 8) Add a qdisc bypass option for AF_PACKET sockets, from Daniel Borkmann. 9) Share IP header compression code between Bluetooth and IEEE802154 layers, from Jukka Rissanen. 10) Fix ipv6 router reachability probing, from Jiri Benc. 11) Allow packets to be captured on macvtap devices, from Vlad Yasevich. 12) Support tunneling in GRO layer, from Jerry Chu. 13) Allow bonding to be configured fully using netlink, from Scott Feldman. 14) Allow AF_PACKET users to obtain the VLAN TPID, just like they can already get the TCI. From Atzm Watanabe. 15) New "Heavy Hitter" qdisc, from Terry Lam. 16) Significantly improve the IPSEC support in pktgen, from Fan Du. 17) Allow ipv4 tunnels to cache routes, just like sockets. From Tom Herbert. 18) Add Proportional Integral Enhanced packet scheduler, from Vijay Subramanian. 19) Allow openvswitch to mmap'd netlink, from Thomas Graf. 20) Key TCP metrics blobs also by source address, not just destination address. From Christoph Paasch. 21) Support 10G in generic phylib. From Andy Fleming. 22) Try to short-circuit GRO flow compares using device provided RX hash, if provided. From Tom Herbert. The wireless and netfilter folks have been busy little bees too. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (2064 commits) net/cxgb4: Fix referencing freed adapter ipv6: reallocate addrconf router for ipv6 address when lo device up fib_frontend: fix possible NULL pointer dereference rtnetlink: remove IFLA_BOND_SLAVE definition rtnetlink: remove check for fill_slave_info in rtnl_have_link_slave_info qlcnic: update version to 5.3.55 qlcnic: Enhance logic to calculate msix vectors. qlcnic: Refactor interrupt coalescing code for all adapters. qlcnic: Update poll controller code path qlcnic: Interrupt code cleanup qlcnic: Enhance Tx timeout debugging. qlcnic: Use bool for rx_mac_learn. bonding: fix u64 division rtnetlink: add missing IFLA_BOND_AD_INFO_UNSPEC sfc: Use the correct maximum TX DMA ring size for SFC9100 Add Shradha Shah as the sfc driver maintainer. net/vxlan: Share RX skb de-marking and checksum checks with ovs tulip: cleanup by using ARRAY_SIZE() ip_tunnel: clear IPCB in ip_tunnel_xmit() in case dst_link_failure() is called net/cxgb4: Don't retrieve stats during recovery ...
2014-01-16staging,dgap: Add dependency on HAS_IOMEMRichard Weinberger1-1/+1
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-09staging: dgap: fix checkpatch warningsVincent Stehlé1-58/+47
Remove a few spaces at beginning and end of line. Remove single statement braces {}. Remove two FSF boilerplate paragraphs. Signed-off-by: Vincent Stehlé <vincent.stehle@laposte.net> Cc: Lidza Louina <lidza.louina@gmail.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Scott H Kilau <Scott_Kilau@digi.com> Cc: Eng.Linux@digi.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-01-09staging: dgap: fix missing header inclusionVincent Stehlé1-0/+1
Include slab.h to fix the following compilation error: drivers/staging/dgap/dgap_fep5.c: In function ‘dgap_do_config_load’: drivers/staging/dgap/dgap_fep5.c:78:2: error: implicit declaration of function ‘kzalloc’ [-Werror=implicit-function-declaration] Signed-off-by: Vincent Stehlé <vincent.stehle@laposte.net> Cc: Lidza Louina <lidza.louina@gmail.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Scott H Kilau <Scott_Kilau@digi.com> Cc: Eng.Linux@digi.com Cc: trivial@kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-01-09drivers: dgap: Include appropriate header file in dgap_parse.cRashika Kheria1-0/+1
Include appropriate header file in dgap/dgap_parse.h in dgap_parse.c because functions dgap_parsefile(), dgap_config_get_useintr(), dgap_config_get_altpin(), dgap_find_config(), dgap_config_get_number_of_ports(), dgap_create_config_string() and dgap_get_config_letters() have their prototype declarations in the header file. This eliminates the following warnings in dgap_parse.c: drivers/staging/dgap/dgap_parse.c:125:5: warning: no previous prototype for ‘dgap_parsefile’ [-Wmissing-prototypes] drivers/staging/dgap/dgap_parse.c:1101:6: warning: no previous prototype for ‘dgap_config_get_useintr’ [-Wmissing-prototypes] drivers/staging/dgap/dgap_parse.c:1128:6: warning: no previous prototype for ‘dgap_config_get_altpin’ [-Wmissing-prototypes] drivers/staging/dgap/dgap_parse.c:1157:15: warning: no previous prototype for ‘dgap_find_config’ [-Wmissing-prototypes] drivers/staging/dgap/dgap_parse.c:1223:6: warning: no previous prototype for ‘dgap_config_get_number_of_ports’ [-Wmissing-prototypes] drivers/staging/dgap/dgap_parse.c:1252:7: warning: no previous prototype for ‘dgap_create_config_string’ [-Wmissing-prototypes] drivers/staging/dgap/dgap_parse.c:1311:7: warning: no previous prototype for ‘dgap_get_config_letters’ [-Wmissing-prototypes] Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-01-09drivers: dgap: Include appropriate header file in dgap_trace.cRashika Kheria1-0/+1
Include appropriate header file dgap/dgap_trace.h in dgap_trace.c because function dgap_tracer_free() have its prototype declaration in the header file. This eliminates the following warning in dgap_trace.c: drivers/staging/dgap/dgap_trace.c:181:6: warning: no previous prototype for ‘dgap_tracer_free’ [-Wmissing-prototypes] Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-12-20staging: dgap: uses kzalloc for allocating memoryLidza Louina4-23/+8
Originally, this driver created it's own allocating function. This patch removes that function and calls kzalloc directly. This patch affects: - driver.c - driver.h - fep5.c - tty.c Signed-off-by: Lidza Louina <lidza.louina@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-12-19staging: dgap: Fix trailing whitespace in dgap_trace.cMasanari Iida1-8/+8
This patch fixed trailing whitespace found by checkpatch.pl within dgap_trace.c Signed-off-by: Masanari Iida <standby24x7@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-12-19staging: dgap: Fix trailing whitespace in dgap_tty.cMasanari Iida1-87/+87
This patch fixed "ERROR:trailing whitespace found by checkpatch.pl within dgap_tty.c Signed-off-by: Masanari Iida <standby24x7@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-12-19staging: dgap: Fix trailing whitespace in downld.cMasanari Iida1-84/+84
This patch fix "ERROR: trailing whitespace found by checkpatch.pl, whithin downld.c Signed-off-by: Masanari Iida <standby24x7@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-12-17staging: dgap: Fixed trailing white space from dgap_conf.hMasanari Iida1-3/+3
This patch fixes "ERROR: trailing whitespace" found by checkpatch.pl. Signed-off-by: Masanari Iida <standby24x7@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-10-12staging: dgap: dgap_tty: Do not use 0 for pointersSachin Kamat1-3/+4
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-12staging: dgap: dgap_fep5: Do not use 0 for NULL pointerSachin Kamat1-1/+1
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-12staging: dgap: dgap_fep5: Remove braces around returnSachin Kamat1-19/+19
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-12staging: dgap: dgap_fep5: Remove braces around single line statementsSachin Kamat1-10/+5
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-09-26staging: dgap: tty.c: removes smatch warnings "redundant null check"Lidza Louina1-12/+6
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-26staging: dgap: tty.c: removes smatch warning "ignoring unreachable code"Lidza Louina1-12/+0
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-26staging: dgap: driver.c: removes smatch warning "redundant null check"Lidza Louina1-6/+3
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-26drivers: staging: dgap: move DG_NAME and DG_PART from "Makefile" to ↵Chen Gang2-2/+3
"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-25Merge 3.12-rc2 into staging-next.Greg Kroah-Hartman1-7/+10
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>
generated by cgit v1.2.3 (git 2.39.0) at 2024-09-18 01:51:48 +0300