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

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

tc86c001: remove ->init_chipset method 



* Reserve PCI BAR 5 in tc86c001_init_one() and remove no longer needed
  init_chipset_tc86c001().

While at it:

* Add & use DRV_NAME define.

Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent ee77325b

drivers/ide/pci/tc86c001.c

+26 −12
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 
#include <linux/pci.h>

#include <linux/ide.h>



#define DRV_NAME "TC86C001"



static void tc86c001_set_mode(ide_drive_t *drive, const u8 speed)

{

	ide_hwif_t *hwif	= HWIF(drive);
@@ -173,16 +175,6 @@ static void __devinit init_hwif_tc86c001(ide_hwif_t *hwif) 
	hwif->rqsize	 = 0xffff;

}



static unsigned int __devinit init_chipset_tc86c001(struct pci_dev *dev,

							const char *name)

{

	int err = pci_request_region(dev, 5, name);



	if (err)

		printk(KERN_ERR "%s: system control regs already in use", name);

	return err;

}



static const struct ide_port_ops tc86c001_port_ops = {

	.set_pio_mode		= tc86c001_set_pio_mode,

	.set_dma_mode		= tc86c001_set_mode,
@@ -202,7 +194,6 @@ static const struct ide_dma_ops tc86c001_dma_ops = { 


static const struct ide_port_info tc86c001_chipset __devinitdata = {

	.name		= "TC86C001",

	.init_chipset	= init_chipset_tc86c001,

	.init_hwif	= init_hwif_tc86c001,

	.port_ops	= &tc86c001_port_ops,

	.dma_ops	= &tc86c001_dma_ops,
@@ -215,7 +206,30 @@ static const struct ide_port_info tc86c001_chipset __devinitdata = { 
static int __devinit tc86c001_init_one(struct pci_dev *dev,

				       const struct pci_device_id *id)

{

	return ide_pci_init_one(dev, &tc86c001_chipset, NULL);

	int rc;



	rc = pci_enable_device(dev);

	if (rc)

		goto out;



	rc = pci_request_region(dev, 5, DRV_NAME);

	if (rc) {

		printk(KERN_ERR DRV_NAME ": system control regs already in use");

		goto out_disable;

	}



	rc = ide_pci_init_one(dev, &tc86c001_chipset, NULL);

	if (rc)

		goto out_release;



	goto out;



out_release:

	pci_release_region(dev, 5);

out_disable:

	pci_disable_device(dev);

out:

	return rc;

}



static const struct pci_device_id tc86c001_pci_tbl[] = {