Instead of the two status values struct pcmcia_device->p_state and state,
use descriptive bitfields. Most value-checking in drivers was invalid, as
the core now only calls the ->remove() (a.k.a. detach) function in case the
attachement _and_ configuration was successful.
Signed-off-by: NDominik Brodowski <linux@dominikbrodowski.net>

Remove the unused DEV_RELEASE_PENDING flag, and move the DEV_SUSPEND flag
into the p_dev structure, and make use of it at the core level.
Signed-off-by: NDominik Brodowski <linux@dominikbrodowski.net>

We can now make pcmcia_release_{io,irq} static.
Signed-off-by: NAdrian Bunk <bunk@stusta.de>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NDominik Brodowski <linux@dominikbrodowski.net>

dev_link_t * and client_handle_t both mean struct pcmcai_device * by now.
Therefore, remove all such indirections.
Signed-off-by: NDominik Brodowski <linux@dominikbrodowski.net>

Embed dev_link_t into struct pcmcia_device(), as they basically address the
same entity. The actual contents of dev_link_t will be cleaned up step by step.
This patch includes a bugfix from and signed-off-by Andrew Morton.
Signed-off-by: NDominik Brodowski <linux@dominikbrodowski.net>

Rename pcmcia_device.state (which is used in very few places) to p_state
in order to avoid a namespace collision when moving the deprecated
dev_link_t into struct pcmcia_device
Signed-off-by: NDominik Brodowski <linux@dominikbrodowski.net>

As we do not allow setting Vcc in the pcmcia core, and Vpp1 and
Vpp2 can only be set to the same value, a lot of code can be
streamlined.
Signed-off-by: NDominik Brodowski <linux@dominikbrodowski.net>

Handle the _modifying_ operation sm91c92_cs requires in
pcmcia_modify_configuration, so that the only remaining users
of pcmcia_release_configuration() are within the pcmcia core
module.
Signed-off-by: NDominik Brodowski <linux@dominikbrodowski.net>

In all but one case, the suspend and resume functions of PCMCIA drivers
contain mostly of calls to pcmcia_release_configuration() and
pcmcia_request_configuration(). Therefore, move this code out of the
drivers and into the core.
Signed-off-by: NDominik Brodowski <linux@dominikbrodowski.net>

Convert the remaining drivers which use pcmcia_release_io or
pcmcia_release_irq, and remove the EXPORT of these symbols.
Signed-off-by: NDominik Brodowski <linux@dominikbrodowski.net>

pcmcia_disable_device(struct pcmcia_device *p_dev) performs the necessary
cleanups upon device or driver removal: it calls the appropriate
pcmcia_release_* functions, and can replace (most) of the current drivers'
_release() functions.
Signed-off-by: NDominik Brodowski <linux@dominikbrodowski.net>

This patch adds support for the Compact Flash controller integrated in
the Atmel AT91RM9200 processor.

Signed-off-by: Andrew Victor <andrew@sanpeople.com
Signed-off-by: NDominik Brodowski <linux@dominikbrodowski.net>

socket.functions is the number of functions, and so must be one larger
than the maximum function number.
Signed-off-by: NDominik Brodowski <linux@dominikbrodowski.net>

BasePort, NumPorts and Attributes are or can be embedded in
struct resource, so remove them.
Signed-off-by: NDominik Brodowski <linux@dominikbrodowski.net>

If the kernel is configured to not include the deprecated PCMCIA ioctl,
some code doesn't need to be built.
Signed-off-by: NDominik Brodowski <linux@dominikbrodowski.net>

Remove the compatibility wrappers, as they can (now) also be implemented
using macros. Please continue using these wrappers instead of new functions
until a new API has stabilized.
Signed-off-by: NDominik Brodowski <linux@dominikbrodowski.net>

Remove the inclusion of include/config.h as it isn't needed any longer.
Signed-off-by: NDominik Brodowski <linux@dominikbrodowski.net>

Use mutexes in the PCMICA core, as they suffice for what needs to be done.
Includes a bugfix from and Signed-off-by Andrew Morton.
Signed-off-by: NDominik Brodowski <linux@dominikbrodowski.net>

Handle config_t structs independent of struct pcmcia_socket, and add
reference counting for them.
Signed-off-by: NDominik Brodowski <linux@dominikbrodowski.net>

Update the remaining users using the static lookup table of the PCMCIA
function configuration to use the struct pcmcia_device-contained pointer.
Signed-off-by: NDominik Brodowski <linux@dominikbrodowski.net>

Access the PCMCIA config_t struct (one per device function) using
a pointer in struct pcmcia_device, instead of looking them up in
an array.
Signed-off-by: NDominik Brodowski <linux@dominikbrodowski.net>

config_t.Present is set to the same value as CardValues, which isn't modified
anywhere. Therefore, we can use only one of these two objects.
Signed-off-by: NDominik Brodowski <linux@dominikbrodowski.net>

For some time, the core pcmcia drivers seem not to think single
character prod_ids are valid, thus preventing the "cleverly" named

  "D" "Link DWL-650 11Mbps WLAN Card"

Before (as in 2.6.16):
PRODID_1=""
PRODID_2="Link DWL-650 11Mbps WLAN Card"
PRODID_3="Version 01.02"
PRODID_4=""
MANFID=0156,0002
FUNCID=6

After (with the patch)
PRODID_1="D"
PRODID_2="Link DWL-650 11Mbps WLAN Card"
PRODID_3="Version 01.02"
PRODID_4=""
MANFID=0156,0002
FUNCID=6
Signed-off-by: NJanos Farkas <chexum@gmail.com>
Signed-off-by: NDominik Brodowski <linux@dominikbrodowski.net>

platform_get_irq*() now returns on -ENXIO when the resource cannot be
found.  Ensure all users of platform_get_irq*() handle this error
appropriately.
Signed-off-by: NDavid Vrabel <dvrabel@arcom.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

Fix pcmcia_device_probe NULL pointer dereference at startup.
Signed-off-by: NHugh Dickins <hugh@veritas.com>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

The second pseudo multi-function device of a PCMCIA card may only be
configured once the first one is initialized. Therefore, delay the
registration of the second device until the first one is initialized.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net

Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

With the "power/state" sysfs interface being deprecated, make another
one available which is compatible to what was discussed on the linux
PM mailinglist.
Signed-off-by: NDominik Brodowski <linux@dominikbrodowski.net>

Patch from Richard Purdie

Change mainstone and sharpsl pxa2xx pcmcia drivers to use
platform_device_alloc which fixes a memory leak.
Signed-off-by: NRichard Purdie <rpurdie@rpsys.net>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>

Signed-off-by: NRalf Baechle <ralf@linux-mips.org>

Replace obsolete pci_module_init() with pci_register_driver().
Signed-off-by: NRichard Knutsson <ricknu-0@student.ltu.se>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>

kill the socket_shutdown()/shutdown_socket() confusion by making it
one single function. move cs_socket_put() in there. nicer to read and
smaller:

original:
   text	   data	    bss	    dec	    hex	filename
  25181	   1076	     32	  26289	   66b1	drivers/pcmcia/pcmcia_core.ko

patched:
   text	   data	    bss	    dec	    hex	filename
  24973	   1076	     32	  26081	   65e1	drivers/pcmcia/pcmcia_core.ko
Signed-off-by: NDaniel Ritz <daniel.ritz@gmx.ch>
Signed-off-by: NDominik Brodowski <linux@dominikbrodowski.net>

Signed-off-by: NAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: NDominik Brodowski <linux@dominikbrodowski.net>

Convert users of kmalloc and memset to kzalloc
Signed-off-by: NDominik Brodowski <linux@dominikbrodowski.net>

Do not wildly probe the IO ports we're trying to use on PARISC.
Signed-off-by: NDominik Brodowski <linux@dominikbrodowski.net>

Export the stored values instead of re-reading everything in the socket
information sysfs files, and make them accessible to all users, not only
to root.
Signed-off-by: NDominik Brodowski <linux@dominikbrodowski.net>

This adds PCMCIA support for both MPC885ADS and MPC866ADS.

This is established not together with FADS, because 885 does not have
io_block_mapping() for BCSR area.
Also, some cleanups done both for 885ADS and MBX.
Signed-off-by: NVitaly Bordug <vbordug@ru.mvista.com>
Signed-off-by: NMarcelo Tosatti <marcelo.tosatti@cyclades.com>
Signed-off-by: NDominik Brodowski <linux@dominikbrodowski.net>

This fixes misconfiguration that could result in odd work of some old CF
cards.
Signed-off-by: NVitaly Bordug <vbordug@ru.mvista.com>
Signed-off-by: NMarcelo Tosatti <marcelo.tosatti@cyclades.com>
Signed-off-by: NDominik Brodowski <linux@dominikbrodowski.net>

Some PCMCIA sockets have statically mapped memory windows, but dynamically
mapped IO windows. Using the "nonstatic" socket library is inpractical for
them, as they do neither need a resource database (as we can trust the
kernel resource database on m68k and ppc) nor lots of other features of that
library. Let them get a small "iodyn" socket library (105 lines of code)
instead.
Signed-off-by: NDominik Brodowski <linux@dominikbrodowski.net>

Unify the EVENT_CARD_INSERTION and "attach" callbacks to one unified
probe() callback. As all in-kernel drivers are changed to this new
callback, there will be no temporary backwards-compatibility. Inside a
probe() function, each driver _must_ set struct pcmcia_device
*p_dev->instance and instance->handle correctly.

With these patches, the basic driver interface for 16-bit PCMCIA drivers
now has the classic four callbacks known also from other buses:

        int (*probe)            (struct pcmcia_device *dev);
        void (*remove)          (struct pcmcia_device *dev);

        int (*suspend)          (struct pcmcia_device *dev);
        int (*resume)           (struct pcmcia_device *dev);
Signed-off-by: NDominik Brodowski <linux@dominikbrodowski.net>