patch-2.4.22 linux-2.4.22/arch/cris/drivers/eeprom.c
Next file: linux-2.4.22/arch/cris/drivers/ethernet.c
Previous file: linux-2.4.22/arch/cris/drivers/ds1302.c
Back to the patch index
Back to the overall index
- Lines: 79
- Date:
2003-08-25 04:44:39.000000000 -0700
- Orig file:
linux-2.4.21/arch/cris/drivers/eeprom.c
- Orig date:
2003-06-13 07:51:29.000000000 -0700
diff -urN linux-2.4.21/arch/cris/drivers/eeprom.c linux-2.4.22/arch/cris/drivers/eeprom.c
@@ -1,4 +1,4 @@
-/*!*****************************************************************************
+/******************************************************************************
*!
*! Implements an interface for i2c compatible eeproms to run under linux.
*! Supports 2k, 8k(?) and 16k. Uses adaptive timing adjustents by
@@ -20,6 +20,18 @@
*! in the spin-lock.
*!
*! $Log: eeprom.c,v $
+*! Revision 1.12 2003/04/09 08:31:14 pkj
+*! Typo correction (taken from Linux 2.5).
+*!
+*! Revision 1.11 2003/02/12 20:43:46 johana
+*! Previous checkin removed beginning of comment.
+*!
+*! Revision 1.10 2003/02/10 07:18:20 starvik
+*! Removed misplaced ;
+*!
+*! Revision 1.9 2003/01/22 06:54:46 starvik
+*! Fixed warnings issued by GCC 3.2.1
+*!
*! Revision 1.8 2001/06/15 13:24:29 jonashg
*! * Added verification of pointers from userspace in read and write.
*! * Made busy counter volatile.
@@ -203,7 +215,7 @@
* it will mirror the address space:
* 1. We read two locations (that are mirrored),
* if the content differs * it's a 16kB EEPROM.
- * 2. if it doesn't differ - write diferent value to one of the locations,
+ * 2. if it doesn't differ - write different value to one of the locations,
* check the other - if content still is the same it's a 2k EEPROM,
* restore original data.
*/
@@ -493,7 +505,7 @@
static ssize_t eeprom_read(struct file * file, char * buf, size_t count, loff_t *off)
{
- int i, read=0;
+ int read=0;
unsigned long p = file->f_pos;
unsigned char page;
@@ -519,7 +531,7 @@
if(!eeprom_address(p))
{
printk(KERN_INFO "%s: Read failed to address the eeprom: "
- "0x%08X (%i) page: %i\n", eeprom_name, p, p, page);
+ "0x%08lX (%li) page: %i\n", eeprom_name, p, p, page);
i2c_stop();
/* don't forget to wake them up */
@@ -602,7 +614,7 @@
if(!eeprom_address(p))
{
printk(KERN_INFO "%s: Write failed to address the eeprom: "
- "0x%08X (%i) \n", eeprom_name, p, p);
+ "0x%08lX (%li) \n", eeprom_name, p, p);
i2c_stop();
/* don't forget to wake them up */
@@ -740,7 +752,7 @@
static int eeprom_address(unsigned long addr)
{
- int i, j;
+ int i;
unsigned char page, offset;
page = (unsigned char) (addr >> 8);
@@ -795,7 +807,7 @@
return 1;
}
-/* Reads from current adress. */
+/* Reads from current address. */
static int read_from_eeprom(char * buf, int count)
{
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)