luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ide-cd: kill CDROM_STATE_FLAGS() macro

Browse Source 
While at it rename 'info' variable to 'cd' in cdrom_saw_media_change().

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2008-02-01 23:09:21 +01:00
parent 4fe6717862
commit 0ba11211f9
2 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
drivers/ide/ide-cd.c
View File

@ -93,11 +93,11 @@ static void ide_cd_put(struct cdrom_info *cd)
buffers. */ buffers. */
static void cdrom_saw_media_change (ide_drive_t *drive) static void cdrom_saw_media_change (ide_drive_t *drive)
{ {
struct cdrom_info *info = drive->driver_data; struct cdrom_info *cd = drive->driver_data;
CDROM_STATE_FLAGS (drive)->media_changed = 1; cd->state_flags.media_changed = 1;
CDROM_STATE_FLAGS (drive)->toc_valid = 0; cd->state_flags.toc_valid = 0;
info->nsectors_buffered = 0; cd->nsectors_buffered = 0;
} }
static int cdrom_log_sense(ide_drive_t *drive, struct request *rq, static int cdrom_log_sense(ide_drive_t *drive, struct request *rq,
@ -1880,7 +1880,7 @@ cdrom_lockdoor(ide_drive_t *drive, int lockflag, struct request_sense *sense)
stat = 0; stat = 0;
if (stat == 0) if (stat == 0)
CDROM_STATE_FLAGS(drive)->door_locked = lockflag; cd->state_flags.door_locked = lockflag;
return stat; return stat;
} }
@ -1900,7 +1900,7 @@ static int cdrom_eject(ide_drive_t *drive, int ejectflag,
return -EDRIVE_CANT_DO_THIS; return -EDRIVE_CANT_DO_THIS;
/* reload fails on some drives, if the tray is locked */ /* reload fails on some drives, if the tray is locked */
if (CDROM_STATE_FLAGS(drive)->door_locked && ejectflag) if (cd->state_flags.door_locked && ejectflag)
return 0; return 0;
cdrom_prepare_request(drive, &req); cdrom_prepare_request(drive, &req);
@ -1998,7 +1998,7 @@ static int cdrom_read_toc(ide_drive_t *drive, struct request_sense *sense)
If it is, just return. */ If it is, just return. */
(void) cdrom_check_status(drive, sense); (void) cdrom_check_status(drive, sense);
if (CDROM_STATE_FLAGS(drive)->toc_valid) if (info->state_flags.toc_valid)
return 0; return 0;
/* Try to get the total cdrom capacity and sector size. */ /* Try to get the total cdrom capacity and sector size. */
@ -2137,7 +2137,7 @@ static int cdrom_read_toc(ide_drive_t *drive, struct request_sense *sense)
} }
/* Remember that we've read this stuff. */ /* Remember that we've read this stuff. */
CDROM_STATE_FLAGS(drive)->toc_valid = 1; info->state_flags.toc_valid = 1;
return 0; return 0;
} }
@ -2219,7 +2219,7 @@ static int cdrom_get_toc_entry(ide_drive_t *drive, int track,
/* /*
* don't serve cached data, if the toc isn't valid * don't serve cached data, if the toc isn't valid
*/ */
if (!CDROM_STATE_FLAGS(drive)->toc_valid) if (!info->state_flags.toc_valid)
return -EINVAL; return -EINVAL;
/* Check validity of requested track number. */ /* Check validity of requested track number. */
@ -2351,6 +2351,7 @@ static
int ide_cdrom_reset (struct cdrom_device_info *cdi) int ide_cdrom_reset (struct cdrom_device_info *cdi)
{ {
ide_drive_t *drive = cdi->handle; ide_drive_t *drive = cdi->handle;
struct cdrom_info *cd = drive->driver_data;
struct request_sense sense; struct request_sense sense;
struct request req; struct request req;
int ret; int ret;
@ -2364,7 +2365,7 @@ int ide_cdrom_reset (struct cdrom_device_info *cdi)
* A reset will unlock the door. If it was previously locked, * A reset will unlock the door. If it was previously locked,
* lock it again. * lock it again.
*/ */
if (CDROM_STATE_FLAGS(drive)->door_locked) if (cd->state_flags.door_locked)
(void) cdrom_lockdoor(drive, 1, &sense); (void) cdrom_lockdoor(drive, 1, &sense);
return ret; return ret;
@ -2434,7 +2435,7 @@ void ide_cdrom_update_speed (ide_drive_t *drive, struct atapi_capabilities_page
maxspeed = be16_to_cpu(cap->maxspeed); maxspeed = be16_to_cpu(cap->maxspeed);
} }
CDROM_STATE_FLAGS(drive)->current_speed = (curspeed + (176/2)) / 176; cd->state_flags.current_speed = (curspeed + (176/2)) / 176;
cd->config_flags.max_speed = (maxspeed + (176/2)) / 176; cd->config_flags.max_speed = (maxspeed + (176/2)) / 176;
} }
@ -2442,6 +2443,7 @@ static
int ide_cdrom_select_speed (struct cdrom_device_info *cdi, int speed) int ide_cdrom_select_speed (struct cdrom_device_info *cdi, int speed)
{ {
ide_drive_t *drive = cdi->handle; ide_drive_t *drive = cdi->handle;
struct cdrom_info *cd = drive->driver_data;
struct request_sense sense; struct request_sense sense;
struct atapi_capabilities_page cap; struct atapi_capabilities_page cap;
int stat; int stat;
@ -2451,7 +2453,7 @@ int ide_cdrom_select_speed (struct cdrom_device_info *cdi, int speed)
if (!ide_cdrom_get_capabilities(drive, &cap)) { if (!ide_cdrom_get_capabilities(drive, &cap)) {
ide_cdrom_update_speed(drive, &cap); ide_cdrom_update_speed(drive, &cap);
cdi->speed = CDROM_STATE_FLAGS(drive)->current_speed; cdi->speed = cd->state_flags.current_speed;
} }
return 0; return 0;
} }
@ -2512,7 +2514,7 @@ int ide_cdrom_get_last_session (struct cdrom_device_info *cdi,
struct request_sense sense; struct request_sense sense;
int ret; int ret;
if (!CDROM_STATE_FLAGS(drive)->toc_valid || info->toc == NULL) if (!info->state_flags.toc_valid || info->toc == NULL)
if ((ret = cdrom_read_toc(drive, &sense))) if ((ret = cdrom_read_toc(drive, &sense)))
return ret; return ret;
@ -2554,12 +2556,13 @@ int ide_cdrom_check_media_change_real (struct cdrom_device_info *cdi,
int slot_nr) int slot_nr)
{ {
ide_drive_t *drive = cdi->handle; ide_drive_t *drive = cdi->handle;
struct cdrom_info *cd = drive->driver_data;
int retval; int retval;
if (slot_nr == CDSL_CURRENT) { if (slot_nr == CDSL_CURRENT) {
(void) cdrom_check_status(drive, NULL); (void) cdrom_check_status(drive, NULL);
retval = CDROM_STATE_FLAGS(drive)->media_changed; retval = cd->state_flags.media_changed;
CDROM_STATE_FLAGS(drive)->media_changed = 0; cd->state_flags.media_changed = 0;
return retval; return retval;
} else { } else {
return -EINVAL; return -EINVAL;
@ -2581,9 +2584,10 @@ static
void ide_cdrom_release_real (struct cdrom_device_info *cdi) void ide_cdrom_release_real (struct cdrom_device_info *cdi)
{ {
ide_drive_t *drive = cdi->handle; ide_drive_t *drive = cdi->handle;
struct cdrom_info *cd = drive->driver_data;
if (!cdi->use_count) if (!cdi->use_count)
CDROM_STATE_FLAGS(drive)->toc_valid = 0; cd->state_flags.toc_valid = 0;
} }
#define IDE_CD_CAPABILITIES \ #define IDE_CD_CAPABILITIES \
@ -2615,7 +2619,7 @@ static int ide_cdrom_register (ide_drive_t *drive, int nslots)
struct cdrom_device_info *devinfo = &info->devinfo; struct cdrom_device_info *devinfo = &info->devinfo;
devinfo->ops = &ide_cdrom_dops; devinfo->ops = &ide_cdrom_dops;
devinfo->speed = CDROM_STATE_FLAGS(drive)->current_speed; devinfo->speed = info->state_flags.current_speed;
devinfo->capacity = nslots; devinfo->capacity = nslots;
devinfo->handle = drive; devinfo->handle = drive;
strcpy(devinfo->name, drive->name); strcpy(devinfo->name, drive->name);
@ -2841,7 +2845,7 @@ int ide_cdrom_setup (ide_drive_t *drive)
drive->special.all = 0; drive->special.all = 0;
CDROM_STATE_FLAGS(drive)->media_changed = 1; cd->state_flags.media_changed = 1;
#if NO_DOOR_LOCKING #if NO_DOOR_LOCKING
cd->config_flags.no_doorlock = 1; cd->config_flags.no_doorlock = 1;

2
drivers/ide/ide-cd.h
View File

@ -80,8 +80,6 @@ struct ide_cd_state_flags {
byte current_speed; /* Current speed of the drive */ byte current_speed; /* Current speed of the drive */
}; };
#define CDROM_STATE_FLAGS(drive) (&(((struct cdrom_info *)(drive->driver_data))->state_flags))
/* Structure of a MSF cdrom address. */ /* Structure of a MSF cdrom address. */
struct atapi_msf { struct atapi_msf {
byte reserved; byte reserved;