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

Commit c970d5a3 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:
  it821x: do not describe noraid parameter with its value
  Pb1200/DBAu1200: fix bad IDE resource size
  Au1200: IDE driver build fix
  Au1200: kill IDE driver function prototypes
  avr32 mustn't select HAVE_IDE
parents 6af74b03 da195665

arch/avr32/Kconfig

+0 −1
Original line number Original line Diff line number Diff line
@@ -10,7 +10,6 @@ config AVR32 
	# With EMBEDDED=n, we get lots of stuff automatically selected

	# With EMBEDDED=n, we get lots of stuff automatically selected

	# that we usually don't need on AVR32.

	# that we usually don't need on AVR32.

	select EMBEDDED

	select EMBEDDED

	select HAVE_IDE

	select HAVE_OPROFILE

	select HAVE_OPROFILE

	select HAVE_KPROBES

	select HAVE_KPROBES

	help

	help

arch/mips/au1000/common/platform.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -189,7 +189,7 @@ static struct resource au1200_lcd_resources[] = { 
static struct resource au1200_ide0_resources[] = {

static struct resource au1200_ide0_resources[] = {

	[0] = {

	[0] = {

		.start		= AU1XXX_ATA_PHYS_ADDR,

		.start		= AU1XXX_ATA_PHYS_ADDR,

		.end 		= AU1XXX_ATA_PHYS_ADDR + AU1XXX_ATA_PHYS_LEN,

		.end 		= AU1XXX_ATA_PHYS_ADDR + AU1XXX_ATA_PHYS_LEN - 1,

		.flags		= IORESOURCE_MEM,

		.flags		= IORESOURCE_MEM,

	},

	},

	[1] = {

	[1] = {

drivers/ide/mips/au1xxx-ide.c

+7 −11
Original line number Original line Diff line number Diff line
@@ -32,19 +32,12 @@ 
#include <linux/kernel.h>

#include <linux/kernel.h>

#include <linux/delay.h>

#include <linux/delay.h>

#include <linux/platform_device.h>

#include <linux/platform_device.h>



#include <linux/init.h>

#include <linux/init.h>

#include <linux/ide.h>

#include <linux/ide.h>

#include <linux/sysdev.h>

#include <linux/scatterlist.h>



#include <linux/dma-mapping.h>



#include "ide-timing.h"





#include <asm/io.h>

#include <asm/mach-au1x00/au1xxx.h>

#include <asm/mach-au1x00/au1xxx.h>

#include <asm/mach-au1x00/au1xxx_dbdma.h>

#include <asm/mach-au1x00/au1xxx_dbdma.h>



#include <asm/mach-au1x00/au1xxx_ide.h>

#include <asm/mach-au1x00/au1xxx_ide.h>





#define DRV_NAME	"au1200-ide"

#define DRV_NAME	"au1200-ide"
@@ -56,6 +49,8 @@ 
static _auide_hwif auide_hwif;

static _auide_hwif auide_hwif;

static int dbdma_init_done;

static int dbdma_init_done;





static int auide_ddma_init(_auide_hwif *auide);



#if defined(CONFIG_BLK_DEV_IDE_AU1XXX_PIO_DBDMA)

#if defined(CONFIG_BLK_DEV_IDE_AU1XXX_PIO_DBDMA)





void auide_insw(unsigned long port, void *addr, u32 count)

void auide_insw(unsigned long port, void *addr, u32 count)
@@ -591,13 +586,14 @@ static int au_ide_probe(struct device *dev) 
		goto out;

		goto out;

	}

	}





	if (!request_mem_region (res->start, res->end-res->start, pdev->name)) {

	if (!request_mem_region(res->start, res->end - res->start + 1,

				pdev->name)) {

		pr_debug("%s: request_mem_region failed\n", DRV_NAME);

		pr_debug("%s: request_mem_region failed\n", DRV_NAME);

		ret =  -EBUSY;

		ret =  -EBUSY;

		goto out;

		goto out;

	}

	}





	ahwif->regbase = (u32)ioremap(res->start, res->end-res->start);

	ahwif->regbase = (u32)ioremap(res->start, res->end - res->start + 1);

	if (ahwif->regbase == 0) {

	if (ahwif->regbase == 0) {

		ret = -ENOMEM;

		ret = -ENOMEM;

		goto out;

		goto out;
@@ -682,7 +678,7 @@ static int au_ide_remove(struct device *dev) 
	iounmap((void *)ahwif->regbase);

	iounmap((void *)ahwif->regbase);





	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	release_mem_region(res->start, res->end - res->start);

	release_mem_region(res->start, res->end - res->start + 1);





	return 0;

	return 0;

}

}

drivers/ide/pci/it821x.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -667,7 +667,7 @@ static int __init it821x_ide_init(void) 
module_init(it821x_ide_init);

module_init(it821x_ide_init);





module_param_named(noraid, it8212_noraid, int, S_IRUGO);

module_param_named(noraid, it8212_noraid, int, S_IRUGO);

MODULE_PARM_DESC(it8212_noraid, "Force card into bypass mode");

MODULE_PARM_DESC(noraid, "Force card into bypass mode");





MODULE_AUTHOR("Alan Cox");

MODULE_AUTHOR("Alan Cox");

MODULE_DESCRIPTION("PCI driver module for the ITE 821x");

MODULE_DESCRIPTION("PCI driver module for the ITE 821x");

include/asm-mips/mach-au1x00/au1xxx_ide.h

+0 −18
Original line number Original line Diff line number Diff line
@@ -122,24 +122,6 @@ static const struct drive_list_entry dma_black_list [] = { 
};

};

#endif

#endif





/* function prototyping */

u8 auide_inb(unsigned long port);

u16 auide_inw(unsigned long port);

u32 auide_inl(unsigned long port);

void auide_insw(unsigned long port, void *addr, u32 count);

void auide_insl(unsigned long port, void *addr, u32 count);

void auide_outb(u8 addr, unsigned long port);

void auide_outbsync(ide_drive_t *drive, u8 addr, unsigned long port);

void auide_outw(u16 addr, unsigned long port);

void auide_outl(u32 addr, unsigned long port);

void auide_outsw(unsigned long port, void *addr, u32 count);

void auide_outsl(unsigned long port, void *addr, u32 count);

static void auide_tune_drive(ide_drive_t *drive, byte pio);

static int auide_tune_chipset(ide_drive_t *drive, u8 speed);

static int auide_ddma_init( _auide_hwif *auide );

static void auide_setup_ports(hw_regs_t *hw, _auide_hwif *ahwif);

int __init auide_probe(void);



/*******************************************************************************

/*******************************************************************************

* PIO Mode timing calculation :                                                *

* PIO Mode timing calculation :                                                *

*                                                                              *

*                                                                              *