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

Commit c754d9b6 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Jeff Garzik
Browse files

pata_cmd64x: remove unused definitions 



s/ARTIM2/ARTTIM23/ in cmd648_bmdma_stop() while at it

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 03a849e6

drivers/ata/pata_cmd64x.c

+1 −11
Original line number Diff line number Diff line
@@ -41,10 +41,6 @@ 
enum {

	CFR 		= 0x50,

		CFR_INTR_CH0  = 0x04,

	CNTRL 		= 0x51,

		CNTRL_DIS_RA0 = 0x40,

		CNTRL_DIS_RA1 = 0x80,

		CNTRL_ENA_2ND = 0x08,

	CMDTIM 		= 0x52,

	ARTTIM0 	= 0x53,

	DRWTIM0 	= 0x54,
@@ -54,9 +50,6 @@ enum { 
		ARTTIM23_DIS_RA2  = 0x04,

		ARTTIM23_DIS_RA3  = 0x08,

		ARTTIM23_INTR_CH1 = 0x10,

	ARTTIM2 	= 0x57,

	ARTTIM3 	= 0x57,

	DRWTIM23	= 0x58,

	DRWTIM2 	= 0x58,

	BRST 		= 0x59,

	DRWTIM3 	= 0x5b,
@@ -64,14 +57,11 @@ enum { 
	MRDMODE		= 0x71,

		MRDMODE_INTR_CH0 = 0x04,

		MRDMODE_INTR_CH1 = 0x08,

		MRDMODE_BLK_CH0  = 0x10,

		MRDMODE_BLK_CH1	 = 0x20,

	BMIDESR0	= 0x72,

	UDIDETCR0	= 0x73,

	DTPR0		= 0x74,

	BMIDECR1	= 0x78,

	BMIDECSR	= 0x79,

	BMIDESR1	= 0x7A,

	UDIDETCR1	= 0x7B,

	DTPR1		= 0x7C

};
@@ -254,7 +244,7 @@ static void cmd648_bmdma_stop(struct ata_queued_cmd *qc) 
	struct pci_dev *pdev = to_pci_dev(ap->host->dev);

	u8 dma_intr;

	int dma_mask = ap->port_no ? ARTTIM23_INTR_CH1 : CFR_INTR_CH0;

	int dma_reg = ap->port_no ? ARTTIM2 : CFR;

	int dma_reg = ap->port_no ? ARTTIM23 : CFR;



	ata_bmdma_stop(qc);