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

Commit eb3aff55 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: print message on error in ide_find_port_slot() 



* Add DRV_NAME define to ide-h8300.c.

* Fix ide-h8300.c, swarm.c and sgiioc4.c to set .name field in
  struct ide_port_info to DRV_NAME, then convert these host drivers
  to use ide_find_port_slot() instead of ide_find_port().

* Print message on error in ide_find_port_slot().

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 7b60fa16

drivers/ide/h8300/ide-h8300.c

+4 −4
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ 
#include <asm/io.h>

#include <asm/irq.h>



#define DRV_NAME "ide-h8300"



#define bswap(d) \

({					\

	u16 r;				\
@@ -196,11 +198,9 @@ static int __init h8300_ide_init(void) 


	hw_setup(&hw);



	hwif = ide_find_port();

	if (hwif == NULL) {

		printk(KERN_ERR "ide-h8300: IDE I/F register failed\n");

	hwif = ide_find_port_slot(&h8300_port_info);

	if (hwif == NULL)

		return -ENOENT;

	}



	index = hwif->index;

	ide_init_port_hw(hwif, &hw);

drivers/ide/ide-probe.c

+3 −0
Original line number Diff line number Diff line
@@ -1490,6 +1490,9 @@ ide_hwif_t *ide_find_port_slot(const struct ide_port_info *d) 
		}

	}



	printk(KERN_ERR "%s: no free slot for interface\n",

			d ? d->name : "ide");



	return NULL;



out_found:

drivers/ide/mips/swarm.c

+3 −4
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ static struct resource swarm_ide_resource = { 
static struct platform_device *swarm_ide_dev;



static const struct ide_port_info swarm_port_info = {

	.name			= DRV_NAME,

	.host_flags		= IDE_HFLAG_MMIO | IDE_HFLAG_NO_DMA,

};
@@ -81,11 +82,9 @@ static int __devinit swarm_ide_probe(struct device *dev) 
	if (!SIBYTE_HAVE_IDE)

		return -ENODEV;



	hwif = ide_find_port();

	if (hwif == NULL) {

		printk(KERN_ERR DRV_NAME ": no free slot for interface\n");

	hwif = ide_find_port_slot(&swarm_port_info);

	if (hwif == NULL)

		return -ENOMEM;

	}



	base = ioremap(A_IO_EXT_BASE, 0x800);

	offset = __raw_readq(base + R_IO_EXT_REG(R_IO_EXT_START_ADDR, IDE_CS));

drivers/ide/pci/scc_pata.c

+2 −5
Original line number Diff line number Diff line
@@ -558,12 +558,9 @@ static int scc_ide_setup_pci_device(struct pci_dev *dev, 
	u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };

	int i;



	hwif = ide_find_port();

	if (hwif == NULL) {

		printk(KERN_ERR "%s: too many IDE interfaces, "

				"no room in table\n", SCC_PATA_NAME);

	hwif = ide_find_port_slot(d);

	if (hwif == NULL)

		return -ENOMEM;

	}



	memset(&hw, 0, sizeof(hw));

	for (i = 0; i <= 8; i++)

drivers/ide/pci/sgiioc4.c

+3 −5
Original line number Diff line number Diff line
@@ -568,6 +568,7 @@ static const struct ide_dma_ops sgiioc4_dma_ops = { 
};



static const struct ide_port_info sgiioc4_port_info __devinitdata = {

	.name			= DRV_NAME,

	.chipset		= ide_pci,

	.init_dma		= ide_dma_sgiioc4,

	.port_ops		= &sgiioc4_port_ops,
@@ -587,12 +588,9 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev) 
	hw_regs_t hw;

	struct ide_port_info d = sgiioc4_port_info;



	hwif = ide_find_port();

	if (hwif == NULL) {

		printk(KERN_ERR "%s: too many IDE interfaces, no room in table\n",

				DRV_NAME);

	hwif = ide_find_port_slot(&d);

	if (hwif == NULL)

		return -ENOMEM;

	}



	/*  Get the CmdBlk and CtrlBlk Base Registers */

	bar0 = pci_resource_start(dev, 0);