diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-02-01 17:09:19 -0500 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-02-01 17:09:19 -0500 |
commit | f18f960c5c1568fa2f720e2cb31d6c1af9ea1e1a (patch) | |
tree | f14e3cbe9702f064ee7d09458a6366dd54ee6186 /drivers/ide | |
parent | 2609d06d36317cc22f6d3c37186a8cf1a5f87ba6 (diff) |
ide-cd: remove struct atapi_{mechstat_header,changer_info,slot}
* Remove ->changer_info from struct cdrom_info (it is never allocated).
* Remove unused struct atapi_{mechstat_header,changer_info,slot}.
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide')
-rw-r--r-- | drivers/ide/ide-cd.c | 1 | ||||
-rw-r--r-- | drivers/ide/ide-cd.h | 55 |
2 files changed, 0 insertions, 56 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index c736f769bff3..f02ddc5b3b17 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c | |||
@@ -2969,7 +2969,6 @@ static void ide_cd_release(struct kref *kref) | |||
2969 | 2969 | ||
2970 | kfree(info->buffer); | 2970 | kfree(info->buffer); |
2971 | kfree(info->toc); | 2971 | kfree(info->toc); |
2972 | kfree(info->changer_info); | ||
2973 | if (devinfo->handle == drive && unregister_cdrom(devinfo)) | 2972 | if (devinfo->handle == drive && unregister_cdrom(devinfo)) |
2974 | printk(KERN_ERR "%s: %s failed to unregister device from the cdrom " | 2973 | printk(KERN_ERR "%s: %s failed to unregister device from the cdrom " |
2975 | "driver.\n", __FUNCTION__, drive->name); | 2974 | "driver.\n", __FUNCTION__, drive->name); |
diff --git a/drivers/ide/ide-cd.h b/drivers/ide/ide-cd.h index d224b062db52..5bda4ec9ad2d 100644 --- a/drivers/ide/ide-cd.h +++ b/drivers/ide/ide-cd.h | |||
@@ -357,59 +357,6 @@ struct atapi_capabilities_page { | |||
357 | char pad[4]; | 357 | char pad[4]; |
358 | }; | 358 | }; |
359 | 359 | ||
360 | |||
361 | struct atapi_mechstat_header { | ||
362 | #if defined(__BIG_ENDIAN_BITFIELD) | ||
363 | __u8 fault : 1; | ||
364 | __u8 changer_state : 2; | ||
365 | __u8 curslot : 5; | ||
366 | #elif defined(__LITTLE_ENDIAN_BITFIELD) | ||
367 | __u8 curslot : 5; | ||
368 | __u8 changer_state : 2; | ||
369 | __u8 fault : 1; | ||
370 | #else | ||
371 | #error "Please fix <asm/byteorder.h>" | ||
372 | #endif | ||
373 | |||
374 | #if defined(__BIG_ENDIAN_BITFIELD) | ||
375 | __u8 mech_state : 3; | ||
376 | __u8 door_open : 1; | ||
377 | __u8 reserved1 : 4; | ||
378 | #elif defined(__LITTLE_ENDIAN_BITFIELD) | ||
379 | __u8 reserved1 : 4; | ||
380 | __u8 door_open : 1; | ||
381 | __u8 mech_state : 3; | ||
382 | #else | ||
383 | #error "Please fix <asm/byteorder.h>" | ||
384 | #endif | ||
385 | |||
386 | byte curlba[3]; | ||
387 | byte nslots; | ||
388 | __u16 slot_tablelen; | ||
389 | }; | ||
390 | |||
391 | |||
392 | struct atapi_slot { | ||
393 | #if defined(__BIG_ENDIAN_BITFIELD) | ||
394 | __u8 disc_present : 1; | ||
395 | __u8 reserved1 : 6; | ||
396 | __u8 change : 1; | ||
397 | #elif defined(__LITTLE_ENDIAN_BITFIELD) | ||
398 | __u8 change : 1; | ||
399 | __u8 reserved1 : 6; | ||
400 | __u8 disc_present : 1; | ||
401 | #else | ||
402 | #error "Please fix <asm/byteorder.h>" | ||
403 | #endif | ||
404 | |||
405 | byte reserved2[3]; | ||
406 | }; | ||
407 | |||
408 | struct atapi_changer_info { | ||
409 | struct atapi_mechstat_header hdr; | ||
410 | struct atapi_slot slots[0]; | ||
411 | }; | ||
412 | |||
413 | /* Extra per-device info for cdrom drives. */ | 360 | /* Extra per-device info for cdrom drives. */ |
414 | struct cdrom_info { | 361 | struct cdrom_info { |
415 | ide_drive_t *drive; | 362 | ide_drive_t *drive; |
@@ -434,8 +381,6 @@ struct cdrom_info { | |||
434 | int dma; | 381 | int dma; |
435 | unsigned long last_block; | 382 | unsigned long last_block; |
436 | unsigned long start_seek; | 383 | unsigned long start_seek; |
437 | /* Buffer to hold mechanism status and changer slot table. */ | ||
438 | struct atapi_changer_info *changer_info; | ||
439 | 384 | ||
440 | struct ide_cd_config_flags config_flags; | 385 | struct ide_cd_config_flags config_flags; |
441 | struct ide_cd_state_flags state_flags; | 386 | struct ide_cd_state_flags state_flags; |