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

Commit ada406c8 authored by Alan Cox's avatar Alan Cox Committed by Jeff Garzik
Browse files

[PATCH] pdc202xx_old: Fix name clashes with PA-RISC 



pdc_* functions are part of the global namespace for the PDC on PA-RISC
systems and this means our choice of pdc_ causes collisions between the
PDC globals and our static functions. Rename them to pdc202xx where they
are for both 2024x and 2026x.

Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 415ae2b5

drivers/ata/pata_pdc202xx_old.c

+29 −29
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#include <linux/libata.h>



#define DRV_NAME "pata_pdc202xx_old"

#define DRV_VERSION "0.2.1"

#define DRV_VERSION "0.2.2"



/**

 *	pdc2024x_pre_reset		-	probe begin
@@ -63,7 +63,7 @@ static void pdc2026x_error_handler(struct ata_port *ap) 
}



/**

 *	pdc_configure_piomode	-	set chip PIO timing

 *	pdc202xx_configure_piomode	-	set chip PIO timing

 *	@ap: ATA interface

 *	@adev: ATA device

 *	@pio: PIO mode
@@ -73,7 +73,7 @@ static void pdc2026x_error_handler(struct ata_port *ap) 
 *	versa

 */



static void pdc_configure_piomode(struct ata_port *ap, struct ata_device *adev, int pio)

static void pdc202xx_configure_piomode(struct ata_port *ap, struct ata_device *adev, int pio)

{

	struct pci_dev *pdev = to_pci_dev(ap->host->dev);

	int port = 0x60 + 4 * ap->port_no + 2 * adev->devno;
@@ -98,7 +98,7 @@ static void pdc_configure_piomode(struct ata_port *ap, struct ata_device *adev, 
}



/**

 *	pdc_set_piomode	-	set initial PIO mode data

 *	pdc202xx_set_piomode	-	set initial PIO mode data

 *	@ap: ATA interface

 *	@adev: ATA device

 *
@@ -106,13 +106,13 @@ static void pdc_configure_piomode(struct ata_port *ap, struct ata_device *adev, 
 *	but we want to set the PIO timing by default.

 */



static void pdc_set_piomode(struct ata_port *ap, struct ata_device *adev)

static void pdc202xx_set_piomode(struct ata_port *ap, struct ata_device *adev)

{

	pdc_configure_piomode(ap, adev, adev->pio_mode - XFER_PIO_0);

	pdc202xx_configure_piomode(ap, adev, adev->pio_mode - XFER_PIO_0);

}



/**

 *	pdc_configure_dmamode	-	set DMA mode in chip

 *	pdc202xx_configure_dmamode	-	set DMA mode in chip

 *	@ap: ATA interface

 *	@adev: ATA device

 *
@@ -120,7 +120,7 @@ static void pdc_set_piomode(struct ata_port *ap, struct ata_device *adev) 
 *	to occur.

 */



static void pdc_set_dmamode(struct ata_port *ap, struct ata_device *adev)

static void pdc202xx_set_dmamode(struct ata_port *ap, struct ata_device *adev)

{

	struct pci_dev *pdev = to_pci_dev(ap->host->dev);

	int port = 0x60 + 4 * ap->port_no + 2 * adev->devno;
@@ -184,7 +184,7 @@ static void pdc2026x_bmdma_start(struct ata_queued_cmd *qc) 


	/* The DMA clocks may have been trashed by a reset. FIXME: make conditional

	   and move to qc_issue ? */

	pdc_set_dmamode(ap, qc->dev);

	pdc202xx_set_dmamode(ap, qc->dev);



	/* Cases the state machine will not complete correctly without help */

	if ((tf->flags & ATA_TFLAG_LBA48) ||  tf->protocol == ATA_PROT_ATAPI_DMA)
@@ -254,7 +254,7 @@ static void pdc2026x_dev_config(struct ata_port *ap, struct ata_device *adev) 
	adev->max_sectors = 256;

}



static struct scsi_host_template pdc_sht = {

static struct scsi_host_template pdc202xx_sht = {

	.module			= THIS_MODULE,

	.name			= DRV_NAME,

	.ioctl			= ata_scsi_ioctl,
@@ -275,8 +275,8 @@ static struct scsi_host_template pdc_sht = { 


static struct ata_port_operations pdc2024x_port_ops = {

	.port_disable	= ata_port_disable,

	.set_piomode	= pdc_set_piomode,

	.set_dmamode	= pdc_set_dmamode,

	.set_piomode	= pdc202xx_set_piomode,

	.set_dmamode	= pdc202xx_set_dmamode,

	.mode_filter	= ata_pci_default_filter,

	.tf_load	= ata_tf_load,

	.tf_read	= ata_tf_read,
@@ -308,8 +308,8 @@ static struct ata_port_operations pdc2024x_port_ops = { 


static struct ata_port_operations pdc2026x_port_ops = {

	.port_disable	= ata_port_disable,

	.set_piomode	= pdc_set_piomode,

	.set_dmamode	= pdc_set_dmamode,

	.set_piomode	= pdc202xx_set_piomode,

	.set_dmamode	= pdc202xx_set_dmamode,

	.mode_filter	= ata_pci_default_filter,

	.tf_load	= ata_tf_load,

	.tf_read	= ata_tf_read,
@@ -340,11 +340,11 @@ static struct ata_port_operations pdc2026x_port_ops = { 
	.host_stop	= ata_host_stop

};



static int pdc_init_one(struct pci_dev *dev, const struct pci_device_id *id)

static int pdc202xx_init_one(struct pci_dev *dev, const struct pci_device_id *id)

{

	static struct ata_port_info info[3] = {

		{

			.sht = &pdc_sht,

			.sht = &pdc202xx_sht,

			.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,

			.pio_mask = 0x1f,

			.mwdma_mask = 0x07,
@@ -352,7 +352,7 @@ static int pdc_init_one(struct pci_dev *dev, const struct pci_device_id *id) 
			.port_ops = &pdc2024x_port_ops

		},

		{

			.sht = &pdc_sht,

			.sht = &pdc202xx_sht,

			.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,

			.pio_mask = 0x1f,

			.mwdma_mask = 0x07,
@@ -360,7 +360,7 @@ static int pdc_init_one(struct pci_dev *dev, const struct pci_device_id *id) 
			.port_ops = &pdc2026x_port_ops

		},

		{

			.sht = &pdc_sht,

			.sht = &pdc202xx_sht,

			.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,

			.pio_mask = 0x1f,

			.mwdma_mask = 0x07,
@@ -386,7 +386,7 @@ static int pdc_init_one(struct pci_dev *dev, const struct pci_device_id *id) 
	return ata_pci_init_one(dev, port_info, 2);

}



static const struct pci_device_id pdc[] = {

static const struct pci_device_id pdc202xx[] = {

	{ PCI_VDEVICE(PROMISE, PCI_DEVICE_ID_PROMISE_20246), 0 },

	{ PCI_VDEVICE(PROMISE, PCI_DEVICE_ID_PROMISE_20262), 1 },

	{ PCI_VDEVICE(PROMISE, PCI_DEVICE_ID_PROMISE_20263), 1 },
@@ -396,28 +396,28 @@ static const struct pci_device_id pdc[] = { 
	{ },

};



static struct pci_driver pdc_pci_driver = {

static struct pci_driver pdc202xx_pci_driver = {

	.name 		= DRV_NAME,

	.id_table	= pdc,

	.probe 		= pdc_init_one,

	.id_table	= pdc202xx,

	.probe 		= pdc202xx_init_one,

	.remove		= ata_pci_remove_one

};



static int __init pdc_init(void)

static int __init pdc202xx_init(void)

{

	return pci_register_driver(&pdc_pci_driver);

	return pci_register_driver(&pdc202xx_pci_driver);

}



static void __exit pdc_exit(void)

static void __exit pdc202xx_exit(void)

{

	pci_unregister_driver(&pdc_pci_driver);

	pci_unregister_driver(&pdc202xx_pci_driver);

}



MODULE_AUTHOR("Alan Cox");

MODULE_DESCRIPTION("low-level driver for Promise 2024x and 20262-20267");

MODULE_LICENSE("GPL");

MODULE_DEVICE_TABLE(pci, pdc);

MODULE_DEVICE_TABLE(pci, pdc202xx);

MODULE_VERSION(DRV_VERSION);



module_init(pdc_init);

module_exit(pdc_exit);
 
module_init(pdc202xx_init);

module_exit(pdc202xx_exit);