229aebb873
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
...
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
Update broken web addresses in arch directory.
Update broken web addresses in the kernel.
Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget
Revert "Fix typo: configuation => configuration" partially
ida: document IDA_BITMAP_LONGS calculation
ext2: fix a typo on comment in ext2/inode.c
drivers/scsi: Remove unnecessary casts of private_data
drivers/s390: Remove unnecessary casts of private_data
net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data
drivers/infiniband: Remove unnecessary casts of private_data
drivers/gpu/drm: Remove unnecessary casts of private_data
kernel/pm_qos_params.c: Remove unnecessary casts of private_data
fs/ecryptfs: Remove unnecessary casts of private_data
fs/seq_file.c: Remove unnecessary casts of private_data
arm: uengine.c: remove C99 comments
arm: scoop.c: remove C99 comments
Fix typo configue => configure in comments
Fix typo: configuation => configuration
Fix typo interrest[ing|ed] => interest[ing|ed]
Fix various typos of valid in comments
...
Fix up trivial conflicts in:
drivers/char/ipmi/ipmi_si_intf.c
drivers/usb/gadget/rndis.c
net/irda/irnet/irnet_ppp.c
2010-10-24 13:41:39 -07:00
ff10fca5ce
pcmcia: IOCARD is also required for using IRQs
...
Dave Hinds pointed out to me that 37979e1546linux@dominikbrodowski.net >
2010-10-22 08:46:36 +02:00
631dd1a885
Update broken web addresses in the kernel.
...
The patch below updates broken web addresses in the kernel
Signed-off-by: Justin P. Mattock <justinmattock@gmail.com >
Cc: Maciej W. Rozycki <macro@linux-mips.org >
Cc: Geert Uytterhoeven <geert@linux-m68k.org >
Cc: Finn Thain <fthain@telegraphics.com.au >
Cc: Randy Dunlap <rdunlap@xenotime.net >
Cc: Matt Turner <mattst88@gmail.com >
Cc: Dimitry Torokhov <dmitry.torokhov@gmail.com >
Cc: Mike Frysinger <vapier.adi@gmail.com >
Acked-by: Ben Pfaff <blp@cs.stanford.edu >
Acked-by: Hans J. Koch <hjk@linutronix.de >
Reviewed-by: Finn Thain <fthain@telegraphics.com.au >
Signed-off-by: Jiri Kosina <jkosina@suse.cz >
2010-10-18 11:03:14 +02:00
97299c7268
pcmcia: don't call flush_scheduled_work() spuriously
...
au100_generic and soc_common call flush_scheduled_work() spuriously.
Remove them.
This is to prepare for the deprecation and removal of
flush_scheduled_work().
Signed-off-by: Tejun Heo <tj@kernel.org >
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net >
2010-10-16 11:07:37 +02:00
a5360df941
pcmcia/yenta: guide users in case of problems with O2-bridges
...
Some cards need the speedups on, some need them off. As we can't detect
this reliably, at least give the users a hint how to tweak the system.
Reported-by: David Bluecame <david.bluecame@gmail.com >
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de >
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net >
2010-10-15 14:31:47 +02:00
3c7d2b765d
pcmcia: fix unused function compile warning
...
pcmcia_socket_dev_resume() is only referenced from macro
SET_SYSTEM_SLEEP_PM_OPS(NULL, pcmcia_socket_dev_resume)
which based on CONFIG_PM_SLEEP may or may not actually
use its second parameter.
Signed-off-by: Maciej Żenczykowski <zenczykowski@gmail.com >
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net >
2010-10-14 11:47:16 +02:00
1ab488de54
pcmcia: vrc4173_cardu: Fix error path for pci_release_regions and pci_disable_device
...
- pci_release_regions called during return error path.
- pci_disable_device called for cases where earlier it was enabled.
- code duplication avoided/reduced by adding resource release at goto statements.
Signed-off-by: Rahul Ruikar <rahul.ruikar@gmail.com >
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net >
2010-10-05 15:49:51 +02:00
1c4a77bf54
pcmcia: add a few debug statements
...
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net >
2010-09-29 17:20:25 +02:00
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
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
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
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
9485ee14e1
pcmcia: Documentation update
...
Fill in missing descriptions and update some others for functions in
pcmcia_resource.c.
Tested-by: Wolfram Sang <w.sang@pengutronix.de >
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net >
2010-09-29 17:20:23 +02:00
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
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
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
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
1a4a046030
pcmcia: remove Pin, Copy configuration register access
...
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 <w.sang@pengutronix.de >
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net >
2010-09-29 17:20:21 +02:00
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
fb49fa533f
pcmcia: split up modify_configuration() into two fixup functions
...
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 <w.sang@pengutronix.de >
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net >
2010-09-29 17:20:21 +02:00
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
40d24ff9b4
pcmcia: pd6729: Fix error path
...
In error return path
call pci_disable_device() which was enabled earlier.
Signed-off-by: Rahul Ruikar <rahul.ruikar@gmail.com >
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net >
2010-09-26 15:54:25 +02:00
7cdffc8652
pcmcia: preserve configuration information if request_io fails partly
...
If pcmcia_request_io() only fails partly -- for the second of two
requested resources -- preserve the configuration settings for the
first one.
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net >
2010-09-18 16:30:18 +02:00
eb838fe109
pcmcia: per-device, not per-socket debug messages
...
As the iomem / ioport setup differs per device, it is much better
to print out the device instead of the socket.
Tested-by: Wolfram Sang <w.sang@pengutronix.de >
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net >
2010-09-15 17:57:09 +02:00
58d4ea65b9
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
...
* 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6:
mmc_spi: Fix unterminated of_match_table
of/sparc: fix build regression from of_device changes
of/device: Replace struct of_device with struct platform_device
2010-08-12 09:11:31 -07:00
Linus Torvalds
Dominik Brodowski
Justin P. Mattock
Tejun Heo
Wolfram Sang
Maciej Żenczykowski
Rahul Ruikar