karo: cleanup after merge of v2015.10-rc2

[karo-tx-uboot.git] / drivers / mtd / at45.c

diff --git a/drivers/mtd/at45.c b/drivers/mtd/at45.c
index dac987a43a569891943531b6325d540c35c5cf0f..2f49be38b862a3585b5cb1ae0a6627906babeab2 100644 (file)
--- a/drivers/mtd/at45.c
+++ b/drivers/mtd/at45.c
@@ -1,27 +1,11 @@
 /* Driver for ATMEL DataFlash support
  * Author : Hamid Ikdoumi (Atmel)
  *
- * 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+
  */
 
 #include <config.h>
 #include <common.h>
-
-#ifdef CONFIG_HAS_DATAFLASH
 #include <dataflash.h>
 
 /*
@@ -140,8 +124,8 @@ AT91S_DataFlashStatus AT91F_DataFlashWaitReady(AT91PS_DataflashDesc
 }
 
 /*--------------------------------------------------------------------------*/
-/* Function Name       : AT91F_DataFlashContinuousRead                             */
-/* Object              : Continuous stream Read                            */
+/* Function Name       : AT91F_DataFlashContinuousRead                     */
+/* Object              : Continuous stream Read                            */
 /* Input Parameters    : DataFlash Service                                 */
 /*                                             : <src> = dataflash address */
 /*                     : <*dataBuffer> = data buffer pointer               */
@@ -205,7 +189,7 @@ AT91S_DataFlashStatus AT91F_DataFlashPagePgmBuf(AT91PS_DataFlash pDataFlash,
 /* Object              : Read a page in the SRAM Buffer 1 or 2              */
 /* Input Parameters    : DataFlash Service                                  */
 /*                     : Page concerned                                             */
-/*                     :                                                    */
+/*                     :                                                    */
 /* Return value                : State of the dataflash                             */
 /*---------------------------------------------------------------------------*/
 AT91S_DataFlashStatus AT91F_MainMemoryToBufferTransfert(
@@ -303,10 +287,10 @@ AT91S_DataFlashStatus AT91F_DataFlashWriteBuffer(
 
 /*---------------------------------------------------------------------------*/
 /* Function Name       : AT91F_PageErase                                     */
-/* Object              : Erase a page                                       */
+/* Object              : Erase a page                                       */
 /* Input Parameters    : DataFlash Service                                  */
 /*                     : Page concerned                                             */
-/*                     :                                                    */
+/*                     :                                                    */
 /* Return value                : State of the dataflash                             */
 /*---------------------------------------------------------------------------*/
 AT91S_DataFlashStatus AT91F_PageErase(
@@ -328,10 +312,10 @@ AT91S_DataFlashStatus AT91F_PageErase(
 
 /*---------------------------------------------------------------------------*/
 /* Function Name       : AT91F_BlockErase                                    */
-/* Object              : Erase a Block                                              */
+/* Object              : Erase a Block                                      */
 /* Input Parameters    : DataFlash Service                                  */
 /*                     : Page concerned                                             */
-/*                     :                                                    */
+/*                     :                                                    */
 /* Return value                : State of the dataflash                             */
 /*---------------------------------------------------------------------------*/
 AT91S_DataFlashStatus AT91F_BlockErase(
@@ -510,10 +494,10 @@ AT91S_DataFlashStatus AT91F_DataFlashWrite(AT91PS_DataFlash pDataFlash,
 }
 
 /*---------------------------------------------------------------------------*/
-/* Function Name       : AT91F_DataFlashRead                                */
+/* Function Name       : AT91F_DataFlashRead                                */
 /* Object              : Read a block in dataflash                          */
-/* Input Parameters    :                                                    */
-/* Return value                :                                                    */
+/* Input Parameters    :                                                    */
+/* Return value                :                                                    */
 /*---------------------------------------------------------------------------*/
 int AT91F_DataFlashRead(AT91PS_DataFlash pDataFlash,
                        unsigned long addr, unsigned long size, char *buffer)
@@ -548,9 +532,9 @@ int AT91F_DataFlashRead(AT91PS_DataFlash pDataFlash,
 }
 
 /*---------------------------------------------------------------------------*/
-/* Function Name       : AT91F_DataflashProbe                               */
-/* Object              :                                                    */
-/* Input Parameters    :                                                    */
+/* Function Name       : AT91F_DataflashProbe                               */
+/* Object              :                                                    */
+/* Input Parameters    :                                                    */
 /* Return value               : Dataflash status register                           */
 /*---------------------------------------------------------------------------*/
 int AT91F_DataflashProbe(int cs, AT91PS_DataflashDesc pDesc)
@@ -559,4 +543,3 @@ int AT91F_DataflashProbe(int cs, AT91PS_DataflashDesc pDesc)
        AT91F_DataFlashGetStatus(pDesc);
        return ((pDesc->command[1] == 0xFF) ? 0 : pDesc->command[1] & 0x3C);
 }
-#endif