03 Jul, 2013
1 commit
-
Pull staging tree update from Greg KH:
"Here's the large staging tree merge for 3.11-rc1Huge thing here is the Lustre client code. Unfortunatly, due to it
not building properly on a wide variety of different architectures
(this was production code???), it is currently disabled from the build
so as to not annoy people.Other than Lustre, there are loads of comedi patches, working to clean
up that subsystem, iio updates and new drivers, and a load of cleanups
from the OPW applicants in their quest to get a summer internship.All of these have been in the linux-next releases for a while (hence
the Lustre code being disabled)"Fixed up trivial conflict in drivers/staging/serqt_usb2/serqt_usb2.c due
to independent renamings in the staging driver cleanup and the USB
tree..* tag 'staging-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (868 commits)
Revert "Revert "Revert "staging/lustre: drop CONFIG_BROKEN dependency"""
staging: rtl8192u: fix line length in r819xU_phy.h
staging: rtl8192u: rename variables in r819xU_phy.h
staging: rtl8192u: fix comments in r819xU_phy.h
staging: rtl8192u: fix whitespace in r819xU_phy.h
staging: rtl8192u: fix newlines in r819xU_phy.c
staging: comedi: unioxx5: use comedi_alloc_spriv()
staging: comedi: unioxx5: fix unioxx5_detach()
silicom: checkpatch: errors caused by macros
Staging: silicom: remove the board_t typedef in bpctl_mod.c
Staging: silicom: capitalize labels in the bp_media_type enum
Staging: silicom: remove bp_media_type enum typedef
staging: rtl8192u: replace msleep(1) with usleep_range() in r819xU_phy.c
staging: rtl8192u: rename dwRegRead and rtStatus in r819xU_phy.c
staging: rtl8192u: replace __FUNCTION__ in r819xU_phy.c
staging: rtl8192u: limit line size in r819xU_phy.c
zram: allow request end to coincide with disksize
staging: drm/imx: use generic irq chip unused field to block out invalid irqs
staging: drm/imx: use generic irqchip
staging: drm/imx: ipu-dmfc: use defines for ipu channel numbers
...
18 Jun, 2013
3 commits
-
Changed name of one variable, so that all lines are now below 80
characters.Signed-off-by: Bernd Bassimir
Signed-off-by: Nico Doerr
Signed-off-by: Greg Kroah-Hartman -
Changed names of several variables, that contained CamelCases.
Signed-off-by: Bernd Bassimir
Signed-off-by: Nico Doerr
Signed-off-by: Greg Kroah-Hartman -
This moves the allocation of minor device numbers from a static array to
be dynamic, using the idr interface. This means that you could
potentially get "gaps" in a minor number range for a single USB serial
device with multiple ports, but all should still work properly.We remove the 'minor' field from the usb_serial structure, as it no
longer makes any sense for it (use the field in the usb_serial_port
structure if you really want to know this number), and take the fact
that we were overloading a number in this field to determine if we had
initialized the minor numbers or not, and just use a flag variable
instead.Note, we still have the limitation of 255 USB to serial devices in the
system, as that is all we are registering with the TTY layer at this
point in time.Tested-by: Tobias Winter
Reviewed-by: Johan Hovold
Signed-off-by: Greg Kroah-Hartman
11 Jun, 2013
1 commit
-
The usb_serial_port structure had the number field, which was the minor
number for the port, which almost no one really cared about. They
really wanted the number of the port within the device, which you had to
subtract from the minor of the parent usb_serial_device structure. To
clean this up, provide the real minor number of the port, and the number
of the port within the serial device separately, as these numbers might
not be related in the future.Bonus is that this cleans up a lot of logic in the drivers, and saves
lines overall.Tested-by: Tobias Winter
Reviewed-by: Johan Hovold
Signed-off-by: Greg Kroah-Hartman--
drivers/staging/serqt_usb2/serqt_usb2.c | 21 +++--------
drivers/usb/serial/ark3116.c | 2 -
drivers/usb/serial/bus.c | 6 +--
drivers/usb/serial/console.c | 2 -
drivers/usb/serial/cp210x.c | 2 -
drivers/usb/serial/cypress_m8.c | 4 +-
drivers/usb/serial/digi_acceleport.c | 6 ---
drivers/usb/serial/f81232.c | 5 +-
drivers/usb/serial/garmin_gps.c | 6 +--
drivers/usb/serial/io_edgeport.c | 58 ++++++++++++--------------------
drivers/usb/serial/io_ti.c | 21 ++++-------
drivers/usb/serial/keyspan.c | 29 +++++++---------
drivers/usb/serial/metro-usb.c | 4 +-
drivers/usb/serial/mos7720.c | 37 +++++++++-----------
drivers/usb/serial/mos7840.c | 52 +++++++++-------------------
drivers/usb/serial/opticon.c | 2 -
drivers/usb/serial/pl2303.c | 2 -
drivers/usb/serial/quatech2.c | 7 +--
drivers/usb/serial/sierra.c | 2 -
drivers/usb/serial/ti_usb_3410_5052.c | 10 ++---
drivers/usb/serial/usb-serial.c | 7 ++-
drivers/usb/serial/usb_wwan.c | 2 -
drivers/usb/serial/whiteheat.c | 20 +++++------
include/linux/usb/serial.h | 6 ++-
24 files changed, 133 insertions(+), 180 deletions(-)
19 Mar, 2013
1 commit
-
It allows for cleaning up on a considerable amount of places. They did
port_get, wakeup, kref_put. Now the only thing needed is to call
tty_port_tty_wakeup which does exactly that.One exception is ifx6x60 where tty_wakeup was open-coded. We now call
tty_wakeup properly there.Signed-off-by: Jiri Slaby
Signed-off-by: Greg Kroah-Hartman
16 Jan, 2013
3 commits
-
Now, we start converting tty buffer functions to actually use
tty_port. This will allow us to get rid of the need of tty in many
call sites. Only tty_port will needed and hence no more
tty_port_tty_get in those paths.This is the last one: tty_schedule_flip
Signed-off-by: Jiri Slaby
Signed-off-by: Greg Kroah-Hartman -
Now, we start converting tty buffer functions to actually use
tty_port. This will allow us to get rid of the need of tty in many
call sites. Only tty_port will needed and hence no more
tty_port_tty_get in those paths.Now, the one where most of tty_port_tty_get gets removed:
tty_flip_buffer_push.IOW we also closed all the races in drivers not using tty_port_tty_get
at all yet.Also we move tty_flip_buffer_push declaration from include/linux/tty.h
to include/linux/tty_flip.h to all others while we are changing it
anyway.Signed-off-by: Jiri Slaby
Signed-off-by: Greg Kroah-Hartman -
Now, we start converting tty buffer functions to actually use
tty_port. This will allow us to get rid of the need of tty in many
call sites. Only tty_port will needed and hence no more
tty_port_tty_get in those paths.tty_insert_flip_char is the next one to proceed. This one is used all
over the code, so the patch is huge.Signed-off-by: Jiri Slaby
Signed-off-by: Greg Kroah-Hartman
17 Nov, 2012
1 commit
-
Modify qt_status_change_check() and delete qt_status_change().
Signed-off-by: YAMANE Toshiaki
Acked-by: Dan Carpenter
Signed-off-by: Greg Kroah-Hartman
14 Nov, 2012
4 commits
-
Modified to eliminate the deep nesting.
Signed-off-by: YAMANE Toshiaki
Signed-off-by: Greg Kroah-Hartman -
Modified to eliminate the deep nesting.
Signed-off-by: YAMANE Toshiaki
Signed-off-by: Greg Kroah-Hartman -
Modified to eliminate the deep nesting and redundant description.
Signed-off-by: YAMANE Toshiaki
Signed-off-by: Greg Kroah-Hartman -
Fixed a description of the procedure call dev_dbg().
Signed-off-by: YAMANE Toshiaki
Signed-off-by: Greg Kroah-Hartman
02 Oct, 2012
2 commits
-
Pull USB changes from Greg Kroah-Hartman:
"Here is the big USB pull request for 3.7-rc1There are lots of gadget driver changes (including copying a bunch of
files into the drivers/staging/ccg/ directory so that the other gadget
drivers can be fixed up properly without breaking that driver), and we
remove the old obsolete ub.c driver from the tree.There are also the usual XHCI set of updates, and other various driver
changes and updates. We also are trying hard to remove the old dbg()
macro, but the final bits of that removal will be coming in through
the networking tree before we can delete it for good.All of these patches have been in the linux-next tree.
Signed-off-by: Greg Kroah-Hartman "
Fix up several annoying - but fairly mindless - conflicts due to the
termios structure having moved into the tty device, and often clashing
with dbg -> dev_dbg conversion.* tag 'usb-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (339 commits)
USB: ezusb: move ezusb.c from drivers/usb/serial to drivers/usb/misc
USB: uas: fix gcc warning
USB: uas: fix locking
USB: Fix race condition when removing host controllers
USB: uas: add locking
USB: uas: fix abort
USB: uas: remove aborted field, replace with status bit.
USB: uas: fix task management
USB: uas: keep track of command urbs
xhci: Intel Panther Point BEI quirk.
powerpc/usb: remove checking PHY_CLK_VALID for UTMI PHY
USB: ftdi_sio: add TIAO USB Multi-Protocol Adapter (TUMPA) support
Revert "usb : Add sysfs files to control port power."
USB: serial: remove vizzini driver
usb: host: xhci: Fix Null pointer dereferencing with 71c731a for non-x86 systems
Increase XHCI suspend timeout to 16ms
USB: ohci-at91: fix null pointer in ohci_hcd_at91_overcurrent_irq
USB: sierra_ms: don't keep unused variable
fsl/usb: Add support for USB controller version 2.4
USB: qcaux: add Pantech vendor class match
... -
Pull TTY changes from Greg Kroah-Hartman:
"As we skipped the merge window for 3.6-rc1 for the tty tree,
everything is now settled down and working properly, so we are ready
for 3.7-rc1. Here's the patchset, it's big, but the large changes are
removing a firmware file and adding a staging tty driver (it depended
on the tty core changes, so it's going through this tree instead of
the staging tree.)All of these patches have been in the linux-next tree for a while.
Signed-off-by: Greg Kroah-Hartman "
Fix up more-or-less trivial conflicts in
- drivers/char/pcmcia/synclink_cs.c:
tty NULL dereference fix vs tty_port_cts_enabled() helper function
- drivers/staging/{Kconfig,Makefile}:
add-add conflict (dgrp driver added close to other staging drivers)
- drivers/staging/ipack/devices/ipoctal.c:
"split ipoctal_channel from iopctal" vs "TTY: use tty_port_register_device"* tag 'tty-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (235 commits)
tty/serial: Add kgdb_nmi driver
tty/serial/amba-pl011: Quiesce interrupts in poll_get_char
tty/serial/amba-pl011: Implement poll_init callback
tty/serial/core: Introduce poll_init callback
kdb: Turn KGDB_KDB=n stubs into static inlines
kdb: Implement disable_nmi command
kernel/debug: Mask KGDB NMI upon entry
serial: pl011: handle corruption at high clock speeds
serial: sccnxp: Make 'default' choice in switch last
serial: sccnxp: Remove mask termios caps for SW flow control
serial: sccnxp: Report actual baudrate back to core
serial: samsung: Add poll_get_char & poll_put_char
Powerpc 8xx CPM_UART setting MAXIDL register proportionaly to baud rate
Powerpc 8xx CPM_UART maxidl should not depend on fifo size
Powerpc 8xx CPM_UART too many interrupts
Powerpc 8xx CPM_UART desynchronisation
serial: set correct baud_base for EXSYS EX-41092 Dual 16950
serial: omap: fix the reciever line error case
8250: blacklist Winbond CIR port
8250_pnp: do pnp probe before legacy probe
...
18 Sep, 2012
2 commits
-
Now that all usb-serial modules are only using dev_dbg()
the debug module parameter does not do anything at all, so
remove it to reduce any confusion if someone were to try to
use it.CC: Rusty Russell
CC: Alan Stern
CC: Mauro Carvalho Chehab
CC: "Justin P. Mattock"
Signed-off-by: Greg Kroah-Hartman -
dbg() was a very old USB-serial-specific macro.
This patch removes it from being used in the
driver and uses dev_dbg() instead.Signed-off-by: Greg Kroah-Hartman
05 Sep, 2012
1 commit
-
the port was kzalloced but the print statement says that its kmalloc.
Signed-off-by: Devendra Naga
Signed-off-by: Greg Kroah-Hartman
16 Aug, 2012
4 commits
-
These are void functions and they dont need return at the end of the function
Signed-off-by: Devendra Naga
Signed-off-by: Greg Kroah-Hartman -
in qt_tiocmset,
the retval gets assigned if we have a valid serial pointer in the critical section
(between mutex_lock and _unlock) of the code, no need to initialise this variable.the same retval assignment follows in the qt_tiocmget function also, so remove the
initialisation here too.Signed-off-by: Devendra Naga
Signed-off-by: Greg Kroah-Hartman -
this return is in the end of the qt_throttle function, so this return
not neededSigned-off-by: Devendra Naga
Signed-off-by: Greg Kroah-Hartman -
this return is at the end of the void function qt_unthrottle, which is
not needed, and also remove the new line below this.Signed-off-by: Devendra Naga
Signed-off-by: Greg Kroah-Hartman
11 Aug, 2012
1 commit
-
Fix the termios stuff but while we are at it do something about the rest of
itSigned-off-by: Alan Cox
Signed-off-by: Greg Kroah-Hartman
19 Jun, 2012
1 commit
-
Fixes some typos that was found while reading through staging/serqt_usb2
Signed-off-by: Justin P. Mattock
Signed-off-by: Greg Kroah-Hartman
11 May, 2012
1 commit
-
There are a number of device ids that the quatech2 driver supports that
are duplicated in the serqt_usb2 driver, so remove them from the
serqt_usb2 driver as they do not belong there.Reported-by: Bill Pemberton
Signed-off-by: Greg Kroah-Hartman
09 May, 2012
1 commit
-
This reworks the usb_serial_register_drivers() and
usb_serial_deregister_drivers() to not need a pointer to a struct
usb_driver anymore. The usb_driver structure is now created dynamically
and registered and unregistered as needed.This saves lines of code in each usb-serial driver. All in-kernel users
of these functions were also fixed up at this time. The pl2303 driver
was tested that everything worked properly.Thanks for the idea to do this from Alan Stern.
Cc: Adhir Ramjiawan
Cc: Alan Stern
Cc: Al Borchers
Cc: Aleksey Babahin
Cc: Andrew Morton
Cc: Andrew Worsley
Cc: Bart Hartgers
Cc: Bill Pemberton
Cc: Dan Carpenter
Cc: Dan Williams
Cc: Donald Lee
Cc: Eric Dumazet
Cc: "Eric W. Biederman"
Cc: Felipe Balbi
Cc: Gary Brubaker
Cc: Jesper Juhl
Cc: Jiri Kosina
Cc: Johan Hovold
Cc: Julia Lawall
Cc: Kautuk Consul
Cc: Kuninori Morimoto
Cc: Lonnie Mendez
Cc: Matthias Bruestle and Harald Welte
Cc: Matthias Urlichs
Cc: Mauro Carvalho Chehab
Cc: Michal Sroczynski
Cc: "Michał Wróbel"
Cc: Oliver Neukum
Cc: Paul Gortmaker
Cc: Peter Berger
Cc: Preston Fick
Cc: "Rafael J. Wysocki"
Cc: Rigbert Hamisch
Cc: Rusty Russell
Cc: Simon Arlott
Cc: Support Department
Cc: Thomas Tuttle
Cc: Uwe Bonnes
Cc: Wang YanQing
Cc: William Greathouse
Signed-off-by: Greg Kroah-Hartman
08 May, 2012
2 commits
-
This is now set by the usb-serial core, no need for the driver to
individually set it.Thanks to Alan Stern for the idea to get rid of it.
Cc: William Greathouse
Cc: Matthias Bruestle and Harald Welte
Cc: Lonnie Mendez
Cc: Peter Berger
Cc: Al Borchers
Cc: Gary Brubaker
Cc: Oliver Neukum
Cc: Matthias Urlichs
Cc: Support Department
Cc: Rusty Russell
Cc: Alan Stern
Cc: Mauro Carvalho Chehab
Cc: Kautuk Consul
Cc: Bill Pemberton
Cc: Paul Gortmaker
Cc: Bart Hartgers
Cc: Johan Hovold
Cc: Preston Fick
Cc: Uwe Bonnes
Cc: Simon Arlott
Cc: Andrew Worsley
Cc: "Michał Wróbel"
Cc: Andrew Morton
Cc: Eric Dumazet
Cc: "Eric W. Biederman"
Cc: Felipe Balbi
Cc: Aleksey Babahin
Cc: Dan Carpenter
Cc: Jiri Kosina
Cc: Donald Lee
Cc: Julia Lawall
Cc: Michal Sroczynski
Cc: Wang YanQing
Cc: Dan Williams
Cc: Thomas Tuttle
Cc: Rigbert Hamisch
Cc: "Rafael J. Wysocki"
Cc: Kuninori Morimoto
Cc: Jesper Juhl
Cc: Adhir Ramjiawan
Signed-off-by: Greg Kroah-Hartman -
This is now set by the usb-serial core, no need for the driver to
individually set it.Thanks to Alan Stern for the idea to get rid of it.
Cc: William Greathouse
Cc: Matthias Bruestle and Harald Welte
Cc: Lonnie Mendez
Cc: Peter Berger
Cc: Al Borchers
Cc: Gary Brubaker
Cc: Oliver Neukum
Cc: Matthias Urlichs
Cc: Support Department
Cc: Rusty Russell
Cc: Alan Stern
Cc: Mauro Carvalho Chehab
Cc: Kautuk Consul
Cc: Bill Pemberton
Cc: Paul Gortmaker
Cc: Bart Hartgers
Cc: Johan Hovold
Cc: Preston Fick
Cc: Uwe Bonnes
Cc: Simon Arlott
Cc: Andrew Worsley
Cc: "Michał Wróbel"
Cc: Andrew Morton
Cc: Eric Dumazet
Cc: "Eric W. Biederman"
Cc: Felipe Balbi
Cc: Aleksey Babahin
Cc: Dan Carpenter
Cc: Jiri Kosina
Cc: Donald Lee
Cc: Julia Lawall
Cc: Michal Sroczynski
Cc: Wang YanQing
Cc: Dan Williams
Cc: Thomas Tuttle
Cc: Rigbert Hamisch
Cc: "Rafael J. Wysocki"
Cc: Kuninori Morimoto
Cc: Jesper Juhl
Cc: Adhir Ramjiawan
Signed-off-by: Greg Kroah-Hartman
05 May, 2012
1 commit
-
dbg() was used a lot a long time ago to trace code flow. Now that we have
ftrace, this isn't needed at all, so remove these calls.CC: Bill Pemberton
CC: Rusty Russell
CC: Alan Stern
CC: Mauro Carvalho Chehab
Signed-off-by: Greg Kroah-Hartman
25 Apr, 2012
1 commit
-
err() was a very old USB-specific macro that I thought had
gone away. This patch removes it from being used in the
driver and uses dev_err() instead.Cc: Bill Pemberton
Cc: Rusty Russell
Cc: Alan Stern
Cc: Mauro Carvalho Chehab
Signed-off-by: Greg Kroah-Hartman
29 Feb, 2012
1 commit
-
This converts the serqt_usb2.c driver to use the module_usb_serial_driver() call
instead of having to have a module_init/module_exit function, saving a lot
of duplicated code.CC: Bill Pemberton
CC: Rusty Russell
CC: Alan Stern
CC: Mauro Carvalho Chehab
Signed-off-by: Greg Kroah-Hartman
25 Feb, 2012
1 commit
-
This patch (as1530) modifies the following usb-serial drivers from
drivers/staging to utilize the new usb_serial_{de}register_drivers()
routines:quatech_usb2 and serqt_usb2.
Signed-off-by: Alan Stern
Signed-off-by: Greg Kroah-Hartman
13 Jan, 2012
1 commit
-
module_param(bool) used to counter-intuitively take an int. In
fddd5201 (mid-2009) we allowed bool or int/unsigned int using a messy
trick.It's time to remove the int/unsigned int option. For this version
it'll simply give a warning, but it'll break next kernel version.Acked-by: Mauro Carvalho Chehab
Signed-off-by: Rusty Russell
30 Aug, 2011
1 commit
-
The serqt_usb2 driver will not work properly with the ssu100 device
even though it claims to support it. The ssu100 is supported by the
ssu100 driver in mainline so there is no need to have it claimed by
serqt_usb2.Signed-off-by: Bill Pemberton
Cc: stable
Signed-off-by: Greg Kroah-Hartman
24 Aug, 2011
1 commit
-
The patch replaces spinlock with mutex.
Found by Linux Driver Verification project (linuxtesting.org).
Signed-off-by: Alexey Khoroshilov
Signed-off-by: Greg Kroah-Hartman
17 Mar, 2011
1 commit
-
* 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (961 commits)
staging: hv: fix memory leaks
staging: hv: Remove NULL check before kfree
Staging: hv: Get rid of vmbus_child_dev_add()
Staging: hv: Change the signature for vmbus_child_device_register()
Staging: hv: Get rid of vmbus_cleanup() function
Staging: hv: Get rid of vmbus_dev_rm() function
Staging: hv: Change the signature for vmbus_on_isr()
Staging: hv: Eliminate vmbus_event_dpc()
Staging: hv: Get rid of the function vmbus_msg_dpc()
Staging: hv: Change the signature for vmbus_cleanup()
Staging: hv: Simplify root device management
staging: rtl8192e: Don't copy dev pointer to skb
staging: rtl8192e: Pass priv to cmdpkt functions
staging: rtl8192e: Pass priv to firmware download functions
staging: rtl8192e: Pass priv to rtl8192_interrupt
staging: rtl8192e: Pass rtl8192_priv to dm functions
staging: rtl8192e: Pass ieee80211_device to callbacks
staging: rtl8192e: Pass ieee80211_device to callbacks
staging: rtl8192e: Pass ieee80211_device to callbacks
staging: rtl8192e: Pass ieee80211_device to callbacks
...
15 Mar, 2011
1 commit
-
This patch was generated by the following semantic patch:
//
@@ expression E; @@
- if (E != NULL) { kfree(E); }
+ kfree(E);@@ expression E; @@
- if (E != NULL) { kfree(E); E = NULL; }
+ kfree(E);
+ E = NULL;
//Signed-off-by: Ilia Mirkin
Signed-off-by: Greg Kroah-Hartman
18 Feb, 2011
2 commits
-
We don't use it so we can trim it from here as we try and stamp the file
object dependencies out of the serial code.Signed-off-by: Alan Cox
Signed-off-by: Greg Kroah-Hartman -
Doing tiocmget was such fun we should do tiocmset as well for the same
reasonsSigned-off-by: Alan Cox
Signed-off-by: Greg Kroah-Hartman