git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-2.6.34' of git://git.kernel.dk/linux-2.6-block
[safe/jmp/linux-2.6]
/
drivers
/
ide
/
ide-cd.h
diff --git
a/drivers/ide/ide-cd.h
b/drivers/ide/ide-cd.h
index
bf676b2
..
93a3cf1
100644
(file)
--- a/
drivers/ide/ide-cd.h
+++ b/
drivers/ide/ide-cd.h
@@
-11,7
+11,7
@@
#define IDECD_DEBUG_LOG 0
#if IDECD_DEBUG_LOG
#define IDECD_DEBUG_LOG 0
#if IDECD_DEBUG_LOG
-#define ide_debug_log(lvl, fmt, args...) __ide_debug_log(lvl, fmt, args)
+#define ide_debug_log(lvl, fmt, args...) __ide_debug_log(lvl, fmt,
##
args)
#else
#define ide_debug_log(lvl, fmt, args...) do {} while (0)
#endif
#else
#define ide_debug_log(lvl, fmt, args...) do {} while (0)
#endif
@@
-33,33
+33,33
@@
/* Structure of a MSF cdrom address. */
struct atapi_msf {
/* Structure of a MSF cdrom address. */
struct atapi_msf {
-
byte
reserved;
-
byte
minute;
-
byte
second;
-
byte
frame;
+
u8
reserved;
+
u8
minute;
+
u8
second;
+
u8
frame;
};
/* Space to hold the disk TOC. */
#define MAX_TRACKS 99
struct atapi_toc_header {
unsigned short toc_length;
};
/* Space to hold the disk TOC. */
#define MAX_TRACKS 99
struct atapi_toc_header {
unsigned short toc_length;
-
byte
first_track;
-
byte
last_track;
+
u8
first_track;
+
u8
last_track;
};
struct atapi_toc_entry {
};
struct atapi_toc_entry {
-
byte
reserved1;
+
u8
reserved1;
#if defined(__BIG_ENDIAN_BITFIELD)
#if defined(__BIG_ENDIAN_BITFIELD)
-
__
u8 adr : 4;
-
__
u8 control : 4;
+ u8 adr : 4;
+ u8 control : 4;
#elif defined(__LITTLE_ENDIAN_BITFIELD)
#elif defined(__LITTLE_ENDIAN_BITFIELD)
-
__
u8 control : 4;
-
__
u8 adr : 4;
+ u8 control : 4;
+ u8 adr : 4;
#else
#error "Please fix <asm/byteorder.h>"
#endif
#else
#error "Please fix <asm/byteorder.h>"
#endif
-
byte
track;
-
byte
reserved2;
+
u8
track;
+
u8
reserved2;
union {
unsigned lba;
struct atapi_msf msf;
union {
unsigned lba;
struct atapi_msf msf;
@@
-77,22
+77,16
@@
struct atapi_toc {
/* Extra per-device info for cdrom drives. */
struct cdrom_info {
/* Extra per-device info for cdrom drives. */
struct cdrom_info {
- ide_drive_t *drive;
-
ide_driver_t
*driver;
- struct gendisk *disk;
- struct
kref kref
;
+ ide_drive_t
*drive;
+
struct ide_driver
*driver;
+ struct gendisk
*disk;
+ struct
device dev
;
/* Buffer for table of contents. NULL if we haven't allocated
a TOC buffer for this device yet. */
struct atapi_toc *toc;
/* Buffer for table of contents. NULL if we haven't allocated
a TOC buffer for this device yet. */
struct atapi_toc *toc;
- /* The result of the last successful request sense command
- on this device. */
- struct request_sense sense_data;
-
- struct request request_sense_request;
-
u8 max_speed; /* Max speed of the drive. */
u8 current_speed; /* Current speed of the drive. */
u8 max_speed; /* Max speed of the drive. */
u8 current_speed; /* Current speed of the drive. */