diff options
Diffstat (limited to 'drivers/mtd')
-rw-r--r-- | drivers/mtd/devices/doc2000.c | 2 | ||||
-rw-r--r-- | drivers/mtd/devices/doc2001.c | 2 | ||||
-rw-r--r-- | drivers/mtd/devices/doc2001plus.c | 2 | ||||
-rw-r--r-- | drivers/mtd/nand/diskonchip.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mtd/devices/doc2000.c b/drivers/mtd/devices/doc2000.c index be5e88b3888d..e4345cf744a2 100644 --- a/drivers/mtd/devices/doc2000.c +++ b/drivers/mtd/devices/doc2000.c | |||
@@ -138,7 +138,7 @@ static inline int DoC_WaitReady(struct DiskOnChip *doc) | |||
138 | bypass the internal pipeline. Each of 4 delay cycles (read from the NOP register) is | 138 | bypass the internal pipeline. Each of 4 delay cycles (read from the NOP register) is |
139 | required after writing to CDSN Control register, see Software Requirement 11.4 item 3. */ | 139 | required after writing to CDSN Control register, see Software Requirement 11.4 item 3. */ |
140 | 140 | ||
141 | static inline int DoC_Command(struct DiskOnChip *doc, unsigned char command, | 141 | static int DoC_Command(struct DiskOnChip *doc, unsigned char command, |
142 | unsigned char xtraflags) | 142 | unsigned char xtraflags) |
143 | { | 143 | { |
144 | void __iomem *docptr = doc->virtadr; | 144 | void __iomem *docptr = doc->virtadr; |
diff --git a/drivers/mtd/devices/doc2001.c b/drivers/mtd/devices/doc2001.c index fcb28a6fd89f..681a9c73a2a3 100644 --- a/drivers/mtd/devices/doc2001.c +++ b/drivers/mtd/devices/doc2001.c | |||
@@ -103,7 +103,7 @@ static inline int DoC_WaitReady(void __iomem * docptr) | |||
103 | with the internal pipeline. Each of 4 delay cycles (read from the NOP register) is | 103 | with the internal pipeline. Each of 4 delay cycles (read from the NOP register) is |
104 | required after writing to CDSN Control register, see Software Requirement 11.4 item 3. */ | 104 | required after writing to CDSN Control register, see Software Requirement 11.4 item 3. */ |
105 | 105 | ||
106 | static inline void DoC_Command(void __iomem * docptr, unsigned char command, | 106 | static void DoC_Command(void __iomem * docptr, unsigned char command, |
107 | unsigned char xtraflags) | 107 | unsigned char xtraflags) |
108 | { | 108 | { |
109 | /* Assert the CLE (Command Latch Enable) line to the flash chip */ | 109 | /* Assert the CLE (Command Latch Enable) line to the flash chip */ |
diff --git a/drivers/mtd/devices/doc2001plus.c b/drivers/mtd/devices/doc2001plus.c index 0595cc7324b2..5f57f29efee4 100644 --- a/drivers/mtd/devices/doc2001plus.c +++ b/drivers/mtd/devices/doc2001plus.c | |||
@@ -118,7 +118,7 @@ static inline void DoC_CheckASIC(void __iomem * docptr) | |||
118 | /* DoC_Command: Send a flash command to the flash chip through the Flash | 118 | /* DoC_Command: Send a flash command to the flash chip through the Flash |
119 | * command register. Need 2 Write Pipeline Terminates to complete send. | 119 | * command register. Need 2 Write Pipeline Terminates to complete send. |
120 | */ | 120 | */ |
121 | static inline void DoC_Command(void __iomem * docptr, unsigned char command, | 121 | static void DoC_Command(void __iomem * docptr, unsigned char command, |
122 | unsigned char xtraflags) | 122 | unsigned char xtraflags) |
123 | { | 123 | { |
124 | WriteDOC(command, docptr, Mplus_FlashCmd); | 124 | WriteDOC(command, docptr, Mplus_FlashCmd); |
diff --git a/drivers/mtd/nand/diskonchip.c b/drivers/mtd/nand/diskonchip.c index 21d4e8f4b7af..ec5e45e4e4ef 100644 --- a/drivers/mtd/nand/diskonchip.c +++ b/drivers/mtd/nand/diskonchip.c | |||
@@ -1506,7 +1506,7 @@ static inline int __init doc2001plus_init(struct mtd_info *mtd) | |||
1506 | return 1; | 1506 | return 1; |
1507 | } | 1507 | } |
1508 | 1508 | ||
1509 | static inline int __init doc_probe(unsigned long physadr) | 1509 | static int __init doc_probe(unsigned long physadr) |
1510 | { | 1510 | { |
1511 | unsigned char ChipID; | 1511 | unsigned char ChipID; |
1512 | struct mtd_info *mtd; | 1512 | struct mtd_info *mtd; |