Commit Graph
100 Commits
Author SHA1 Message Date
Jeff Garzik 1bdfd554be [PATCH] SCSI: fix request flag-related build breakage
The ->flags in struct request was split into two variables, in a recent
changeset.  The merge of this change forgot to update SCSI's libsas,
probably because libsas was a very recent merge.

Signed-off-by: Jeff Garzik <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
2006-09-30 19:33:43 -07:00
Jeff Garzik bda3028813 [libata] Don't use old-EH ->eng_timeout() hook when not needed
The PATA driver set got converted to the new error handling setup, but
the old hooks were accidentally left in place.  Now, removed.

Signed-off-by: Jeff Garzik <[email protected]>
2006-09-27 05:41:13 -04:00
Jeff Garzik ae1f19aeb7 [libata] sata_mv: fix oops by filling in missing hook
Only two of three ata_port_operations structs had a ->data_xfer member,
which led to, uh, a lack of data xfer.

Signed-off-by: Jeff Garzik <[email protected]>
2006-09-27 03:42:37 -04:00
Jeff Garzik fb4633019f [libata] One more s/15/ATA_SECONDARY_IRQ/ substitution
Signed-off-by: Jeff Garzik <[email protected]>
2006-09-26 17:16:32 -04:00
Jeff Garzik efbf3f1420 [libata] pata_serverworks: fill in ->irq_clear hook
Required by libata, as it is called unconditionally.

Fixes an obvious oops.

Signed-off-by: Jeff Garzik <[email protected]>
2006-09-26 17:10:53 -04:00
Jeff Garzik c226951b93 Merge branch 'master' into upstream 2006-09-26 13:13:19 -04:00
Jeff Garzik 29da9f6d9c [libata] Fix oops introduced in non-uniform port handling fix
Noticed by several people.

Signed-off-by: Jeff Garzik <[email protected]>
2006-09-25 21:56:33 -04:00
Jeff Garzik b0df3bd1e5 Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into tmp 2006-09-25 20:09:14 -04:00
Jeff Garzik e8126c82cc Delete unused drivers/net/gt64240eth.h
Noticed by Yoichi Yuasa.

Signed-off-by: Jeff Garzik <[email protected]>
2006-09-25 20:06:24 -04:00
Jeff Garzik a6d967a485 [libata] No need for all those arch libata-portmap.h headers
They all contain the same thing.  Instead, have a single generic one in
include/asm-generic, and permit an arch to override as needed.

Signed-off-by: Jeff Garzik <[email protected]>
2006-09-25 15:33:09 -04:00
Jeff Garzik e18fa700c9 Move several *_SUPER_MAGIC symbols to include/linux/magic.h.
Signed-off-by: Jeff Garzik <[email protected]>
2006-09-24 11:13:19 -04:00
Jeff Garzik 23930fa1ce Merge branch 'master' into upstream 2006-09-24 01:52:47 -04:00
Jeff Garzik 1837987992 net/ieee80211: fix more crypto-related build breakage
Signed-off-by: Jeff Garzik <[email protected]>
2006-09-22 21:19:05 -04:00
Jeff Garzik 78cc3b78c4 Merge tag 'r8169-20060920-00' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6 into tmp 2006-09-22 20:18:02 -04:00
Jeff Garzik 28eb177dfa Merge branch 'master' into upstream
Conflicts:

	net/ieee80211/ieee80211_crypt_tkip.c
	net/ieee80211/ieee80211_crypt_wep.c
2006-09-22 20:10:23 -04:00
Jeff Garzik fd8ae94eea Merge branch 'upstream-fixes' into upstream 2006-09-21 00:08:25 -04:00
Jeff Garzik 54caf44da3 [netdrvr] mv643xx_eth: fix obvious typo, which caused build breakage
The last minute fix submitted by the author fixed a bug, but
broke the driver build.

Noticed by Al Viro, since I can't build on said platform.

Signed-off-by: Jeff Garzik <[email protected]>
2006-09-21 00:08:10 -04:00
Jeff Garzik 8ce90907ea [netdrvr] lp486e: fix typo
inside #if 0'd code, but it bugged me.

Really, we should probably just delete the driver.

Signed-off-by: Jeff Garzik <[email protected]>
2006-09-21 00:06:21 -04:00
Jeff Garzik 36b35a5be0 [libata] Delete pata_it8172 driver
This MIPS platform is going away.

Acked-by: Ralf Baechle <[email protected]>
Signed-off-by: Jeff Garzik <[email protected]>
2006-09-20 17:48:53 -04:00
Jeff Garzik 783c99f42e Merge branch 'master' into upstream 2006-09-20 00:48:28 -04:00
Jeff Garzik f8ec473387 e1000, ixgb: Remove pointless wrappers
Signed-off-by: Jeff Garzik <[email protected]>
2006-09-19 15:27:07 -04:00
Jeff Garzik 23b6b0e3e8 Merge branch 'master' into upstream 2006-09-19 15:13:45 -04:00
Jeff Garzik 4a3381feb8 Merge branch 'master' into upstream 2006-09-19 00:42:13 -04:00
Jeff Garzik a64f97f2c3 Merge branch 'tmp' into upstream
Conflicts:

	drivers/ata/libata-sff.c
2006-09-19 00:25:50 -04:00
Jeff Garzik f50e5ea14b Merge branch 'upstream-fixes' into upstream 2006-09-17 01:06:01 -04:00
Jeff Garzik 803db244b9 Merge branch 'master' into upstream-fixes 2006-09-17 01:05:43 -04:00
Jeff Garzik ecf7f354e2 Merge branch 'upstream-fixes' into upstream 2006-09-17 01:03:17 -04:00
Jeff Garzik c233289c29 drivers/net/phy/fixed: #if 0 some incomplete code
Signed-off-by: Jeff Garzik <[email protected]>
2006-09-13 14:33:12 -04:00
Jeff Garzik 7282d491ec drivers/net: const-ify ethtool_ops declarations
Signed-off-by: Jeff Garzik <[email protected]>
2006-09-13 14:30:00 -04:00
Jeff Garzik 6aa20a2235 drivers/net: Trim trailing whitespace
Signed-off-by: Jeff Garzik <[email protected]>
2006-09-13 13:24:59 -04:00
Jeff Garzik 38ed61d6c0 Merge branch 'upstream-fixes' into upstream 2006-09-13 12:26:12 -04:00
Jeff Garzik b68c5f546e Merge branch 'master' into upstream 2006-09-13 00:39:09 -04:00
Jeff Garzik 4291130595 Merge branch 'upstream-fixes' into upstream 2006-09-13 00:34:46 -04:00
Jeff Garzik eff68d452f Merge branch 'master' into upstream-fixes 2006-09-13 00:34:34 -04:00
Jeff Garzik b0fea350ce [libata] ata_piix: build fix
Spotted by Andrew Morton.

Signed-off-by: Jeff Garzik <[email protected]>
2006-09-13 00:25:23 -04:00
Jeff Garzik 2a69bf428e Merge tag 'r8169-20060912-00' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6 into tmp 2006-09-12 22:03:36 -04:00
Jeff Garzik cb930205c9 Merge tag '8139cp-20060912-00' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6 into tmp 2006-09-12 21:59:47 -04:00
Jeff Garzik 435b70e65d Merge branch 'upstream-fixes' into upstream 2006-09-12 12:03:54 -04:00
Jeff Garzik 97148ba223 Merge branch 'master' into upstream 2006-09-12 12:03:21 -04:00
Jeff Garzik 4e83b7fad8 Merge branch 'tmp' into upstream 2006-09-12 11:45:33 -04:00
Jeff Garzik c925f1ea9e Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream 2006-09-12 11:43:28 -04:00
Jeff Garzik 8083e16562 Merge branch 'upstream-fixes' into upstream 2006-09-12 11:42:45 -04:00
Jeff Garzik 1802ca7452 Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes 2006-09-12 11:42:33 -04:00
Jeff Garzik 6b12a3d35f Merge branch 'upstream-fixes' into upstream 2006-09-11 09:14:17 -04:00
Jeff Garzik 10e299fc6d Merge branch 'master' into upstream 2006-09-11 09:05:33 -04:00
Jeff Garzik dd1dc80236 Merge branch 'upstream-fixes' into upstream
Conflicts:

	drivers/ata/ata_piix.c
2006-09-11 08:54:55 -04:00
Jeff Garzik b4d01327e4 Merge branch 'upstream-fixes' into upstream 2006-09-06 11:06:44 -04:00
Jeff Garzik a2413598b8 Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream 2006-09-06 11:02:22 -04:00
Jeff Garzik 406176ee7e [libata] Add pata_jmicron driver to Kconfig, Makefile
Someone on LKML noticed it was missing (sorry, missed the name).

Signed-off-by: Jeff Garzik <[email protected]>
2006-09-06 10:48:19 -04:00
Jeff Garzik fc851fad00 Merge branch 'upstream' into pata-drivers 2006-09-04 06:42:01 -04:00
Jeff Garzik f9bcda7760 Merge branch 'master' into upstream 2006-09-04 06:41:37 -04:00
Jeff Garzik 3784fd7316 Merge branch 'master' into upstream 2006-09-04 06:29:54 -04:00
Jeff Garzik 5a25ba1677 [SCSI] Add Promise SuperTrak driver
Add Promise SuperTrak 'stex' driver, supporting SuperTrak
EX8350/8300/16350/16300 controllers.  The controller's firmware accepts
SCSI commands, handing them to the underlying RAID or JBOD disks.

The driver consisted of the following cleanups and fixes, beyond its
initial submission:

Ed Lin:
      stex: cleanup and minor fixes
      stex: add new device ids
      stex: update internal copy code path
      stex: add hard reset function
      stex: adjust command timeout in slave_config routine
      stex: use more efficient method for unload/shutdown flush

Jeff Garzik:
      [SCSI] Add Promise SuperTrak 'shasta' driver.
      Rename drivers/scsi/shasta.c to stex.c ("SuperTrak EX").
      [SCSI] stex: update with community comments from 'Promise SuperTrak' thread
      [SCSI] stex: Fix warning, trim trailing whitespace.
      [SCSI] stex: remove last remnants of "shasta" project code name
      [SCSI] stex: removed 6-byte command emulation
      [SCSI] stex: minor cleanups
      [SCSI] stex: minor fixes: irq flag, error return value
      [SCSI] stex: use dma_alloc_coherent()

Signed-off-by: Jeff Garzik <[email protected]>
Signed-off-by: James Bottomley <[email protected]>
2006-09-02 13:54:02 -05:00
Jeff Garzik 7c440e7990 Merge branch 'upstream' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into upstream 2006-08-31 17:39:21 -04:00
Jeff Garzik 85cd7251b9 [libata #pata-drivers] Trim trailing whitespace. 2006-08-31 00:03:49 -04:00
Jeff Garzik 481ff126e8 Merge branch 'upstream' into pata-drivers 2006-08-31 00:02:26 -04:00
Jeff Garzik 9bec2e3852 [libata] Trim trailing whitespace. 2006-08-31 00:02:15 -04:00
Jeff Garzik 669a5db411 [libata] Add a bunch of PATA drivers.
The vast majority of drivers and changes are from Alan Cox.  Albert Lee
contributed and maintains pata_pdc2027x.  Adrian Bunk, Andrew Morton,
and Tejun Heo contributed various minor fixes and updates.

Signed-off-by: Jeff Garzik <[email protected]>
2006-08-29 18:12:40 -04:00
Jeff Garzik b01e86fee6 Merge /spare/repo/linux-2.6 into upstream 2006-08-29 17:55:59 -04:00
Jeff Garzik a422142cfd Merge branch 'master' into upstream 2006-08-29 17:20:55 -04:00
Jeff Garzik e889173c2c Rename libata-bmdma.c to libata-sff.c.
Signed-off-by: Jeff Garzik <[email protected]>
2006-08-24 03:55:09 -04:00
Jeff Garzik cca3974e48 libata: Grand renaming.
The biggest change is that ata_host_set is renamed to ata_host.

* ata_host_set			=> ata_host
* ata_probe_ent->host_flags	=> ata_probe_ent->port_flags
* ata_probe_ent->host_set_flags	=> ata_probe_ent->_host_flags
* ata_host_stats		=> ata_port_stats
* ata_port->host		=> ata_port->scsi_host
* ata_port->host_set		=> ata_port->host
* ata_port_info->host_flags	=> ata_port_info->flags
* ata_(.*)host_set(.*)\(\)	=> ata_\1host\2()

The leading underscore in ata_probe_ent->_host_flags is to avoid
reusing ->host_flags for different purpose.  Currently, the only user
of the field is libata-bmdma.c and probe_ent itself is scheduled to be
removed.

ata_port->host is reused for different purpose but this field is used
inside libata core proper and of different type.

Signed-off-by: Tejun Heo <[email protected]>
Signed-off-by: Jeff Garzik <[email protected]>
2006-08-24 03:19:22 -04:00
Jeff Garzik 54a86bfc3d Merge branch 'upstream-fixes' into upstream 2006-08-24 02:51:38 -04:00
Jeff Garzik 81ce3c4b4d Clean up drivers/ata/Kconfig a bit. 2006-08-24 02:41:25 -04:00
Jeff Garzik 699a712388 Merge branch 'upstream-fixes' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into tmp 2006-08-24 00:45:36 -04:00
Jeff Garzik 8d8b03297c Merge branch 'upstream-fixes' into upstream 2006-08-24 00:42:07 -04:00
Jeff Garzik 357eb4cf75 Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes 2006-08-24 00:41:25 -04:00
Jeff Garzik f89b2b5ddc Merge branch 'upstream-fixes' into upstream
Conflicts:

	drivers/ata/ata_piix.c
2006-08-22 06:10:49 -04:00
Jeff Garzik 1fb0a6c8c6 Merge branch 'upstream-fixes' into upstream 2006-08-19 17:51:34 -04:00
Jeff Garzik 299176206b drivers/net: Remove deprecated use of pci_module_init()
From: Michal Piotrowski <[email protected]>

Signed-off-by: Michal Piotrowski <[email protected]>
Signed-off-by: Jeff Garzik <[email protected]>
2006-08-19 17:48:59 -04:00
Jeff Garzik a513c315f9 Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream 2006-08-19 17:46:13 -04:00
Jeff Garzik 846050dd49 Merge branch 'upstream-fixes' into upstream 2006-08-19 17:45:11 -04:00
Jeff Garzik 499792ec6d Merge branch 'upstream-fixes' into upstream 2006-08-19 17:27:27 -04:00
Jeff Garzik d14b50cc60 Merge branch 'master' into upstream-fixes 2006-08-19 17:27:12 -04:00
Jeff Garzik 49666145de Merge branch 'upstream-fixes' into upstream 2006-08-19 17:25:47 -04:00
Jeff Garzik 41ace1861a Merge branch 'master' into upstream-fixes 2006-08-19 17:25:34 -04:00
Jeff Garzik 421b20b9c4 libata: Make sure drivers/ata is a separate Kconfig menu
Noticed by Rafael J. Wysocki

Signed-off-by: Jeff Garzik <[email protected]>
2006-08-14 14:27:36 -04:00
Jeff Garzik 24dd01bfbc [libata] ata_piix: add missing kfree()
Noticed by Andrew Morton.

Signed-off-by: Jeff Garzik <[email protected]>
2006-08-14 14:22:54 -04:00
Jeff Garzik 370ba07eb8 libata: Separate libata.ko build from individual driver builds
Since some SAS drivers need libata, we can no longer use the rule that
auto-builds libata.ko as needed.  We must instead depend on Kconfig to
determine when to build the library kernel module.

Noticed by Brian King @ IBM.

Signed-off-by: Jeff Garzik <[email protected]>
2006-08-14 14:12:57 -04:00
Jeff Garzik 8ad92ba715 libata: Remove SCSI_ prefix from Kconfig symbols
Signed-off-by: Jeff Garzik <[email protected]>
2006-08-14 14:10:07 -04:00
Jeff Garzik 0c913bdf3e Merge branch 'upstream-fixes' into upstream 2006-08-14 13:59:38 -04:00
Jeff Garzik f5c7db1c91 Merge branch 'upstream-fixes' into upstream 2006-08-10 08:31:03 -04:00
Jeff Garzik cea0d336e7 Merge branch 'upstream-fixes' into upstream 2006-08-10 08:29:23 -04:00
Jeff Garzik c6fd280766 Move libata to drivers/ata. 2006-08-10 07:31:37 -04:00
Jeff Garzik 79ed35a9f1 Merge branch 'tj-upstream-pci_register_driver' of git://htj.dyndns.org/libata-tj into upstream 2006-08-10 06:56:51 -04:00
Jeff Garzik 6a2e42ad0f Merge branch 'upstream-fixes' into upstream 2006-08-10 06:55:26 -04:00
Jeff Garzik 8b881b0410 [ATA] Increase lba48 max-sectors from 200 to 256.
Also, moved ATA_MAX_SECTORS and ATA_MAX_SECTORS_LBA48 from
linux/libata.h to linux/ata.h, now that they truly reflect the standard
(well... mostly; note TODO comment).

This changes the performance profile (and potential bug profile)
for a bunch of drivers, so be wary.
2006-08-10 06:49:45 -04:00
Jeff Garzik 2b8ae728a8 Merge branch 'sii-m15w' into upstream 2006-08-10 06:46:16 -04:00
Jeff Garzik 6d0500df5b [PATCH] [libata] Kill 'count' var in ata_device_add()
Eliminate redundant loop variable 'count'

Signed-off-by: Jeff Garzik <[email protected]>
Signed-off-by: Tejun Heo <[email protected]>
2006-08-10 16:59:05 +09:00
Jeff Garzik 996139f1ce [PATCH] [libata] some function renaming
s/ata_host_add/ata_port_add/
s/ata_host_init/ata_port_init/

libata naming got stuck in the middle of a Great Renaming:

	ata_host -> ata_port
	ata_host_set -> ata_host

To eliminate confusion, let's just give up for now, and simply ensure
that things are internally consistent.

Signed-off-by: Jeff Garzik <[email protected]>
Signed-off-by: Tejun Heo <[email protected]>
2006-08-10 16:59:03 +09:00
Jeff Garzik 3f06688759 Merge branch 'upstream-fixes' into upstream 2006-08-09 01:19:18 -04:00
Jeff Garzik c256e95f7d Merge branch 'upstream-fixes' into upstream 2006-08-08 23:59:55 -04:00
Jeff Garzik c71d6be54e Merge branch 'tj-upstream-fixes' of git://htj.dyndns.org/libata-tj into upstream-fixes 2006-08-08 23:59:39 -04:00
Jeff Garzik d15064aa94 Merge branch 'upstream-fixes' into upstream 2006-08-08 23:54:22 -04:00
Jeff Garzik 2f96740c26 Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes 2006-08-08 23:48:48 -04:00
Jeff Garzik 38ebb1e0ed Merge branch 'master' into upstream 2006-08-07 06:43:17 -04:00
Jeff Garzik 242898be7a Merge branch 'master' into upstream 2006-08-07 06:38:41 -04:00
Jeff Garzik 6543bc0777 [PATCH] [libata] manually inline ata_host_remove()
(tj: this is for the following ata_device_add() fix)

Signed-off-by: Jeff Garzik <[email protected]>
Signed-off-by: Tejun Heo <[email protected]>
2006-08-05 03:59:17 +09:00
Jeff Garzik 236a686b56 Merge branch 'master' into upstream 2006-08-04 07:47:35 -04:00
Jeff Garzik 6bbad18a8b Merge branch 'master' into upstream 2006-08-04 07:15:56 -04:00