Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f18f960c authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

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: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 2609d06d

drivers/ide/ide-cd.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -2969,7 +2969,6 @@ static void ide_cd_release(struct kref *kref) 




	kfree(info->buffer);

	kfree(info->buffer);

	kfree(info->toc);

	kfree(info->toc);

	kfree(info->changer_info);

	if (devinfo->handle == drive && unregister_cdrom(devinfo))

	if (devinfo->handle == drive && unregister_cdrom(devinfo))

		printk(KERN_ERR "%s: %s failed to unregister device from the cdrom "

		printk(KERN_ERR "%s: %s failed to unregister device from the cdrom "

				"driver.\n", __FUNCTION__, drive->name);

				"driver.\n", __FUNCTION__, drive->name);

drivers/ide/ide-cd.h

+0 −55
Original line number Original line Diff line number Diff line
@@ -357,59 +357,6 @@ struct atapi_capabilities_page { 
	char pad[4];

	char pad[4];

};

};







struct atapi_mechstat_header {

#if defined(__BIG_ENDIAN_BITFIELD)

	__u8 fault         : 1;

	__u8 changer_state : 2;

	__u8 curslot       : 5;

#elif defined(__LITTLE_ENDIAN_BITFIELD)

	__u8 curslot       : 5;

	__u8 changer_state : 2;

	__u8 fault         : 1;

#else

#error "Please fix <asm/byteorder.h>"

#endif



#if defined(__BIG_ENDIAN_BITFIELD)

	__u8 mech_state    : 3;

	__u8 door_open     : 1;

	__u8 reserved1     : 4;

#elif defined(__LITTLE_ENDIAN_BITFIELD)

	__u8 reserved1     : 4;

	__u8 door_open     : 1;

	__u8 mech_state    : 3;

#else

#error "Please fix <asm/byteorder.h>"

#endif



	byte     curlba[3];

	byte     nslots;

	__u16	 slot_tablelen;

};





struct atapi_slot {

#if defined(__BIG_ENDIAN_BITFIELD)

	__u8 disc_present : 1;

	__u8 reserved1    : 6;

	__u8 change       : 1;

#elif defined(__LITTLE_ENDIAN_BITFIELD)

	__u8 change       : 1;

	__u8 reserved1    : 6;

	__u8 disc_present : 1;

#else

#error "Please fix <asm/byteorder.h>"

#endif



	byte reserved2[3];

};



struct atapi_changer_info {

	struct atapi_mechstat_header hdr;

	struct atapi_slot slots[0];

};



/* Extra per-device info for cdrom drives. */

/* Extra per-device info for cdrom drives. */

struct cdrom_info {

struct cdrom_info {

	ide_drive_t	*drive;

	ide_drive_t	*drive;
@@ -434,8 +381,6 @@ struct cdrom_info { 
	int dma;

	int dma;

	unsigned long last_block;

	unsigned long last_block;

	unsigned long start_seek;

	unsigned long start_seek;

	/* Buffer to hold mechanism status and changer slot table. */

	struct atapi_changer_info *changer_info;





	struct ide_cd_config_flags	config_flags;

	struct ide_cd_config_flags	config_flags;

	struct ide_cd_state_flags	state_flags;

	struct ide_cd_state_flags	state_flags;