Rusty Russell
90ab5ee941
module_param: make bool parameters really bool (drivers & misc)
...
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 <mchehab@redhat.com >
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au >
2012-01-13 09:32:20 +10:30
Linus Torvalds
f50d1d9e8d
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
...
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
pcmcia: Make struct pcmcia_device_id const, sound drivers edition
staging: pcmcia: Convert pcmcia_device_id declarations to const
pcmcia: Convert pcmcia_device_id declarations to const
pcmcia: Make declaration and uses of struct pcmcia_device_id const
pcmcia/sa1100: put sa11x0_pcmcia_hw_init[] to .devinit.data
2011-05-24 13:28:35 -07:00
Justin P. Mattock
70f23fd66b
treewide: fix a few typos in comments
...
- kenrel -> kernel
- whetehr -> whether
- ttt -> tt
- sss -> ss
Signed-off-by: Justin P. Mattock <justinmattock@gmail.com >
Signed-off-by: Jiri Kosina <jkosina@suse.cz >
2011-05-10 10:16:21 +02:00
Joe Perches
25f8f54f6e
pcmcia: Convert pcmcia_device_id declarations to const
...
Saves about 50KB of data.
Old/new size of all objects:
text data bss dec hex filename
563015 80096 130684 773795 bcea3 (TOTALS)
610916 32256 130632 773804 bceac (TOTALS)
Signed-off-by: Joe Perches <joe@perches.com >
Acked-by: Kurt Van Dijck <kurt.van.dijck@eia.be > (for drivers/net/can/softing/softing_cs.c)
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net >
2011-05-06 07:46:22 +02:00
Lucas De Marchi
25985edced
Fix common misspellings
...
Fixes generated by 'codespell' and manually reviewed.
Signed-off-by: Lucas De Marchi <lucas.demarchi@profusion.mobi >
2011-03-31 11:26:23 -03:00
matt mooney
bfbec92075
scsi: change to new flag variable
...
Replace EXTRA_CFLAGS with ccflags-y.
Signed-off-by: matt mooney <mfm@muteddisk.com >
Acked-by: WANG Cong <xiyou.wangcong@gmail.com >
Signed-off-by: Michal Marek <mmarek@suse.cz >
2011-03-17 14:05:35 +01:00
Jeff Garzik
f281233d3e
SCSI host lock push-down
...
Move the mid-layer's ->queuecommand() invocation from being locked
with the host lock to being unlocked to facilitate speeding up the
critical path for drivers who don't need this lock taken anyway.
The patch below presents a simple SCSI host lock push-down as an
equivalent transformation. No locking or other behavior should change
with this patch. All existing bugs and locking orders are preserved.
Additionally, add one parameter to queuecommand,
struct Scsi_Host *
and remove one parameter from queuecommand,
void (*done)(struct scsi_cmnd *)
Scsi_Host* is a convenient pointer that most host drivers need anyway,
and 'done' is redundant to struct scsi_cmnd->scsi_done.
Minimal code disturbance was attempted with this change. Most drivers
needed only two one-line modifications for their host lock push-down.
Signed-off-by: Jeff Garzik <jgarzik@redhat.com >
Acked-by: James Bottomley <James.Bottomley@suse.de >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-11-16 13:33:23 -08:00
Linus Torvalds
c70b5296e7
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
...
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (84 commits)
[SCSI] be2iscsi: SGE Len == 64K
[SCSI] be2iscsi: Remove premature free of cid
[SCSI] be2iscsi: More time for FW
[SCSI] libsas: fix bug for vacant phy
[SCSI] sd: Fix overflow with big physical blocks
[SCSI] st: add MTWEOFI to write filemarks without flushing drive buffer
[SCSI] libsas: Don't issue commands to devices that have been hot-removed
[SCSI] megaraid_sas: Add Online Controller Reset to MegaRAID SAS drive
[SCSI] lpfc 8.3.17: Update lpfc driver version to 8.3.17
[SCSI] lpfc 8.3.17: Replace function reset methodology
[SCSI] lpfc 8.3.17: SCSI fixes
[SCSI] lpfc 8.3.17: BSG fixes
[SCSI] lpfc 8.3.17: SLI Additions and Fixes
[SCSI] lpfc 8.3.17: Code Cleanup and Locking fixes
[SCSI] zfcp: Remove scsi_cmnd->serial_number from debug traces
[SCSI] ipr: fix array error logging
[SCSI] aha152x: enable PCMCIA on 64bit
[SCSI] scsi_dh_alua: Handle all states correctly
[SCSI] cxgb4i: connection and ddp setting update
[SCSI] cxgb3i: fixed connection over vlan
...
2010-10-22 17:34:15 -07:00
Jiri Slaby
4ebcfb929b
[SCSI] aha152x: enable PCMCIA on 64bit
...
It was disabled when x86_64 was introduced, but it is reported to be
working on 64bit by two different people, so let's enable it back
again.
Signed-off-by: Jiri Slaby <jslaby@suse.cz >
Cc: "Juergen E. Fischer" <fischer@norbit.de >
Signed-off-by: James Bottomley <James.Bottomley@suse.de >
2010-10-07 17:23:33 -05:00
Dominik Brodowski
2262054e74
pcmcia: remove obsolete and wrong comments
...
What's worse than no comment? A wrong comment.
Several PCMCIA device drivers contained the same comments, which
were based on how the PCMCIA subsystem worked in the old days of 2.4.,
and which were originally part of a "dummy_cs" driver. These comments
no longer matched at all what is happening now, and therefore should
be removed.
Tested-by: Wolfram Sang <w.sang@pengutronix.de >
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net >
2010-09-29 17:20:25 +02:00
Dominik Brodowski
06b3a1d12f
pcmcia: avoid messages on module (un)loading
...
printk() statements on module load or unload are frowned upon. Also,
add a few __init or __exit declarations.
Tested-by: Wolfram Sang <w.sang@pengutronix.de >
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net >
2010-09-29 17:20:25 +02:00
Dominik Brodowski
2e9b981a7c
pcmcia: move driver name to struct pcmcia_driver
...
Tested-by: Wolfram Sang <w.sang@pengutronix.de >
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net >
2010-09-29 17:20:24 +02:00
Dominik Brodowski
1cc745d1cd
pcmcia: remove the "Finally, report what we've done" message
...
Remove this unnecessary message -- this info is either available
in sysfs or by enabling dynamic debug from the PCMCIA core.
CC: netdev@vger.kernel.org
CC: linux-wireless@vger.kernel.org
CC: linux-scsi@vger.kernel.org
CC: linux-usb@vger.kernel.org
Tested-by: Wolfram Sang <w.sang@pengutronix.de >
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net >
2010-09-29 17:20:24 +02:00
Dominik Brodowski
00990e7ce0
pcmcia: use autoconfiguration feature for ioports and iomem
...
When CONF_AUTO_SET_IO or CONF_AUTO_SET_IOMEM are set, the corresponding
fields in struct pcmcia_device *p_dev->resource[0,1,2] are set
accordinly. Drivers wishing to override certain settings may do so in
the callback function, but they no longer need to parse the CIS entries
stored in cistpl_cftable_entry_t themselves.
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: Jiri Kosina <jkosina@suse.cz >
CC: linux-scsi@vger.kernel.org
Tested-by: Wolfram Sang <w.sang@pengutronix.de >
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net >
2010-09-29 17:20:24 +02:00
Dominik Brodowski
440eed43e2
pcmcia: introduce autoconfiguration feature
...
Introduce an autoconfiguration feature to set certain values in
pcmcia_loop_config(), instead of copying the same code over and over
in each PCMCIA driver. At first, introduce the following options:
CONF_AUTO_CHECK_VCC check or matching Vcc entry
CONF_AUTO_SET_VPP set Vpp
CONF_AUTO_AUDIO enable the speaker line
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 <jkosina@suse.cz >
CC: linux-scsi@vger.kernel.org
Acked-by: Gustavo F. Padovan <padovan@profusion.mobi > (for drivers/bluetooth)
Tested-by: Wolfram Sang <w.sang@pengutronix.de >
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net >
2010-09-29 17:20:23 +02:00
Dominik Brodowski
1ac71e5a35
pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device
...
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 <jkosina@suse.cz >
CC: linux-scsi@vger.kernel.org
Acked-by: Gustavo F. Padovan <padovan@profusion.mobi > (for drivers/bluetooth)
Tested-by: Wolfram Sang <w.sang@pengutronix.de >
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net >
2010-09-29 17:20:23 +02:00
Dominik Brodowski
7feabb6412
pcmcia: move config_{base,index,regs} to struct pcmcia_device
...
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 <jkosina@suse.cz >
CC: linux-scsi@vger.kernel.org
Acked-by: Gustavo F. Padovan <padovan@profusion.mobi > (for drivers/bluetooth)
Tested-by: Wolfram Sang <w.sang@pengutronix.de >
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net >
2010-09-29 17:20:22 +02:00
Dominik Brodowski
37979e1546
pcmcia: simplify IntType
...
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 <jkosina@suse.cz >
CC: linux-scsi@vger.kernel.org
Acked-by: Gustavo F. Padovan <padovan@profusion.mobi > (for drivers/bluetooth)
Tested-by: Wolfram Sang <w.sang@pengutronix.de >
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net >
2010-09-29 17:20:22 +02:00
Dominik Brodowski
fc30110103
pcmcia: simplify Status, ExtStatus register access
...
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 <w.sang@pengutronix.de >
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net >
2010-09-29 17:20:22 +02:00
Dominik Brodowski
e8405f0f61
pcmcia: move Vpp setup to struct pcmcia_device
...
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 <padovan@profusion.mobi > (for drivers/bluetooth)
Tested-by: Wolfram Sang <w.sang@pengutronix.de >
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net >
2010-09-29 17:20:21 +02:00
Dominik Brodowski
cdb138080b
pcmcia: do not use win_req_t when calling pcmcia_request_window()
...
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 <jkosina@suse.cz >
CC: linux-scsi@vger.kernel.org
Tested-by: Wolfram Sang <w.sang@pengutronix.de >
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net >
2010-09-29 17:20:21 +02:00
Dominik Brodowski
b5cb259e7f
pcmcia: remove memreq_t
...
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 <mb@bu3sch.de >
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net >
2010-08-03 09:04:14 +02:00
Dominik Brodowski
90abdc3b97
pcmcia: do not use io_req_t when calling pcmcia_request_io()
...
Instead of io_req_t, drivers are now requested to fill out
struct pcmcia_device *p_dev->resource[0,1] for up to two ioport
ranges. After a call to pcmcia_request_io(), the ports found there
are reserved, after calling pcmcia_request_configuration(), they may
be used.
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: Michael Buesch <mb@bu3sch.de >
Acked-by: Marcel Holtmann <marcel@holtmann.org > (for drivers/bluetooth/)
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net >
2010-08-03 09:04:11 +02:00
Dominik Brodowski
9a017a9103
pcmcia: do not use io_req_t after call to pcmcia_request_io()
...
After pcmcia_request_io(), do not make use of the values stored in
io_req_t, but instead use those found in struct pcmcia_device->resource[].
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
Acked-by: Marcel Holtmann <marcel@holtmann.org > (for drivers/bluetooth/)
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net >
2010-08-03 09:03:59 +02:00
Dominik Brodowski
ac8b422838
pcmcia: remove cs_types.h
...
Remove cs_types.h which is no longer needed: Most definitions aren't
used at all, a few can be made away with, and two remaining definitions
(typedefs, unfortunatley) may be moved to more specific places.
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
Acked-by: Marcel Holtmann <marcel@holtmann.org > (for drivers/bluetooth/)
Acked-by: David S. Miller <davem@davemloft.net >
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net >
2010-07-30 21:07:39 +02:00