IDE fixes
Subsystems (3)
Hi,
Inside:
* Some IDE PCI host drivers were not using __devexit_p() properly (Russell King discovered it the hard way & Adrian Bunk fixed it).
* Fix audio capabilities checking in cdrom.c (from Alexander Inyukhin with gdrom/viocd pre-fixes from Borislav Petkov).
* Add missing ATA_* defines to <linux/ata.h>, not fixes per-se but since they are obvious and merging it now will save us some merge conflicts in linux-next lets do it now.
* Misc obvious fixups/cleanups.
* No octopus.
Linus, please pull from:
master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6.git/
to receive the following updates:
arch/powerpc/include/asm/ide.h | 43 +----------- drivers/cdrom/cdrom.c | 7 -- drivers/cdrom/gdrom.c | 7 ++ drivers/cdrom/viocd.c | 7 ++ drivers/ide/ide-cd.c | 20 +++--- drivers/ide/pci/aec62xx.c | 2 +- drivers/ide/pci/cy82c693.c | 2 +- drivers/ide/pci/hpt366.c | 2 +- drivers/ide/pci/it821x.c | 2 +- drivers/ide/pci/pdc202xx_new.c | 2 +- drivers/ide/pci/scc_pata.c | 2 +- drivers/ide/pci/sgiioc4.c | 4 +- drivers/ide/pci/siimage.c | 2 +- drivers/ide/pci/sis5513.c | 2 +- drivers/ide/pci/tc86c001.c | 2 +- drivers/ide/pci/via82cxxx.c | 2 +- include/linux/ata.h | 155 ++++++++++++++++++++++++++++------------ 17 files changed, 146 insertions(+), 117 deletions(-)
Adrian Bunk (3):
drivers/ide/pci/: use __devexit_p()
cleanup powerpc/include/asm/ide.h
ide-cd: use bcd2bin/bin2bcd
Alexander Inyukhin (1):
cdrom: handle TOC
Bartlomiej Zolnierkiewicz (4):
sgiioc4: fixup message on resource allocation failure
ata: add missing ATA_ID_* defines (take 2)
ata: add missing ATA_CMD_* defines
ata: add missing ATA_* defines
Borislav Petkov (2):
viocd: add dummy audio ioctl handler
gdrom: add dummy audio_ioctl handler
arch/powerpc/include/asm/ide.h +1 -42
@@ -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
@@ -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
@@ -471,6 +471,12 @@ cleanup_sense_final: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
@@ -550,12 +550,19 @@ return_complete: } } +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
@@ -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,
drivers/ide/pci/aec62xx.c +1 -1
@@ -307,7 +307,7 @@ static struct pci_driver driver = { .name = "AEC62xx_IDE", .id_table = aec62xx_pci_tbl, .probe = aec62xx_init_one, - .remove = aec62xx_remove, + .remove = __devexit_p(aec62xx_remove), };static int __init aec62xx_ide_init (void )
drivers/ide/pci/cy82c693.c +1 -1
@@ -447,7 +447,7 @@ static struct pci_driver driver = { .name = "Cypress_IDE", .id_table = cy82c693_pci_tbl, .probe = cy82c693_init_one, - .remove = cy82c693_remove, + .remove = __devexit_p(cy82c693_remove), };static int __init cy82c693_ide_init (void )
drivers/ide/pci/hpt366.c +1 -1
@@ -1620,7 +1620,7 @@ static struct pci_driver driver = { .name = "HPT366_IDE", .id_table = hpt366_pci_tbl, .probe = hpt366_init_one, - .remove = hpt366_remove, + .remove = __devexit_p(hpt366_remove), };static int __init hpt366_ide_init (void )
drivers/ide/pci/it821x.c +1 -1
@@ -686,7 +686,7 @@ static struct pci_driver driver = { .name = "ITE821x IDE", .id_table = it821x_pci_tbl, .probe = it821x_init_one, - .remove = it821x_remove, + .remove = __devexit_p(it821x_remove), };static int __init it821x_ide_init (void )
drivers/ide/pci/pdc202xx_new.c +1 -1
@@ -566,7 +566,7 @@ static struct pci_driver driver = { .name = "Promise_IDE", .id_table = pdc202new_pci_tbl, .probe = pdc202new_init_one, - .remove = pdc202new_remove, + .remove = __devexit_p(pdc202new_remove), };static int __init pdc202new_ide_init (void )
drivers/ide/pci/scc_pata.c +1 -1
@@ -954,7 +954,7 @@ static struct pci_driver driver = { .name = "SCC IDE", .id_table = scc_pci_tbl, .probe = scc_init_one, - .remove = scc_remove, + .remove = __devexit_p(scc_remove), };static int scc_ide_init (void )
drivers/ide/pci/sgiioc4.c +2 -2
@@ -621,9 +621,9 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev)if (!request_mem_region (cmd_phys_base,IOC4_CMD_CTL_BLK_SIZE ,DRV_NAME )) {printk (KERN_ERR -"%s : %s -- ERROR, Addresses " +"%s %s: -- ERROR, Addresses " "0x%p to 0x%p ALREADY in use\n" , - __func__,DRV_NAME , (void *) cmd_phys_base, +DRV_NAME ,pci_name (dev), (void *)cmd_phys_base, (void *) cmd_phys_base +IOC4_CMD_CTL_BLK_SIZE );return -ENOMEM ; }
drivers/ide/pci/siimage.c +1 -1
@@ -832,7 +832,7 @@ static struct pci_driver driver = { .name = "SiI_IDE", .id_table = siimage_pci_tbl, .probe = siimage_init_one, - .remove = siimage_remove, + .remove = __devexit_p(siimage_remove), };static int __init siimage_ide_init (void )
drivers/ide/pci/sis5513.c +1 -1
@@ -610,7 +610,7 @@ static struct pci_driver driver = { .name = "SIS_IDE", .id_table = sis5513_pci_tbl, .probe = sis5513_init_one, - .remove = sis5513_remove, + .remove = __devexit_p(sis5513_remove), };static int __init sis5513_ide_init (void )
drivers/ide/pci/tc86c001.c +1 -1
@@ -249,7 +249,7 @@ static struct pci_driver driver = { .name = "TC86C001", .id_table = tc86c001_pci_tbl, .probe = tc86c001_init_one, - .remove = tc86c001_remove, + .remove = __devexit_p(tc86c001_remove), };static int __init tc86c001_ide_init (void )
drivers/ide/pci/via82cxxx.c +1 -1
@@ -491,7 +491,7 @@ static struct pci_driver driver = { .name = "VIA_IDE", .id_table = via_pci_tbl, .probe = via_init_one, - .remove = via_remove, + .remove = __devexit_p(via_remove), };static int __init via_ide_init (void )
include/linux/ata.h +109 -46
321 lines not on this page · raw message