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

Commit afa153fd 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:
  ide/Kconfig: mark ide-scsi as deprecated
  ide-disk: remove stale init_idedisk_capacity() documentation
  palm_bk3710: improve IDE registration
  ide: fix hwif_to_node()
  IDE: palm_bk3710: fix compile warning for unused variable
  IDE: compile fix for sff_dma_ops
parents ba6271ea 5a61dd9e

drivers/ide/Kconfig

+1 −15
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ config BLK_DEV_IDEFLOPPY 
	  module will be called ide-floppy.



config BLK_DEV_IDESCSI

	tristate "SCSI emulation support"

	tristate "SCSI emulation support (DEPRECATED)"

	depends on SCSI

	select IDE_ATAPI

	---help---
@@ -255,20 +255,6 @@ config BLK_DEV_IDESCSI 
	  and will allow you to use a SCSI device driver instead of a native

	  ATAPI driver.



	  This is useful if you have an ATAPI device for which no native

	  driver has been written (for example, an ATAPI PD-CD drive);

	  you can then use this emulation together with an appropriate SCSI

	  device driver. In order to do this, say Y here and to "SCSI support"

	  and "SCSI generic support", below. You must then provide the kernel

	  command line "hdx=ide-scsi" (try "man bootparam" or see the

	  documentation of your boot loader (lilo or loadlin) about how to

	  pass options to the kernel at boot time) for devices if you want the

	  native EIDE sub-drivers to skip over the native support, so that

	  this SCSI emulation can be used instead.



	  Note that this option does NOT allow you to attach SCSI devices to a

	  box that doesn't have a SCSI host adapter installed.



	  If both this SCSI emulation and native ATAPI support are compiled

	  into the kernel, the native support will be used.

drivers/ide/arm/palm_bk3710.c

+3 −5
Original line number Diff line number Diff line
@@ -343,11 +343,10 @@ static struct ide_port_info __devinitdata palm_bk3710_port_info = { 
	.mwdma_mask		= ATA_MWDMA2,

};



static int __devinit palm_bk3710_probe(struct platform_device *pdev)

static int __init palm_bk3710_probe(struct platform_device *pdev)

{

	struct clk *clk;

	struct resource *mem, *irq;

	struct ide_host *host;

	unsigned long base, rate;

	int i, rc;

	hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
@@ -390,6 +389,7 @@ static int __devinit palm_bk3710_probe(struct platform_device *pdev) 
		hw.io_ports_array[i] = base + IDE_PALM_ATA_PRI_REG_OFFSET + i;

	hw.io_ports.ctl_addr = base + IDE_PALM_ATA_PRI_CTL_OFFSET;

	hw.irq = irq->start;

	hw.dev = &pdev->dev;

	hw.chipset = ide_palm3710;



	palm_bk3710_port_info.udma_mask = rate < 100000000 ? ATA_UDMA4 :
@@ -413,13 +413,11 @@ static struct platform_driver platform_bk_driver = { 
		.name = "palm_bk3710",

		.owner = THIS_MODULE,

	},

	.probe = palm_bk3710_probe,

	.remove = NULL,

};



static int __init palm_bk3710_init(void)

{

	return platform_driver_register(&platform_bk_driver);

	return platform_driver_probe(&platform_bk_driver, palm_bk3710_probe);

}



module_init(palm_bk3710_init);

drivers/ide/ide-disk.c

+0 −14
Original line number Diff line number Diff line
@@ -445,20 +445,6 @@ static void idedisk_check_hpa(ide_drive_t *drive) 
	}

}



/*

 * Compute drive->capacity, the full capacity of the drive

 * Called with drive->id != NULL.

 *

 * To compute capacity, this uses either of

 *

 *    1. CHS value set by user       (whatever user sets will be trusted)

 *    2. LBA value from target drive (require new ATA feature)

 *    3. LBA value from system BIOS  (new one is OK, old one may break)

 *    4. CHS value from system BIOS  (traditional style)

 *

 * in above order (i.e., if value of higher priority is available,

 * reset will be ignored).

 */

static void init_idedisk_capacity(ide_drive_t *drive)

{

	struct hd_driveid *id = drive->id;

include/linux/ide.h

+2 −3
Original line number Diff line number Diff line
@@ -1111,7 +1111,6 @@ void ide_setup_pci_noise(struct pci_dev *, const struct ide_port_info *); 
#ifdef CONFIG_BLK_DEV_IDEDMA_PCI

int ide_pci_set_master(struct pci_dev *, const char *);

unsigned long ide_pci_dma_base(ide_hwif_t *, const struct ide_port_info *);

extern const struct ide_dma_ops sff_dma_ops;

int ide_pci_check_simplex(ide_hwif_t *, const struct ide_port_info *);

int ide_hwif_setup_dma(ide_hwif_t *, const struct ide_port_info *);

#else
@@ -1275,6 +1274,7 @@ extern int __ide_dma_end(ide_drive_t *); 
int ide_dma_test_irq(ide_drive_t *);

extern void ide_dma_lost_irq(ide_drive_t *);

extern void ide_dma_timeout(ide_drive_t *);

extern const struct ide_dma_ops sff_dma_ops;

#endif /* CONFIG_BLK_DEV_IDEDMA_SFF */



#else
@@ -1448,8 +1448,7 @@ static inline void ide_dump_identify(u8 *id) 


static inline int hwif_to_node(ide_hwif_t *hwif)

{

	struct pci_dev *dev = to_pci_dev(hwif->dev);

	return hwif->dev ? pcibus_to_node(dev->bus) : -1;

	return hwif->dev ? dev_to_node(hwif->dev) : -1;

}



static inline ide_drive_t *ide_get_paired_drive(ide_drive_t *drive)