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

ide: drop 'name' parameter from ->init_chipset method 



There should be no functional changes caused by this patch.

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

drivers/ide/pci/aec62xx.c

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ static void aec_set_pio_mode(ide_drive_t *drive, const u8 pio) 
	drive->hwif->port_ops->set_dma_mode(drive, pio + XFER_PIO_0);

}



static unsigned int __devinit init_chipset_aec62xx(struct pci_dev *dev, const char *name)

static unsigned int __devinit init_chipset_aec62xx(struct pci_dev *dev)

{

	/* These are necessary to get AEC6280 Macintosh cards to work */

	if ((dev->device == PCI_DEVICE_ID_ARTOP_ATP865) ||

drivers/ide/pci/alim15x3.c

+2 −3
Original line number Diff line number Diff line
@@ -209,13 +209,12 @@ static int ali15x3_dma_setup(ide_drive_t *drive) 
/**

 *	init_chipset_ali15x3	-	Initialise an ALi IDE controller

 *	@dev: PCI device

 *	@name: Name of the controller

 *

 *	This function initializes the ALI IDE controller and where 

 *	appropriate also sets up the 1533 southbridge.

 */



static unsigned int __devinit init_chipset_ali15x3 (struct pci_dev *dev, const char *name)

static unsigned int __devinit init_chipset_ali15x3(struct pci_dev *dev)

{

	unsigned long flags;

	u8 tmpbyte;

drivers/ide/pci/amd74xx.c

+8 −11
Original line number Diff line number Diff line
@@ -112,15 +112,13 @@ static void amd_set_pio_mode(ide_drive_t *drive, const u8 pio) 
	amd_set_drive(drive, XFER_PIO_0 + pio);

}



static void __devinit amd7409_cable_detect(struct pci_dev *dev,

					   const char *name)

static void __devinit amd7409_cable_detect(struct pci_dev *dev)

{

	/* no host side cable detection */

	amd_80w = 0x03;

}



static void __devinit amd7411_cable_detect(struct pci_dev *dev,

					   const char *name)

static void __devinit amd7411_cable_detect(struct pci_dev *dev)

{

	int i;

	u32 u = 0;
@@ -131,9 +129,9 @@ static void __devinit amd7411_cable_detect(struct pci_dev *dev, 
	amd_80w = ((t & 0x3) ? 1 : 0) | ((t & 0xc) ? 2 : 0);

	for (i = 24; i >= 0; i -= 8)

		if (((u >> i) & 4) && !(amd_80w & (1 << (1 - (i >> 4))))) {

			printk(KERN_WARNING "%s %s: BIOS didn't set cable bits "

				"correctly. Enabling workaround.\n",

				name, pci_name(dev));

			printk(KERN_WARNING DRV_NAME " %s: BIOS didn't set "

				"cable bits correctly. Enabling workaround.\n",

				pci_name(dev));

			amd_80w |= (1 << (1 - (i >> 4)));

		}

}
@@ -142,8 +140,7 @@ static void __devinit amd7411_cable_detect(struct pci_dev *dev, 
 * The initialization callback.  Initialize drive independent registers.

 */



static unsigned int __devinit init_chipset_amd74xx(struct pci_dev *dev,

						   const char *name)

static unsigned int __devinit init_chipset_amd74xx(struct pci_dev *dev)

{

	u8 t = 0, offset = amd_offset(dev);
@@ -156,9 +153,9 @@ static unsigned int __devinit init_chipset_amd74xx(struct pci_dev *dev, 
		; /* no UDMA > 2 */

	else if (dev->vendor == PCI_VENDOR_ID_AMD &&

		 dev->device == PCI_DEVICE_ID_AMD_VIPER_7409)

		amd7409_cable_detect(dev, name);

		amd7409_cable_detect(dev);

	else

		amd7411_cable_detect(dev, name);

		amd7411_cable_detect(dev);



/*

 * Take care of prefetch & postwrite.

drivers/ide/pci/cmd64x.c

+1 −1
Original line number Diff line number Diff line
@@ -332,7 +332,7 @@ static int cmd646_1_dma_end(ide_drive_t *drive) 
	return (dma_stat & 7) != 4;

}



static unsigned int __devinit init_chipset_cmd64x(struct pci_dev *dev, const char *name)

static unsigned int __devinit init_chipset_cmd64x(struct pci_dev *dev)

{

	u8 mrdmode = 0;

drivers/ide/pci/cs5530.c

+3 −4
Original line number Diff line number Diff line
@@ -129,12 +129,11 @@ static void cs5530_set_dma_mode(ide_drive_t *drive, const u8 mode) 
/**

 *	init_chipset_5530	-	set up 5530 bridge

 *	@dev: PCI device

 *	@name: device name

 *

 *	Initialize the cs5530 bridge for reliable IDE DMA operation.

 */



static unsigned int __devinit init_chipset_cs5530 (struct pci_dev *dev, const char *name)

static unsigned int __devinit init_chipset_cs5530(struct pci_dev *dev)

{

	struct pci_dev *master_0 = NULL, *cs5530_0 = NULL;
@@ -153,11 +152,11 @@ static unsigned int __devinit init_chipset_cs5530 (struct pci_dev *dev, const ch 
		}

	}

	if (!master_0) {

		printk(KERN_ERR "%s: unable to locate PCI MASTER function\n", name);

		printk(KERN_ERR DRV_NAME ": unable to locate PCI MASTER function\n");

		goto out;

	}

	if (!cs5530_0) {

		printk(KERN_ERR "%s: unable to locate CS5530 LEGACY function\n", name);

		printk(KERN_ERR DRV_NAME ": unable to locate CS5530 LEGACY function\n");

		goto out;

	}