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

Commit 9fe02668 authored Dec 02, 2009 by David S. Miller

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ide-2.6

parents 602da297 10ca3028

drivers/ide/cmd64x.c

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -379,7 +379,8 @@ static const struct ide_port_info cmd64x_chipsets[] __devinitdata = {
	.enablebits = {{0x00,0x00,0x00}, {0x51,0x08,0x08}},		.enablebits = {{0x00,0x00,0x00}, {0x51,0x08,0x08}},
	.port_ops = &cmd64x_port_ops,		.port_ops = &cmd64x_port_ops,
	.host_flags = IDE_HFLAG_CLEAR_SIMPLEX \|		.host_flags = IDE_HFLAG_CLEAR_SIMPLEX \|
	IDE_HFLAG_ABUSE_PREFETCH,		IDE_HFLAG_ABUSE_PREFETCH \|
			IDE_HFLAG_SERIALIZE,
	.pio_mask = ATA_PIO5,		.pio_mask = ATA_PIO5,
	.mwdma_mask = ATA_MWDMA2,		.mwdma_mask = ATA_MWDMA2,
	.udma_mask = 0x00, /* no udma */		.udma_mask = 0x00, /* no udma */
	@@ -389,7 +390,8 @@ static const struct ide_port_info cmd64x_chipsets[] __devinitdata = {
	.init_chipset = init_chipset_cmd64x,		.init_chipset = init_chipset_cmd64x,
	.enablebits = {{0x51,0x04,0x04}, {0x51,0x08,0x08}},		.enablebits = {{0x51,0x04,0x04}, {0x51,0x08,0x08}},
	.port_ops = &cmd648_port_ops,		.port_ops = &cmd648_port_ops,
	.host_flags = IDE_HFLAG_ABUSE_PREFETCH,		.host_flags = IDE_HFLAG_ABUSE_PREFETCH \|
			IDE_HFLAG_SERIALIZE,
	.pio_mask = ATA_PIO5,		.pio_mask = ATA_PIO5,
	.mwdma_mask = ATA_MWDMA2,		.mwdma_mask = ATA_MWDMA2,
	.udma_mask = ATA_UDMA2,		.udma_mask = ATA_UDMA2,

drivers/ide/cs5535.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -187,6 +187,7 @@ static int __devinit cs5535_init_one(struct pci_dev *dev,

	static const struct pci_device_id cs5535_pci_tbl[] = {		static const struct pci_device_id cs5535_pci_tbl[] = {
	{ PCI_VDEVICE(NS, PCI_DEVICE_ID_NS_CS5535_IDE), 0 },		{ PCI_VDEVICE(NS, PCI_DEVICE_ID_NS_CS5535_IDE), 0 },
			{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_CS5535_IDE), },
	{ 0, },		{ 0, },
	};		};

drivers/ide/ide-ioctls.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -162,7 +162,7 @@ static int ide_cmd_ioctl(ide_drive_t *drive, unsigned long arg)
	if (tf->command == ATA_CMD_SET_FEATURES &&		if (tf->command == ATA_CMD_SET_FEATURES &&
	tf->feature == SETFEATURES_XFER &&		tf->feature == SETFEATURES_XFER &&
	tf->nsect >= XFER_SW_DMA_0) {		tf->nsect >= XFER_SW_DMA_0) {
	xfer_rate = ide_find_dma_mode(drive, XFER_UDMA_6);		xfer_rate = ide_find_dma_mode(drive, tf->nsect);
	if (xfer_rate != tf->nsect) {		if (xfer_rate != tf->nsect) {
	err = -EINVAL;		err = -EINVAL;
	goto abort;		goto abort;

drivers/ide/ide-probe.c

+0 −9

Original line number	Original line	Diff line number	Diff line
	@@ -1046,15 +1046,6 @@ static void ide_port_init_devices(ide_hwif_t *hwif)
	if (port_ops && port_ops->init_dev)		if (port_ops && port_ops->init_dev)
	port_ops->init_dev(drive);		port_ops->init_dev(drive);
	}		}

	ide_port_for_each_dev(i, drive, hwif) {
	/*
	* default to PIO Mode 0 before we figure out
	* the most suited mode for the attached device
	*/
	if (port_ops && port_ops->set_pio_mode)
	port_ops->set_pio_mode(drive, 0);
	}
	}		}

	static void ide_init_port(ide_hwif_t *hwif, unsigned int port,		static void ide_init_port(ide_hwif_t *hwif, unsigned int port,

drivers/ide/slc90e66.c

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -91,8 +91,7 @@ static void slc90e66_set_dma_mode(ide_drive_t *drive, const u8 speed)

	if (!(reg48 & u_flag))		if (!(reg48 & u_flag))
	pci_write_config_word(dev, 0x48, reg48\|u_flag);		pci_write_config_word(dev, 0x48, reg48\|u_flag);
	/* FIXME: (reg4a & a_speed) ? */		if ((reg4a & a_speed) != u_speed) {
	if ((reg4a & u_speed) != u_speed) {
	pci_write_config_word(dev, 0x4a, reg4a & ~a_speed);		pci_write_config_word(dev, 0x4a, reg4a & ~a_speed);
	pci_read_config_word(dev, 0x4a, &reg4a);		pci_read_config_word(dev, 0x4a, &reg4a);
	pci_write_config_word(dev, 0x4a, reg4a\|u_speed);		pci_write_config_word(dev, 0x4a, reg4a\|u_speed);