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

Commit b689e839 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
  ata: add missing ATA_* defines
  ata: add missing ATA_CMD_* defines
  ata: add missing ATA_ID_* defines (take 2)
  sgiioc4: fixup message on resource allocation failure
  ide-cd: use bcd2bin/bin2bcd
  cdrom: handle TOC
  gdrom: add dummy audio_ioctl handler
  viocd: add dummy audio ioctl handler
  cleanup powerpc/include/asm/ide.h
  drivers/ide/pci/: use __devexit_p()
parents a7f5aaf3 b5911620

arch/powerpc/include/asm/ide.h

+1 −42
Original line number Diff line number Diff line
@@ -6,12 +6,7 @@ 
#ifndef _ASM_POWERPC_IDE_H

#define _ASM_POWERPC_IDE_H



#ifdef __KERNEL__



#ifndef __powerpc64__

#include <linux/sched.h>

#include <asm/mpc8xx.h>

#endif

#include <linux/compiler.h>

#include <asm/io.h>



#define __ide_mm_insw(p, a, c)	readsw((void __iomem *)(p), (a), (c))
@@ -19,40 +14,4 @@ 
#define __ide_mm_outsw(p, a, c)	writesw((void __iomem *)(p), (a), (c))

#define __ide_mm_outsl(p, a, c)	writesl((void __iomem *)(p), (a), (c))



#ifndef  __powerpc64__

#include <linux/ioport.h>



/* FIXME: use ide_platform host driver */

static __inline__ int ide_default_irq(unsigned long base)

{

#ifdef CONFIG_PPLUS

	switch (base) {

	case 0x1f0:	return 14;

	case 0x170:	return 15;

	}

#endif

	return 0;

}



/* FIXME: use ide_platform host driver */

static __inline__ unsigned long ide_default_io_base(int index)

{

#ifdef CONFIG_PPLUS

	switch (index) {

	case 0:		return 0x1f0;

	case 1:		return 0x170;

	}

#endif

	return 0;

}



#ifdef CONFIG_BLK_DEV_MPC8xx_IDE

#define IDE_ARCH_ACK_INTR  1

#define ide_ack_intr(hwif) ((hwif)->ack_intr ? (hwif)->ack_intr(hwif) : 1)

#endif



#endif /* __powerpc64__ */



#endif /* __KERNEL__ */



#endif /* _ASM_POWERPC_IDE_H */

drivers/cdrom/cdrom.c

+0 −7
Original line number Diff line number Diff line
@@ -408,7 +408,6 @@ int register_cdrom(struct cdrom_device_info *cdi) 
	ENSURE(get_last_session, CDC_MULTI_SESSION);

	ENSURE(get_mcn, CDC_MCN);

	ENSURE(reset, CDC_RESET);

	ENSURE(audio_ioctl, CDC_PLAY_AUDIO);

	ENSURE(generic_packet, CDC_GENERIC_PACKET);

	cdi->mc_flags = 0;

	cdo->n_minors = 0;
@@ -2506,8 +2505,6 @@ static int cdrom_ioctl_get_subchnl(struct cdrom_device_info *cdi, 


	/* cdinfo(CD_DO_IOCTL,"entering CDROMSUBCHNL\n");*/



	if (!CDROM_CAN(CDC_PLAY_AUDIO))

		return -ENOSYS;

	if (copy_from_user(&q, argp, sizeof(q)))

		return -EFAULT;
@@ -2538,8 +2535,6 @@ static int cdrom_ioctl_read_tochdr(struct cdrom_device_info *cdi, 


	/* cdinfo(CD_DO_IOCTL, "entering CDROMREADTOCHDR\n"); */



	if (!CDROM_CAN(CDC_PLAY_AUDIO))

		return -ENOSYS;

	if (copy_from_user(&header, argp, sizeof(header)))

		return -EFAULT;
@@ -2562,8 +2557,6 @@ static int cdrom_ioctl_read_tocentry(struct cdrom_device_info *cdi, 


	/* cdinfo(CD_DO_IOCTL, "entering CDROMREADTOCENTRY\n"); */



	if (!CDROM_CAN(CDC_PLAY_AUDIO))

		return -ENOSYS;

	if (copy_from_user(&entry, argp, sizeof(entry)))

		return -EFAULT;

drivers/cdrom/gdrom.c

+7 −0
Original line number Diff line number Diff line
@@ -471,6 +471,12 @@ static int gdrom_getsense(short *bufstring) 
	return err;

}



static int gdrom_audio_ioctl(struct cdrom_device_info *cdi, unsigned int cmd,

			     void *arg)

{

	return -EINVAL;

}



static struct cdrom_device_ops gdrom_ops = {

	.open			= gdrom_open,

	.release		= gdrom_release,
@@ -478,6 +484,7 @@ static struct cdrom_device_ops gdrom_ops = { 
	.media_changed		= gdrom_mediachanged,

	.get_last_session	= gdrom_get_last_session,

	.reset			= gdrom_hardreset,

	.audio_ioctl		= gdrom_audio_ioctl,

	.capability		= CDC_MULTI_SESSION | CDC_MEDIA_CHANGED |

				  CDC_RESET | CDC_DRIVE_STATUS | CDC_CD_R,

	.n_minors		= 1,

drivers/cdrom/viocd.c

+7 −0
Original line number Diff line number Diff line
@@ -550,12 +550,19 @@ static void vio_handle_cd_event(struct HvLpEvent *event) 
	}

}



static int viocd_audio_ioctl(struct cdrom_device_info *cdi, unsigned int cmd,

			     void *arg)

{

	return -EINVAL;

}



static struct cdrom_device_ops viocd_dops = {

	.open = viocd_open,

	.release = viocd_release,

	.media_changed = viocd_media_changed,

	.lock_door = viocd_lock_door,

	.generic_packet = viocd_packet,

	.audio_ioctl = viocd_audio_ioctl,

	.capability = CDC_CLOSE_TRAY | CDC_OPEN_TRAY | CDC_LOCK | CDC_SELECT_SPEED | CDC_SELECT_DISC | CDC_MULTI_SESSION | CDC_MCN | CDC_MEDIA_CHANGED | CDC_PLAY_AUDIO | CDC_RESET | CDC_DRIVE_STATUS | CDC_GENERIC_PACKET | CDC_CD_R | CDC_CD_RW | CDC_DVD | CDC_DVD_R | CDC_DVD_RAM | CDC_RAM

};

drivers/ide/ide-cd.c

+10 −10
Original line number Diff line number Diff line
@@ -1272,9 +1272,9 @@ static ide_startstop_t ide_cd_do_request(ide_drive_t *drive, struct request *rq, 
 */

static void msf_from_bcd(struct atapi_msf *msf)

{

	msf->minute = BCD2BIN(msf->minute);

	msf->second = BCD2BIN(msf->second);

	msf->frame  = BCD2BIN(msf->frame);

	msf->minute = bcd2bin(msf->minute);

	msf->second = bcd2bin(msf->second);

	msf->frame  = bcd2bin(msf->frame);

}



int cdrom_check_status(ide_drive_t *drive, struct request_sense *sense)
@@ -1415,8 +1415,8 @@ int ide_cd_read_toc(ide_drive_t *drive, struct request_sense *sense) 
		return stat;



	if (drive->atapi_flags & IDE_AFLAG_TOCTRACKS_AS_BCD) {

		toc->hdr.first_track = BCD2BIN(toc->hdr.first_track);

		toc->hdr.last_track  = BCD2BIN(toc->hdr.last_track);

		toc->hdr.first_track = bcd2bin(toc->hdr.first_track);

		toc->hdr.last_track  = bcd2bin(toc->hdr.last_track);

	}



	ntracks = toc->hdr.last_track - toc->hdr.first_track + 1;
@@ -1456,8 +1456,8 @@ int ide_cd_read_toc(ide_drive_t *drive, struct request_sense *sense) 
			return stat;



		if (drive->atapi_flags & IDE_AFLAG_TOCTRACKS_AS_BCD) {

			toc->hdr.first_track = (u8)BIN2BCD(CDROM_LEADOUT);

			toc->hdr.last_track = (u8)BIN2BCD(CDROM_LEADOUT);

			toc->hdr.first_track = (u8)bin2bcd(CDROM_LEADOUT);

			toc->hdr.last_track = (u8)bin2bcd(CDROM_LEADOUT);

		} else {

			toc->hdr.first_track = CDROM_LEADOUT;

			toc->hdr.last_track = CDROM_LEADOUT;
@@ -1470,14 +1470,14 @@ int ide_cd_read_toc(ide_drive_t *drive, struct request_sense *sense) 
	toc->hdr.toc_length = be16_to_cpu(toc->hdr.toc_length);



	if (drive->atapi_flags & IDE_AFLAG_TOCTRACKS_AS_BCD) {

		toc->hdr.first_track = BCD2BIN(toc->hdr.first_track);

		toc->hdr.last_track  = BCD2BIN(toc->hdr.last_track);

		toc->hdr.first_track = bcd2bin(toc->hdr.first_track);

		toc->hdr.last_track  = bcd2bin(toc->hdr.last_track);

	}



	for (i = 0; i <= ntracks; i++) {

		if (drive->atapi_flags & IDE_AFLAG_TOCADDR_AS_BCD) {

			if (drive->atapi_flags & IDE_AFLAG_TOCTRACKS_AS_BCD)

				toc->ent[i].track = BCD2BIN(toc->ent[i].track);

				toc->ent[i].track = bcd2bin(toc->ent[i].track);

			msf_from_bcd(&toc->ent[i].addr.msf);

		}

		toc->ent[i].addr.lba = msf_to_lba(toc->ent[i].addr.msf.minute,