* [git pull] PCMCIA fixes for 2.6.32
@ 2009-10-24 8:24 Dominik Brodowski
2009-10-24 19:25 ` [git pull - v2] " Dominik Brodowski
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Dominik Brodowski @ 2009-10-24 8:24 UTC (permalink / raw)
To: torvalds, akpm; +Cc: linux-pcmcia, linux-kernel
Linus,
some PCMCIA bugfixes for 2.6.32 are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6/ urgent
Please pull from that location. The diffstat and list of changes follows,
the individual diffs are sent (at least) to the linux-pcmcia list.
Thanks,
Dominik
----
Dominik Brodowski (2):
pcmcia: pccard_read_tuple and TUPLE_RETURN_COMMON cleanup
pcmcia: do not try to store more than 4 version strings
Frans Pop (1):
pcmcia: properly close previous dev_printk if kzalloc fails in do_io_probe
Komuro (1):
pcmcia: do not load the pd6729 driver if io_base is 0
Randy Dunlap (1):
pcmcia: fix controller printk format warnings
Wolfram Sang (1):
pcmcia: Fix possible printk format warnings
----
drivers/pcmcia/cistpl.c | 20 +++++++++++---------
drivers/pcmcia/cs_internal.h | 3 +--
drivers/pcmcia/ds.c | 8 ++++----
drivers/pcmcia/i82365.c | 4 ++--
drivers/pcmcia/m32r_cfc.c | 10 ++++++----
drivers/pcmcia/m32r_pcc.c | 10 ++++++----
drivers/pcmcia/m8xx_pcmcia.c | 15 +++++++++------
drivers/pcmcia/pcmcia_ioctl.c | 2 +-
drivers/pcmcia/pd6729.c | 6 ++++++
drivers/pcmcia/rsrc_nonstatic.c | 3 ++-
drivers/pcmcia/soc_common.c | 5 +++--
drivers/pcmcia/socket_sysfs.c | 2 +-
drivers/pcmcia/tcic.c | 4 ++--
13 files changed, 54 insertions(+), 38 deletions(-)
^ permalink raw reply [flat|nested] 4+ messages in thread
* [git pull - v2] PCMCIA fixes for 2.6.32
2009-10-24 8:24 [git pull] PCMCIA fixes for 2.6.32 Dominik Brodowski
@ 2009-10-24 19:25 ` Dominik Brodowski
2009-12-03 8:02 ` [git pull] PCMCIA updates for 2.6.33 Dominik Brodowski
2009-12-14 18:55 ` [git pull] PCMCIA updates for 2.6.33, part 2 Dominik Brodowski
2 siblings, 0 replies; 4+ messages in thread
From: Dominik Brodowski @ 2009-10-24 19:25 UTC (permalink / raw)
To: torvalds, akpm; +Cc: linux-pcmcia, linux-kernel
[ update: patch "pcmcia: do not load the pd6729 driver if io_base is NULL"
now checks for NULL and does not do any castings. Thanks to Wolfram Sang
for noticing this issue. ]
Linus,
some PCMCIA bugfixes for 2.6.32 are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6/ urgent-v2
Please pull from that location. The diffstat and list of changes follows,
the individual diffs are sent (at least) to the linux-pcmcia list.
Thanks,
Dominik
----
Dominik Brodowski (2):
pcmcia: pccard_read_tuple and TUPLE_RETURN_COMMON cleanup
pcmcia: do not try to store more than 4 version strings
Frans Pop (1):
pcmcia: properly close previous dev_printk if kzalloc fails in do_io_probe
Komuro (1):
pcmcia: do not load the pd6729 driver if io_base is NULL
Randy Dunlap (1):
pcmcia: fix controller printk format warnings
Wolfram Sang (1):
pcmcia: Fix possible printk format warnings
----
drivers/pcmcia/cistpl.c | 20 +++++++++++---------
drivers/pcmcia/cs_internal.h | 3 +--
drivers/pcmcia/ds.c | 8 ++++----
drivers/pcmcia/i82365.c | 4 ++--
drivers/pcmcia/m32r_cfc.c | 10 ++++++----
drivers/pcmcia/m32r_pcc.c | 10 ++++++----
drivers/pcmcia/m8xx_pcmcia.c | 15 +++++++++------
drivers/pcmcia/pcmcia_ioctl.c | 2 +-
drivers/pcmcia/pd6729.c | 6 ++++++
drivers/pcmcia/rsrc_nonstatic.c | 3 ++-
drivers/pcmcia/soc_common.c | 5 +++--
drivers/pcmcia/socket_sysfs.c | 2 +-
drivers/pcmcia/tcic.c | 4 ++--
13 files changed, 54 insertions(+), 38 deletions(-)
^ permalink raw reply [flat|nested] 4+ messages in thread
* [git pull] PCMCIA updates for 2.6.33
2009-10-24 8:24 [git pull] PCMCIA fixes for 2.6.32 Dominik Brodowski
2009-10-24 19:25 ` [git pull - v2] " Dominik Brodowski
@ 2009-12-03 8:02 ` Dominik Brodowski
2009-12-14 18:55 ` [git pull] PCMCIA updates for 2.6.33, part 2 Dominik Brodowski
2 siblings, 0 replies; 4+ messages in thread
From: Dominik Brodowski @ 2009-12-03 8:02 UTC (permalink / raw)
To: torvalds, akpm; +Cc: linux-pcmcia, linux-kernel
Linus,
several PCMCIA updates for 2.6.33 are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git master
Please pull from that location. The diffstat and list of changes is below.
Thanks,
Dominik
----
Avi Cohen Stuart (1):
pcmcia: correct handling for Zoomed Video registers in topic.h
Dominik Brodowski (32):
serial_cs: use pcmcia_loop_config() and pre-determined values
pcmcia: use pre-determined values
pcmcia: use pcmcia_loop_config in misc pcmcia drivers
ipwireless: make more use of pcmcia_loop_config()
pcmcia: add new CIS access helpers
pcmcia: convert net pcmcia drivers to use new CIS helpers
pcmcia: convert ssb pcmcia driver to use new CIS helpers
pcmcia: convert pcmciamtd driver to use new CIS helpers
pcmcia: remove pcmcia_get_{first,next}_tuple()
pcmcia: use dynamic debug instead of custom infrastructure
pcmcia: use dynamic debug in PCMCIA socket drivers
pcmcia: extend error reporting and debug messages in core
pcmcia: use dynamic debug infrastructure, deprecate CS_CHECK (ide)
pcmcia: deprecate CS_CHECK (bluetooth)
pcmcia: use dynamic debug infrastructure, deprecate CS_CHECK (char)
pcmcia: use dynamic debug infrastructure, deprecate CS_CHECK (isdn)
pcmcia: use dynamic debug infrastructure, deprecate CS_CHECK (net)
pcmcia: use dynamic debug infrastructure, deprecate CS_CHECK (ray-cs.c)
pcmcia: use dynamic debug infrastructure, deprecate CS_CHECK (wireless)
pcmcia: use dynamic debug infrastructure, deprecate CS_CHECK (scsi)
pcmcia: use dynamic debug infrastructure, deprecate CS_CHECK (serial_cs)
pcmcia: use dynamic debug infrastructure, deprecate CS_CHECK (sound)
pcmcia: use dynamic debug infrastructure, deprecate CS_CHECK (misc drivers)
pcmcia: remove now-defunct cs_error, pcmcia_error_{func,ret}
pcmcia: use dev_dbg and dev_print in pd6729.c
pcmcia/staging: update comedi drivers
pcmcia: autoload module pcmcia
pcmcia: move some window-related code to pcmcia_ioctl.c
pcmcia: remove unused "window_t" typedef
pcmcia: pcmcia_request_window() doesn't need a pointer to a pointer
pcmcia: remove deprecated handle_to_dev() macro
pcmcia: rework the irq_req_t typedef
Julia Lawall (1):
drivers/pcmcia: remove unnecessary kzalloc
Magnus Damm (4):
pcmcia: Pass struct pcmcia_device to pcmcia_release_window()
pcmcia: Pass struct pcmcia_device to pcmcia_map_mem_page()
pcmcia: Pass struct pcmcia_socket to pcmcia_get_mem_page()
pcmcia: Change window_handle_t logic to unsigned long
Randy Dunlap (1):
pcmcia: fix printk formats
Russell King - ARM Linux (10):
PCMCIA: soc_common: convert to a stand alone module
PCMCIA: soc_common: provide single socket add/remove functionality
PCMCIA: soc_common: push socket removal down to SoC specific support
PCMCIA: soc_common: push socket probe down into SoC specific support
PCMCIA: sa1111: wrap soc_pcmcia_socket to contain sa1111 specific data
PCMCIA: sa1111: remove duplicated initializers
PCMCIA: soc_common: constify soc_pcmcia_socket ops member
PCMCIA: soc_common: remove 'dev' member from soc_pcmcia_socket
PCMCIA: ss: allow PCI IRQs > 255
PCMCIA: stop duplicating pci_irq in soc_pcmcia_socket
Wolfram Sang (1):
pcmcia: drop already defined PCI_IDs
Documentation/pcmcia/driver-changes.txt | 12 +
drivers/ata/pata_pcmcia.c | 17 +-
drivers/bluetooth/bluecard_cs.c | 16 +-
drivers/bluetooth/bt3c_cs.c | 13 +-
drivers/bluetooth/btuart_cs.c | 13 +-
drivers/bluetooth/dtl1_cs.c | 12 +-
drivers/char/pcmcia/cm4000_cs.c | 73 ++--
drivers/char/pcmcia/cm4040_cs.c | 52 +--
drivers/char/pcmcia/ipwireless/hardware.c | 8 +-
drivers/char/pcmcia/ipwireless/main.c | 296 +++++---------
drivers/char/pcmcia/synclink_cs.c | 80 ++---
drivers/ide/ide-cs.c | 33 +-
drivers/isdn/hardware/avm/avm_cs.c | 4 -
drivers/isdn/hisax/avma1_cs.c | 28 +--
drivers/isdn/hisax/elsa_cs.c | 46 +--
drivers/isdn/hisax/sedlbauer_cs.c | 64 +--
drivers/isdn/hisax/teles_cs.c | 38 +--
drivers/mtd/maps/pcmciamtd.c | 197 +++++-----
drivers/net/pcmcia/3c574_cs.c | 90 ++---
drivers/net/pcmcia/3c589_cs.c | 102 ++---
drivers/net/pcmcia/axnet_cs.c | 56 +--
drivers/net/pcmcia/com20020_cs.c | 63 ++--
drivers/net/pcmcia/fmvj18x_cs.c | 189 ++++-----
drivers/net/pcmcia/ibmtr_cs.c | 71 ++--
drivers/net/pcmcia/nmclan_cs.c | 173 ++++-----
drivers/net/pcmcia/pcnet_cs.c | 80 ++---
drivers/net/pcmcia/smc91c92_cs.c | 340 +++++-----------
drivers/net/pcmcia/xirc2ps_cs.c | 259 +++++-------
drivers/net/wireless/airo_cs.c | 55 +--
drivers/net/wireless/atmel_cs.c | 51 +--
drivers/net/wireless/b43/pcmcia.c | 26 +--
drivers/net/wireless/hostap/hostap_cs.c | 51 +--
drivers/net/wireless/libertas/if_cs.c | 72 ++--
drivers/net/wireless/netwave_cs.c | 95 ++---
drivers/net/wireless/orinoco/orinoco_cs.c | 33 +-
drivers/net/wireless/orinoco/spectrum_cs.c | 60 ++--
drivers/net/wireless/ray_cs.c | 357 ++++++++--------
drivers/net/wireless/wavelan_cs.c | 35 +--
drivers/net/wireless/wl3501_cs.c | 74 ++---
drivers/parport/parport_cs.c | 38 +--
drivers/pcmcia/Kconfig | 42 ++-
drivers/pcmcia/Makefile | 10 +-
drivers/pcmcia/cardbus.c | 4 +-
drivers/pcmcia/cirrus.h | 10 -
drivers/pcmcia/cistpl.c | 71 +++-
drivers/pcmcia/cs.c | 67 ++--
drivers/pcmcia/cs_internal.h | 42 +--
drivers/pcmcia/ds.c | 188 ++-------
drivers/pcmcia/i82365.c | 37 +--
drivers/pcmcia/m32r_cfc.c | 105 ++---
drivers/pcmcia/m32r_pcc.c | 51 +--
drivers/pcmcia/m8xx_pcmcia.c | 40 +--
drivers/pcmcia/o2micro.h | 22 -
drivers/pcmcia/pcmcia_ioctl.c | 92 +++--
drivers/pcmcia/pcmcia_resource.c | 482 ++++++++++++++--------
drivers/pcmcia/pd6729.c | 70 ++--
drivers/pcmcia/pd6729.h | 7 -
drivers/pcmcia/pxa2xx_base.c | 94 +++--
drivers/pcmcia/pxa2xx_base.h | 3 +
drivers/pcmcia/pxa2xx_cm_x255.c | 2 +-
drivers/pcmcia/pxa2xx_cm_x270.c | 2 +-
drivers/pcmcia/pxa2xx_e740.c | 2 +-
drivers/pcmcia/pxa2xx_lubbock.c | 14 +-
drivers/pcmcia/pxa2xx_mainstone.c | 2 +-
drivers/pcmcia/pxa2xx_palmld.c | 2 +-
drivers/pcmcia/pxa2xx_palmtx.c | 2 +-
drivers/pcmcia/pxa2xx_sharpsl.c | 2 +-
drivers/pcmcia/pxa2xx_trizeps4.c | 4 +-
drivers/pcmcia/pxa2xx_viper.c | 2 +-
drivers/pcmcia/rsrc_mgr.c | 1 +
drivers/pcmcia/sa1100_assabet.c | 2 +-
drivers/pcmcia/sa1100_badge4.c | 11 +-
drivers/pcmcia/sa1100_cerf.c | 2 +-
drivers/pcmcia/sa1100_generic.c | 11 +-
drivers/pcmcia/sa1100_h3600.c | 4 +-
drivers/pcmcia/sa1100_jornada720.c | 42 +--
drivers/pcmcia/sa1100_neponset.c | 13 +-
drivers/pcmcia/sa1100_shannon.c | 2 +-
drivers/pcmcia/sa1100_simpad.c | 2 +-
drivers/pcmcia/sa1111_generic.c | 65 +++-
drivers/pcmcia/sa1111_generic.h | 17 +-
drivers/pcmcia/sa11xx_base.c | 99 +++--
drivers/pcmcia/sa11xx_base.h | 2 +
drivers/pcmcia/soc_common.c | 225 +++++------
drivers/pcmcia/soc_common.h | 10 +-
drivers/pcmcia/tcic.c | 29 +-
drivers/pcmcia/topic.h | 15 +-
drivers/scsi/pcmcia/aha152x_stub.c | 42 +--
drivers/scsi/pcmcia/fdomain_stub.c | 44 +--
drivers/scsi/pcmcia/nsp_cs.c | 8 +-
drivers/scsi/pcmcia/qlogic_stub.c | 45 +--
drivers/scsi/pcmcia/sym53c500_cs.c | 42 +--
drivers/serial/serial_cs.c | 143 ++-----
drivers/ssb/pcmcia.c | 232 ++++++-----
drivers/staging/comedi/drivers/cb_das16_cs.c | 221 +++--------
drivers/staging/comedi/drivers/das08_cs.c | 203 +++-------
drivers/staging/comedi/drivers/ni_daq_700.c | 237 ++++-------
drivers/staging/comedi/drivers/ni_daq_dio24.c | 236 ++++-------
drivers/staging/comedi/drivers/ni_labpc_cs.c | 225 ++++-------
drivers/staging/comedi/drivers/ni_mio_cs.c | 127 ++-----
drivers/staging/comedi/drivers/quatech_daqp_cs.c | 219 +++--------
drivers/telephony/ixj_pcmcia.c | 36 +-
drivers/usb/host/sl811_cs.c | 49 +--
include/linux/pci_ids.h | 2 +
include/pcmcia/cs.h | 14 +-
include/pcmcia/cs_types.h | 3 +-
include/pcmcia/ds.h | 88 ++---
include/pcmcia/ss.h | 13 +-
sound/pcmcia/pdaudiocf/pdaudiocf.c | 27 +-
sound/pcmcia/vx/vxpocket.c | 27 +-
110 files changed, 3081 insertions(+), 4597 deletions(-)
^ permalink raw reply [flat|nested] 4+ messages in thread
* [git pull] PCMCIA updates for 2.6.33, part 2
2009-10-24 8:24 [git pull] PCMCIA fixes for 2.6.32 Dominik Brodowski
2009-10-24 19:25 ` [git pull - v2] " Dominik Brodowski
2009-12-03 8:02 ` [git pull] PCMCIA updates for 2.6.33 Dominik Brodowski
@ 2009-12-14 18:55 ` Dominik Brodowski
2 siblings, 0 replies; 4+ messages in thread
From: Dominik Brodowski @ 2009-12-14 18:55 UTC (permalink / raw)
To: torvalds, akpm; +Cc: linux-pcmcia, linux-kernel, netdev, alsa-devel
Linus,
two more PCMCIA updates for 2.6.33 are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git master
Please pull from that location. The diffstat and list of changes is below,
the two patches will be sent (at least) to the linux-pcmcia list.
Thanks,
Dominik
----
The following changes since commit f40542532e96dda5506eb76badea322f2ae4731c:
Linus Torvalds (1):
Merge branch 'ixp4xx' of git://git.kernel.org/.../chris/linux-2.6
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git master
Dominik Brodowski (2):
pcmcia: remove unused IRQ_FIRST_SHARED
pcmcia: CodingStyle fixes
drivers/isdn/hardware/avm/avm_cs.c | 3 +-
drivers/isdn/hisax/avma1_cs.c | 3 +-
drivers/isdn/hisax/elsa_cs.c | 2 +-
drivers/isdn/hisax/sedlbauer_cs.c | 2 +-
drivers/isdn/hisax/teles_cs.c | 2 +-
drivers/net/pcmcia/axnet_cs.c | 2 +-
drivers/net/pcmcia/fmvj18x_cs.c | 2 +-
drivers/net/pcmcia/pcnet_cs.c | 2 +-
drivers/net/pcmcia/smc91c92_cs.c | 2 +-
drivers/net/pcmcia/xirc2ps_cs.c | 2 +-
drivers/pcmcia/Kconfig | 6 +-
drivers/pcmcia/cardbus.c | 23 ++--
drivers/pcmcia/cistpl.c | 181 ++++++++++++--------
drivers/pcmcia/cs.c | 12 +-
drivers/pcmcia/ds.c | 66 ++++----
drivers/pcmcia/pcmcia_ioctl.c | 45 +++---
drivers/pcmcia/pcmcia_resource.c | 37 +++--
drivers/pcmcia/rsrc_mgr.c | 14 +-
drivers/pcmcia/rsrc_nonstatic.c | 325 ++++++++++++++++++-----------------
drivers/pcmcia/socket_sysfs.c | 6 +-
drivers/pcmcia/yenta_socket.c | 147 +++++++++++------
include/pcmcia/cs.h | 4 +-
include/pcmcia/ds.h | 6 +-
include/pcmcia/mem_op.h | 2 +-
include/pcmcia/ss.h | 12 +-
sound/pcmcia/pdaudiocf/pdaudiocf.c | 3 +-
26 files changed, 504 insertions(+), 407 deletions(-)
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-12-14 19:00 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-10-24 8:24 [git pull] PCMCIA fixes for 2.6.32 Dominik Brodowski
2009-10-24 19:25 ` [git pull - v2] " Dominik Brodowski
2009-12-03 8:02 ` [git pull] PCMCIA updates for 2.6.33 Dominik Brodowski
2009-12-14 18:55 ` [git pull] PCMCIA updates for 2.6.33, part 2 Dominik Brodowski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).