aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-03-24 11:19:51 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-24 11:19:51 -0500
commite93252faca2eb1a14b44369705be7c79eba2f037 (patch)
tree35ae4fde7c0b082388272f2154bfabc4bdf4500a /include
parentf125b56113be4956867cc9bd098bb99b1b9bb93f (diff)
parent2f1f610b62bce36d6d50857859091b8989c70267 (diff)
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: [PATCH] libata: Remove dependence on host_set->dev for SAS [PATCH] libata: ata_scsi_ioctl cleanup [PATCH] libata: ata_scsi_queuecmd cleanup [libata] export ata_dev_pair; trim trailing whitespace [PATCH] libata: add ata_dev_pair helper [PATCH] Make libata not powerdown drivers on PM_EVENT_FREEZE. [PATCH] libata: make ata_set_mode() responsible for failure handling [PATCH] libata: use ata_dev_disable() in ata_bus_probe() [PATCH] libata: implement ata_dev_disable() [PATCH] libata: check if port is disabled after internal command [PATCH] libata: make per-dev transfer mode limits per-dev [PATCH] libata: add per-dev pio/mwdma/udma_mask [PATCH] libata: implement ata_unpack_xfermask() [libata] Move some bmdma-specific code to libata-bmdma.c [libata sata_uli] kill scr_addr abuse [libata sata_nv] eliminate duplicate codepaths with iomap [libata sata_nv] cleanups: convert #defines to enums; remove in-file history [libata sata_sil24] cleanups: use pci_iomap(), kzalloc()
Diffstat (limited to 'include')
-rw-r--r--include/linux/libata.h12
-rw-r--r--include/scsi/scsi_host.h2
2 files changed, 11 insertions, 3 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 7a54244d30aa..047192253c3a 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -358,6 +358,11 @@ struct ata_device {
358 unsigned int max_sectors; /* per-device max sectors */ 358 unsigned int max_sectors; /* per-device max sectors */
359 unsigned int cdb_len; 359 unsigned int cdb_len;
360 360
361 /* per-dev xfer mask */
362 unsigned int pio_mask;
363 unsigned int mwdma_mask;
364 unsigned int udma_mask;
365
361 /* for CHS addressing */ 366 /* for CHS addressing */
362 u16 cylinders; /* Number of cylinders */ 367 u16 cylinders; /* Number of cylinders */
363 u16 heads; /* Number of heads */ 368 u16 heads; /* Number of heads */
@@ -395,6 +400,7 @@ struct ata_port {
395 400
396 struct ata_host_stats stats; 401 struct ata_host_stats stats;
397 struct ata_host_set *host_set; 402 struct ata_host_set *host_set;
403 struct device *dev;
398 404
399 struct work_struct port_task; 405 struct work_struct port_task;
400 406
@@ -515,9 +521,9 @@ extern void ata_eh_qc_retry(struct ata_queued_cmd *qc);
515extern int ata_scsi_release(struct Scsi_Host *host); 521extern int ata_scsi_release(struct Scsi_Host *host);
516extern unsigned int ata_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc); 522extern unsigned int ata_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc);
517extern int ata_scsi_device_resume(struct scsi_device *); 523extern int ata_scsi_device_resume(struct scsi_device *);
518extern int ata_scsi_device_suspend(struct scsi_device *); 524extern int ata_scsi_device_suspend(struct scsi_device *, pm_message_t state);
519extern int ata_device_resume(struct ata_port *, struct ata_device *); 525extern int ata_device_resume(struct ata_port *, struct ata_device *);
520extern int ata_device_suspend(struct ata_port *, struct ata_device *); 526extern int ata_device_suspend(struct ata_port *, struct ata_device *, pm_message_t state);
521extern int ata_ratelimit(void); 527extern int ata_ratelimit(void);
522extern unsigned int ata_busy_sleep(struct ata_port *ap, 528extern unsigned int ata_busy_sleep(struct ata_port *ap,
523 unsigned long timeout_pat, 529 unsigned long timeout_pat,
@@ -568,6 +574,8 @@ extern int ata_std_bios_param(struct scsi_device *sdev,
568 struct block_device *bdev, 574 struct block_device *bdev,
569 sector_t capacity, int geom[]); 575 sector_t capacity, int geom[]);
570extern int ata_scsi_slave_config(struct scsi_device *sdev); 576extern int ata_scsi_slave_config(struct scsi_device *sdev);
577extern struct ata_device *ata_dev_pair(struct ata_port *ap,
578 struct ata_device *adev);
571 579
572/* 580/*
573 * Timing helpers 581 * Timing helpers
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index a6cf3e535c0b..dc6862d09e53 100644
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -286,7 +286,7 @@ struct scsi_host_template {
286 * suspend support 286 * suspend support
287 */ 287 */
288 int (*resume)(struct scsi_device *); 288 int (*resume)(struct scsi_device *);
289 int (*suspend)(struct scsi_device *); 289 int (*suspend)(struct scsi_device *, pm_message_t state);
290 290
291 /* 291 /*
292 * Name of proc directory 292 * Name of proc directory