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

Commit 6e9d8629 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

[libata] pata_marvell: minor and trivial cleanups 



- use pci_iomap() [Alan, version 0.0.5t]
- fix Alan's version 0.0.5t change
- line length, trailing whitespace, case indentation cleanups
- don't use deprecated ->eng_timeout() in a driver that uses new EH

Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 75742cb4

drivers/ata/pata_marvell.c

+21 −22
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include <linux/ata.h>



#define DRV_NAME	"pata_marvell"

#define DRV_VERSION	"0.0.4t"

#define DRV_VERSION	"0.0.5u"



/**

 *	marvell_pre_reset	-	check for 40/80 pin
@@ -33,14 +33,12 @@ static int marvell_pre_reset(struct ata_port *ap) 
{

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

	u32 devices;

	unsigned long bar5;

	void __iomem *barp;

	int i;



	/* Check if our port is enabled */



	bar5 = pci_resource_start(pdev, 5);

	barp = ioremap(bar5, 0x10);

	barp = pci_iomap(pdev, 5, 0x10);

	if (barp == NULL)

		return -ENOMEM;

	printk("BAR5:");
@@ -49,9 +47,10 @@ static int marvell_pre_reset(struct ata_port *ap) 
	printk("\n");

	

	devices = readl(barp + 0x0C);

	iounmap(barp);

	pci_iounmap(pdev, barp);

	

	if (pdev->device == 0x6145 && ap->port_no == 0 && !(devices & 0x10))	/* PATA enable ? */

	if ((pdev->device == 0x6145) && (ap->port_no == 0) &&

	    (!(devices & 0x10)))	/* PATA enable ? */

		return -ENOENT;



	/* Cable type */
@@ -81,7 +80,8 @@ static int marvell_pre_reset(struct ata_port *ap) 


static void marvell_error_handler(struct ata_port *ap)

{

	return ata_bmdma_drive_eh(ap, marvell_pre_reset, ata_std_softreset, NULL, ata_std_postreset);

	return ata_bmdma_drive_eh(ap, marvell_pre_reset, ata_std_softreset,

				  NULL, ata_std_postreset);

}



/* No PIO or DMA methods needed for this device */
@@ -130,7 +130,6 @@ static const struct ata_port_operations marvell_ops = { 
	.data_xfer		= ata_pio_data_xfer,



	/* Timeout handling */

	.eng_timeout		= ata_eng_timeout,

	.irq_handler		= ata_interrupt,

	.irq_clear		= ata_bmdma_irq_clear,