projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ACPICA: Update version to 20081031
[deliverable/linux.git]
/
drivers
/
spi
/
at25.c
diff --git
a/drivers/spi/at25.c
b/drivers/spi/at25.c
index 8efa07e8b8c2a7bef31ce118109b622e42de210d..290dbe99647a141125a4465170343c51c770ec02 100644
(file)
--- a/
drivers/spi/at25.c
+++ b/
drivers/spi/at25.c
@@
-21,6
+21,13
@@
#include <linux/spi/eeprom.h>
#include <linux/spi/eeprom.h>
+/*
+ * NOTE: this is an *EEPROM* driver. The vagaries of product naming
+ * mean that some AT25 products are EEPROMs, and others are FLASH.
+ * Handle FLASH chips with the drivers/mtd/devices/m25p80.c driver,
+ * not this one!
+ */
+
struct at25_data {
struct spi_device *spi;
struct mutex lock;
struct at25_data {
struct spi_device *spi;
struct mutex lock;
@@
-111,7
+118,8
@@
at25_ee_read(
}
static ssize_t
}
static ssize_t
-at25_bin_read(struct kobject *kobj, char *buf, loff_t off, size_t count)
+at25_bin_read(struct kobject *kobj, struct bin_attribute *bin_attr,
+ char *buf, loff_t off, size_t count)
{
struct device *dev;
struct at25_data *at25;
{
struct device *dev;
struct at25_data *at25;
@@
-236,7
+244,8
@@
at25_ee_write(struct at25_data *at25, char *buf, loff_t off, size_t count)
}
static ssize_t
}
static ssize_t
-at25_bin_write(struct kobject *kobj, char *buf, loff_t off, size_t count)
+at25_bin_write(struct kobject *kobj, struct bin_attribute *bin_attr,
+ char *buf, loff_t off, size_t count)
{
struct device *dev;
struct at25_data *at25;
{
struct device *dev;
struct at25_data *at25;
@@
-314,7
+323,6
@@
static int at25_probe(struct spi_device *spi)
*/
at25->bin.attr.name = "eeprom";
at25->bin.attr.mode = S_IRUSR;
*/
at25->bin.attr.name = "eeprom";
at25->bin.attr.mode = S_IRUSR;
- at25->bin.attr.owner = THIS_MODULE;
at25->bin.read = at25_bin_read;
at25->bin.size = at25->chip.byte_len;
at25->bin.read = at25_bin_read;
at25->bin.size = at25->chip.byte_len;
This page took
0.024485 seconds
and
5
git commands to generate.