aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/ide.h14
1 files changed, 3 insertions, 11 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 1fbf84af232d..4d8c12cc55ea 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -628,8 +628,7 @@ typedef int (ide_expiry_t)(ide_drive_t *);
628typedef struct hwgroup_s { 628typedef struct hwgroup_s {
629 /* irq handler, if active */ 629 /* irq handler, if active */
630 ide_startstop_t (*handler)(ide_drive_t *); 630 ide_startstop_t (*handler)(ide_drive_t *);
631 /* irq handler, suspended if active */ 631
632 ide_startstop_t (*handler_save)(ide_drive_t *);
633 /* BOOL: protects all fields below */ 632 /* BOOL: protects all fields below */
634 volatile int busy; 633 volatile int busy;
635 /* BOOL: wake us up on timer expiry */ 634 /* BOOL: wake us up on timer expiry */
@@ -644,25 +643,18 @@ typedef struct hwgroup_s {
644 /* ptr to current hwif in linked-list */ 643 /* ptr to current hwif in linked-list */
645 ide_hwif_t *hwif; 644 ide_hwif_t *hwif;
646 645
647 /* for pci chipsets */
648 struct pci_dev *pci_dev;
649
650 /* current request */ 646 /* current request */
651 struct request *rq; 647 struct request *rq;
648
652 /* failsafe timer */ 649 /* failsafe timer */
653 struct timer_list timer; 650 struct timer_list timer;
654 /* local copy of current write rq */
655 struct request wrq;
656 /* timeout value during long polls */ 651 /* timeout value during long polls */
657 unsigned long poll_timeout; 652 unsigned long poll_timeout;
658 /* queried upon timeouts */ 653 /* queried upon timeouts */
659 int (*expiry)(ide_drive_t *); 654 int (*expiry)(ide_drive_t *);
660 /* ide_system_bus_speed */ 655
661 int pio_clock;
662 int req_gen; 656 int req_gen;
663 int req_gen_timer; 657 int req_gen_timer;
664
665 unsigned char cmd_buf[4];
666} ide_hwgroup_t; 658} ide_hwgroup_t;
667 659
668typedef struct ide_driver_s ide_driver_t; 660typedef struct ide_driver_s ide_driver_t;