aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-disk.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ide/ide-disk.h')
-rw-r--r--drivers/ide/ide-disk.h24
1 files changed, 9 insertions, 15 deletions
diff --git a/drivers/ide/ide-disk.h b/drivers/ide/ide-disk.h
index 104ad71288a5..b234b0feaf7b 100644
--- a/drivers/ide/ide-disk.h
+++ b/drivers/ide/ide-disk.h
@@ -1,22 +1,11 @@
1#ifndef __IDE_DISK_H 1#ifndef __IDE_DISK_H
2#define __IDE_DISK_H 2#define __IDE_DISK_H
3 3
4struct ide_disk_obj { 4#include "ide-gd.h"
5 ide_drive_t *drive;
6 ide_driver_t *driver;
7 struct gendisk *disk;
8 struct kref kref;
9 unsigned int openers; /* protected by BKL for now */
10};
11
12sector_t ide_gd_capacity(ide_drive_t *);
13 5
6#ifdef CONFIG_IDE_GD_ATA
14/* ide-disk.c */ 7/* ide-disk.c */
15void ide_disk_init_capacity(ide_drive_t *); 8extern const struct ide_disk_ops ide_ata_disk_ops;
16void ide_disk_setup(ide_drive_t *);
17void ide_disk_flush(ide_drive_t *);
18int ide_disk_set_doorlock(ide_drive_t *, int);
19ide_startstop_t ide_do_rw_disk(ide_drive_t *, struct request *, sector_t);
20ide_decl_devset(address); 9ide_decl_devset(address);
21ide_decl_devset(multcount); 10ide_decl_devset(multcount);
22ide_decl_devset(nowerr); 11ide_decl_devset(nowerr);
@@ -24,12 +13,17 @@ ide_decl_devset(wcache);
24ide_decl_devset(acoustic); 13ide_decl_devset(acoustic);
25 14
26/* ide-disk_ioctl.c */ 15/* ide-disk_ioctl.c */
27int ide_disk_ioctl(struct inode *, struct file *, unsigned int, unsigned long); 16int ide_disk_ioctl(ide_drive_t *, struct inode *, struct file *, unsigned int,
17 unsigned long);
28 18
29#ifdef CONFIG_IDE_PROC_FS 19#ifdef CONFIG_IDE_PROC_FS
30/* ide-disk_proc.c */ 20/* ide-disk_proc.c */
31extern ide_proc_entry_t ide_disk_proc[]; 21extern ide_proc_entry_t ide_disk_proc[];
32extern const struct ide_proc_devset ide_disk_settings[]; 22extern const struct ide_proc_devset ide_disk_settings[];
33#endif 23#endif
24#else
25#define ide_disk_proc NULL
26#define ide_disk_settings NULL
27#endif
34 28
35#endif /* __IDE_DISK_H */ 29#endif /* __IDE_DISK_H */