linux.git/include/pcmcia/cs.h, branch master

pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device

2010-09-29T15:20:23+00:00

pcmcia_enable_device() now replaces pcmcia_request_configuration().
Instead of config_req_t, all necessary flags are either passed as
a parameter to pcmcia_enable_device(), or (in rare circumstances)
set in struct pcmcia_device -> flags.

With the last remaining user of include/pcmcia/cs.h gone, remove
all references.

CC: netdev@vger.kernel.org
CC: linux-wireless@vger.kernel.org
CC: linux-ide@vger.kernel.org
CC: linux-usb@vger.kernel.org
CC: laforge@gnumonks.org
CC: linux-mtd@lists.infradead.org
CC: alsa-devel@alsa-project.org
CC: linux-serial@vger.kernel.org
CC: Jiri Kosina 
CC: linux-scsi@vger.kernel.org
Acked-by: Gustavo F. Padovan  (for drivers/bluetooth)
Tested-by: Wolfram Sang 
Signed-off-by: Dominik Brodowski

pcmcia: move config_{base,index,regs} to struct pcmcia_device

2010-09-29T15:20:22+00:00

Several drivers prefer to explicitly set config_{base,index,regs},
formerly known as ConfigBase, ConfigIndex and Present. Instead of
passing these values inside config_req_t, store it in struct
pcmcia_device.

CC: netdev@vger.kernel.org
CC: linux-wireless@vger.kernel.org
CC: linux-ide@vger.kernel.org
CC: linux-usb@vger.kernel.org
CC: laforge@gnumonks.org
CC: linux-mtd@lists.infradead.org
CC: alsa-devel@alsa-project.org
CC: linux-serial@vger.kernel.org
CC: Jiri Kosina 
CC: linux-scsi@vger.kernel.org
Acked-by: Gustavo F. Padovan  (for drivers/bluetooth)
Tested-by: Wolfram Sang 
Signed-off-by: Dominik Brodowski

pcmcia: simplify IntType

2010-09-29T15:20:22+00:00

IntType was only set to INT_MEMORY (driver pcmciamtd) or INT_MEMORY_AND_IO
(all other drivers). As this flags seems to relate to ioport access, make
it conditional to the driver having requested IO port access. There are two
drivers which do not request IO ports, but did set INT_MEMORY_AND_IO:
ray_cs and b43. For those, we consistently only set INT_MEMORY in future.

CC: netdev@vger.kernel.org
CC: linux-wireless@vger.kernel.org
CC: linux-ide@vger.kernel.org
CC: linux-usb@vger.kernel.org
CC: laforge@gnumonks.org
CC: linux-mtd@lists.infradead.org
CC: alsa-devel@alsa-project.org
CC: linux-serial@vger.kernel.org
CC: Jiri Kosina 
CC: linux-scsi@vger.kernel.org
Acked-by: Gustavo F. Padovan  (for drivers/bluetooth)
Tested-by: Wolfram Sang 
Signed-off-by: Dominik Brodowski

pcmcia: simplify Status, ExtStatus register access

2010-09-29T15:20:22+00:00

The Status (CISREG_CCSR) and ExtStatus (CISREG_ESR) registers were
only accessed to enable audio output for some drivers and IRQ for
serial_cs.c. The former also required setting config_req_t.Attributes
to CONF_ENABLE_SPKR; the latter can be simplified to setting this
field to CONF_ENABLE_ESR.

CC: netdev@vger.kernel.org
CC: linux-wireless@vger.kernel.org
CC: linux-serial@vger.kernel.org
CC: linux-scsi@vger.kernel.org
Tested-by: Wolfram Sang 
Signed-off-by: Dominik Brodowski

pcmcia: remove Pin, Copy configuration register access

2010-09-29T15:20:21+00:00

The "Pin" and "Copy" configuration registers (CISREG_SCR, CISREG_PPR)
do not seem to be utilized anywhere. If a device would request a
write to these registers, "0" would be written. Continue to do so, but
warn of unexpected behavior -- and remove the "Pin" and "Copy" entries
from config_req_t.

Tested-by: Wolfram Sang 
Signed-off-by: Dominik Brodowski

pcmcia: move Vpp setup to struct pcmcia_device

2010-09-29T15:20:21+00:00

Some drivers prefer to explicitly set Vpp. Instead of passing the
voltage inside config_req_t, store it in struct pcmcia_device.

CC: linux-ide@vger.kernel.org
CC: netdev@vger.kernel.org
CC: linux-mtd@lists.infradead.org
CC: linux-wireless@vger.kernel.org
CC: linux-serial@vger.kernel.org
CC: linux-usb@vger.kernel.org
CC: linux-scsi@vger.kernel.org
Acked-by: Gustavo F. Padovan  (for drivers/bluetooth)
Tested-by: Wolfram Sang 
Signed-off-by: Dominik Brodowski

pcmcia: split up modify_configuration() into two fixup functions

2010-09-29T15:20:21+00:00

pcmcia_modify_configuration() was only used by two drivers to fix up
one issue each: setting the Vpp to a different value, and reducing
the IO width to 8 bit. Introduce two explicitly named functions
handling these things, and remove one further typedef.

CC: netdev@vger.kernel.org
CC: linux-mtd@lists.infradead.org
Tested-by: Wolfram Sang 
Signed-off-by: Dominik Brodowski

pcmcia: do not use win_req_t when calling pcmcia_request_window()

2010-09-29T15:20:21+00:00

Instead of win_req_t, drivers are now requested to fill out
struct pcmcia_device *p_dev->resource[2,3,4,5] for up to four iomem
ranges. After a call to pcmcia_request_window(), the windows found there
are reserved and may be used until pcmcia_release_window() is called.

CC: netdev@vger.kernel.org
CC: linux-wireless@vger.kernel.org
CC: linux-mtd@lists.infradead.org
CC: Jiri Kosina 
CC: linux-scsi@vger.kernel.org
Tested-by: Wolfram Sang 
Signed-off-by: Dominik Brodowski

pcmcia: use struct resource for PCMCIA devices, part 2

2010-08-03T07:04:16+00:00

Use struct resource * also for iomem resources.

CC: linux-mtd@lists.infradead.org
CC: netdev@vger.kernel.org
CC: linux-wireless@vger.kernel.org
CC: Jiri Kosina 
Signed-off-by: Dominik Brodowski

pcmcia: remove memreq_t

2010-08-03T07:04:14+00:00

Page already had to be set to 0; Offset can easily be passed as
parameter to pcmcia_map_mem_page.

CC: netdev@vger.kernel.org
CC: linux-wireless@vger.kernel.org
CC: linux-ide@vger.kernel.org
CC: linux-usb@vger.kernel.org
CC: laforge@gnumonks.org
CC: linux-mtd@lists.infradead.org
CC: linux-bluetooth@vger.kernel.org
CC: alsa-devel@alsa-project.org
CC: linux-serial@vger.kernel.org
CC: Michael Buesch 
Signed-off-by: Dominik Brodowski