Merge branch 'master' of git://git.denx.de/u-boot-rockchip

[platform/kernel/u-boot.git] / drivers / block / sym53c8xx.c

diff --git a/drivers/block/sym53c8xx.c b/drivers/block/sym53c8xx.c
index 656683a..50043e6 100644 (file)
--- a/drivers/block/sym53c8xx.c
+++ b/drivers/block/sym53c8xx.c
@@ -2,23 +2,7 @@
  * (C) Copyright 2001
  * Denis Peter, MPL AG Switzerland, d.peter@mpl.ch.
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  * partly derived from
  * linux/drivers/scsi/sym53c8xx.c
  *
@@ -49,7 +33,7 @@
 #define PRINTF(fmt,args...)
 #endif
 
-#if defined(CONFIG_CMD_SCSI) && defined(CONFIG_SCSI_SYM53C8XX)
+#if defined(CONFIG_SCSI) && defined(CONFIG_SCSI_SYM53C8XX)
 
 #undef SCSI_SINGLE_STEP
 /*
@@ -264,7 +248,7 @@ void scsi_print_error (ccb * pccb)
 
 /******************************************************************************
  * sets-up the SCSI controller
- * the base memory address is retrived via the pci_read_config_dword
+ * the base memory address is retrieved via the pci_read_config_dword
  */
 void scsi_low_level_init(int busdevfunc)
 {
@@ -300,9 +284,8 @@ void scsi_low_level_init(int busdevfunc)
  */
 unsigned long swap_script(unsigned long val)
 {
-       unsigned long tmp;
-       tmp = ((val>>24)&0xff) | ((val>>8)&0xff00) | ((val<<8)&0xff0000) | ((val<<24)&0xff000000);
-       return tmp;
+       return ((val >> 24) & 0xff) | ((val >> 8) & 0xff00) |
+               ((val << 8) & 0xff0000) | ((val << 24) & 0xff000000);
 }
 
 
@@ -673,7 +656,7 @@ void scsi_issue(ccb *pccb)
        /* struct pccb must be set-up correctly */
        retrycnt=0;
        PRINTF("ID %d issue cmd %02X\n",pccb->target,pccb->cmd[0]);
-       pccb->trans_bytes=0; /* no bytes transfered yet */
+       pccb->trans_bytes=0; /* no bytes transferred yet */
        scsi_set_script(pccb); /* fill in SCRIPT                */
        scsi_int_mask=STO | UDC | MA; /* | CMP; / * Interrupts which are enabled */
        script_int_mask=0xff; /* enable all Ints */
@@ -728,7 +711,7 @@ retry:
                                for(i=0;i<3;i++)
                                        int_stat[i]=0; /* delete all int status */
                                retrycnt++;
-                               PRINTF("ID: %X Phase Missmatch Retry %d Phase %02X transfered %lx\n",
+                               PRINTF("ID: %X Phase Missmatch Retry %d Phase %02X transferred %lx\n",
                                                pccb->target,retrycnt,scsi_read_byte(SBCL),pccb->trans_bytes);
                                scsi_write_dsp(phys_to_bus(&script_cmd[4])); /* start retry script */
                                goto retry;