aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-10-11 01:44:14 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-10-11 01:44:14 -0400
commit68399bb5080c1d96f2110b0a040b39d3ccd7a18a (patch)
tree678151c01ea0277c6f7d1a7c5fcc5a3ebe54997b
parentedea3ab58f8edd5f72d31f891ab4f34382e97e3a (diff)
[libata pdc_adma] license update, minor cleanup
from me: change from OSL+GPL to GPL (with approval) from Mark: Gets rid of an unneeded control bit, slightly increasing throughput.
-rw-r--r--drivers/scsi/pdc_adma.c34
1 files changed, 18 insertions, 16 deletions
diff --git a/drivers/scsi/pdc_adma.c b/drivers/scsi/pdc_adma.c
index ce006a5b4533..53b8db4be1a9 100644
--- a/drivers/scsi/pdc_adma.c
+++ b/drivers/scsi/pdc_adma.c
@@ -5,21 +5,24 @@
5 * 5 *
6 * Copyright 2005 Mark Lord 6 * Copyright 2005 Mark Lord
7 * 7 *
8 * The contents of this file are subject to the Open 8 * This program is free software; you can redistribute it and/or modify
9 * Software License version 1.1 that can be found at 9 * it under the terms of the GNU General Public License as published by
10 * http://www.opensource.org/licenses/osl-1.1.txt and is included herein 10 * the Free Software Foundation; either version 2, or (at your option)
11 * by reference. 11 * any later version.
12 *
13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details.
17 *
18 * You should have received a copy of the GNU General Public License
19 * along with this program; see the file COPYING. If not, write to
20 * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
21 *
22 *
23 * libata documentation is available via 'make {ps|pdf}docs',
24 * as Documentation/DocBook/libata.*
12 * 25 *
13 * Alternatively, the contents of this file may be used under the terms
14 * of the GNU General Public License version 2 (the "GPL") as distributed
15 * in the kernel source COPYING file, in which case the provisions of
16 * the GPL are applicable instead of the above. If you wish to allow
17 * the use of your version of this file only under the terms of the
18 * GPL and not to allow others to use your version of this file under
19 * the OSL, indicate your decision by deleting the provisions above and
20 * replace them with the notice and other provisions required by the GPL.
21 * If you do not delete the provisions above, a recipient may use your
22 * version of this file under either the OSL or the GPL.
23 * 26 *
24 * Supports ATA disks in single-packet ADMA mode. 27 * Supports ATA disks in single-packet ADMA mode.
25 * Uses PIO for everything else. 28 * Uses PIO for everything else.
@@ -76,7 +79,6 @@ enum {
76 aNIEN = (1 << 8), /* irq mask: 1==masked */ 79 aNIEN = (1 << 8), /* irq mask: 1==masked */
77 aGO = (1 << 7), /* packet trigger ("Go!") */ 80 aGO = (1 << 7), /* packet trigger ("Go!") */
78 aRSTADM = (1 << 5), /* ADMA logic reset */ 81 aRSTADM = (1 << 5), /* ADMA logic reset */
79 aAUTEN = (1 << 3), /* packet trigger ("Go!") */
80 aRSTA = (1 << 2), /* ATA hard reset */ 82 aRSTA = (1 << 2), /* ATA hard reset */
81 aPIOMD4 = 0x0003, /* PIO mode 4 */ 83 aPIOMD4 = 0x0003, /* PIO mode 4 */
82 84
@@ -415,7 +417,7 @@ static inline void adma_packet_start(struct ata_queued_cmd *qc)
415 VPRINTK("ENTER, ap %p\n", ap); 417 VPRINTK("ENTER, ap %p\n", ap);
416 418
417 /* fire up the ADMA engine */ 419 /* fire up the ADMA engine */
418 writew(aPIOMD4 | aGO | aAUTEN, chan + ADMA_CONTROL); 420 writew(aPIOMD4 | aGO, chan + ADMA_CONTROL);
419} 421}
420 422
421static int adma_qc_issue(struct ata_queued_cmd *qc) 423static int adma_qc_issue(struct ata_queued_cmd *qc)