diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-02-01 17:09:23 -0500 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-02-01 17:09:23 -0500 |
commit | 89d13ec7c8b85f3c62a4a12034e65d3d2d3273a8 (patch) | |
tree | 403300e5a0bf92acb68888424725a9c14843e708 /drivers/ide/ide-cd.h | |
parent | 1b1215d5e954726b142d5408dfd6d7153b3abe8b (diff) |
ide-cd: coding style fixes for VERBOSE_IDE_CD_ERRORS code
* Coding style fixes for VERBOSE_IDE_CD_ERRORS code.
* Add KERN_{ERR,CONT} printk() levels where needed.
This is a preparation for moving this code out of ide-cd.[c,h].
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-cd.h')
-rw-r--r-- | drivers/ide/ide-cd.h | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/drivers/ide/ide-cd.h b/drivers/ide/ide-cd.h index 33019cb8c68d..3a43178ab121 100644 --- a/drivers/ide/ide-cd.h +++ b/drivers/ide/ide-cd.h | |||
@@ -159,9 +159,8 @@ struct cdrom_info { | |||
159 | 159 | ||
160 | /* This stuff should be in cdrom.h, since it is now generic... */ | 160 | /* This stuff should be in cdrom.h, since it is now generic... */ |
161 | #if VERBOSE_IDE_CD_ERRORS | 161 | #if VERBOSE_IDE_CD_ERRORS |
162 | 162 | /* The generic packet command opcodes for CD/DVD Logical Units, | |
163 | /* The generic packet command opcodes for CD/DVD Logical Units, | 163 | * From Table 57 of the SFF8090 Ver. 3 (Mt. Fuji) draft standard. */ |
164 | * From Table 57 of the SFF8090 Ver. 3 (Mt. Fuji) draft standard. */ | ||
165 | static const struct { | 164 | static const struct { |
166 | unsigned short packet_command; | 165 | unsigned short packet_command; |
167 | const char * const text; | 166 | const char * const text; |
@@ -187,7 +186,8 @@ static const struct { | |||
187 | { GPCMD_GET_CONFIGURATION, "Get Configuration" }, | 186 | { GPCMD_GET_CONFIGURATION, "Get Configuration" }, |
188 | { GPCMD_PLAY_AUDIO_MSF, "Play Audio MSF" }, | 187 | { GPCMD_PLAY_AUDIO_MSF, "Play Audio MSF" }, |
189 | { GPCMD_PLAYAUDIO_TI, "Play Audio TrackIndex" }, | 188 | { GPCMD_PLAYAUDIO_TI, "Play Audio TrackIndex" }, |
190 | { GPCMD_GET_EVENT_STATUS_NOTIFICATION, "Get Event Status Notification" }, | 189 | { GPCMD_GET_EVENT_STATUS_NOTIFICATION, |
190 | "Get Event Status Notification" }, | ||
191 | { GPCMD_PAUSE_RESUME, "Pause/Resume" }, | 191 | { GPCMD_PAUSE_RESUME, "Pause/Resume" }, |
192 | { GPCMD_STOP_PLAY_SCAN, "Stop Play/Scan" }, | 192 | { GPCMD_STOP_PLAY_SCAN, "Stop Play/Scan" }, |
193 | { GPCMD_READ_DISC_INFO, "Read Disc Info" }, | 193 | { GPCMD_READ_DISC_INFO, "Read Disc Info" }, |
@@ -217,8 +217,6 @@ static const struct { | |||
217 | { GPCMD_READ_CD, "Read CD" }, | 217 | { GPCMD_READ_CD, "Read CD" }, |
218 | }; | 218 | }; |
219 | 219 | ||
220 | |||
221 | |||
222 | /* From Table 303 of the SFF8090 Ver. 3 (Mt. Fuji) draft standard. */ | 220 | /* From Table 303 of the SFF8090 Ver. 3 (Mt. Fuji) draft standard. */ |
223 | static const char * const sense_key_texts[16] = { | 221 | static const char * const sense_key_texts[16] = { |
224 | "No sense data", | 222 | "No sense data", |
@@ -262,16 +260,16 @@ static const struct { | |||
262 | { 0x011802, "Recovered data - the data was auto-reallocated" }, | 260 | { 0x011802, "Recovered data - the data was auto-reallocated" }, |
263 | { 0x011803, "Recovered data with CIRC" }, | 261 | { 0x011803, "Recovered data with CIRC" }, |
264 | { 0x011804, "Recovered data with L-EC" }, | 262 | { 0x011804, "Recovered data with L-EC" }, |
265 | { 0x015d00, | 263 | { 0x015d00, "Failure prediction threshold exceeded" |
266 | "Failure prediction threshold exceeded - Predicted logical unit failure" }, | 264 | " - Predicted logical unit failure" }, |
267 | { 0x015d01, | 265 | { 0x015d01, "Failure prediction threshold exceeded" |
268 | "Failure prediction threshold exceeded - Predicted media failure" }, | 266 | " - Predicted media failure" }, |
269 | { 0x015dff, "Failure prediction threshold exceeded - False" }, | 267 | { 0x015dff, "Failure prediction threshold exceeded - False" }, |
270 | { 0x017301, "Power calibration area almost full" }, | 268 | { 0x017301, "Power calibration area almost full" }, |
271 | { 0x020400, "Logical unit not ready - cause not reportable" }, | 269 | { 0x020400, "Logical unit not ready - cause not reportable" }, |
272 | /* Following is misspelled in ATAPI 2.6, _and_ in Mt. Fuji */ | 270 | /* Following is misspelled in ATAPI 2.6, _and_ in Mt. Fuji */ |
273 | { 0x020401, | 271 | { 0x020401, "Logical unit not ready" |
274 | "Logical unit not ready - in progress [sic] of becoming ready" }, | 272 | " - in progress [sic] of becoming ready" }, |
275 | { 0x020402, "Logical unit not ready - initializing command required" }, | 273 | { 0x020402, "Logical unit not ready - initializing command required" }, |
276 | { 0x020403, "Logical unit not ready - manual intervention required" }, | 274 | { 0x020403, "Logical unit not ready - manual intervention required" }, |
277 | { 0x020404, "Logical unit not ready - format in progress" }, | 275 | { 0x020404, "Logical unit not ready - format in progress" }, |
@@ -310,7 +308,6 @@ static const struct { | |||
310 | { 0x037304, "Program memory area / RMA update failure" }, | 308 | { 0x037304, "Program memory area / RMA update failure" }, |
311 | { 0x037305, "Program memory area / RMA is full" }, | 309 | { 0x037305, "Program memory area / RMA is full" }, |
312 | { 0x037306, "Program memory area / RMA is (almost) full" }, | 310 | { 0x037306, "Program memory area / RMA is (almost) full" }, |
313 | |||
314 | { 0x040200, "No seek complete" }, | 311 | { 0x040200, "No seek complete" }, |
315 | { 0x040300, "Write fault" }, | 312 | { 0x040300, "Write fault" }, |
316 | { 0x040900, "Track following error" }, | 313 | { 0x040900, "Track following error" }, |
@@ -344,12 +341,15 @@ static const struct { | |||
344 | { 0x055500, "System resource failure" }, | 341 | { 0x055500, "System resource failure" }, |
345 | { 0x056300, "End of user area encountered on this track" }, | 342 | { 0x056300, "End of user area encountered on this track" }, |
346 | { 0x056400, "Illegal mode for this track or incompatible medium" }, | 343 | { 0x056400, "Illegal mode for this track or incompatible medium" }, |
347 | { 0x056f00, "Copy protection key exchange failure - Authentication failure" }, | 344 | { 0x056f00, "Copy protection key exchange failure" |
345 | " - Authentication failure" }, | ||
348 | { 0x056f01, "Copy protection key exchange failure - Key not present" }, | 346 | { 0x056f01, "Copy protection key exchange failure - Key not present" }, |
349 | { 0x056f02, "Copy protection key exchange failure - Key not established" }, | 347 | { 0x056f02, "Copy protection key exchange failure" |
348 | " - Key not established" }, | ||
350 | { 0x056f03, "Read of scrambled sector without authentication" }, | 349 | { 0x056f03, "Read of scrambled sector without authentication" }, |
351 | { 0x056f04, "Media region code is mismatched to logical unit" }, | 350 | { 0x056f04, "Media region code is mismatched to logical unit" }, |
352 | { 0x056f05, "Drive region must be permanent / region reset count error" }, | 351 | { 0x056f05, "Drive region must be permanent" |
352 | " / region reset count error" }, | ||
353 | { 0x057203, "Session fixation error - incomplete track in session" }, | 353 | { 0x057203, "Session fixation error - incomplete track in session" }, |
354 | { 0x057204, "Empty or partially written reserved track" }, | 354 | { 0x057204, "Empty or partially written reserved track" }, |
355 | { 0x057205, "No more RZONE reservations are allowed" }, | 355 | { 0x057205, "No more RZONE reservations are allowed" }, |
@@ -364,7 +364,6 @@ static const struct { | |||
364 | { 0x065a00, "Operator request or state change input (unspecified)" }, | 364 | { 0x065a00, "Operator request or state change input (unspecified)" }, |
365 | { 0x065a01, "Operator medium removal request" }, | 365 | { 0x065a01, "Operator medium removal request" }, |
366 | { 0x0bb900, "Play operation aborted" }, | 366 | { 0x0bb900, "Play operation aborted" }, |
367 | |||
368 | /* Here we use 0xff for the key (not a valid key) to signify | 367 | /* Here we use 0xff for the key (not a valid key) to signify |
369 | * that these can have _any_ key value associated with them... */ | 368 | * that these can have _any_ key value associated with them... */ |
370 | { 0xff0401, "Logical unit is in process of becoming ready" }, | 369 | { 0xff0401, "Logical unit is in process of becoming ready" }, |