diff options
Diffstat (limited to 'drivers/mtd/maps/pismo.c')
-rw-r--r-- | drivers/mtd/maps/pismo.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/mtd/maps/pismo.c b/drivers/mtd/maps/pismo.c index afea93b515d5..dc6df9abea0b 100644 --- a/drivers/mtd/maps/pismo.c +++ b/drivers/mtd/maps/pismo.c | |||
@@ -66,8 +66,8 @@ static unsigned int pismo_width_to_bytes(unsigned int width) | |||
66 | return 1 << width; | 66 | return 1 << width; |
67 | } | 67 | } |
68 | 68 | ||
69 | static int pismo_eeprom_read(struct i2c_client *client, void *buf, | 69 | static int pismo_eeprom_read(struct i2c_client *client, void *buf, u8 addr, |
70 | u8 addr, size_t size) | 70 | size_t size) |
71 | { | 71 | { |
72 | int ret; | 72 | int ret; |
73 | struct i2c_msg msg[] = { | 73 | struct i2c_msg msg[] = { |
@@ -89,7 +89,8 @@ static int pismo_eeprom_read(struct i2c_client *client, void *buf, | |||
89 | } | 89 | } |
90 | 90 | ||
91 | static int pismo_add_device(struct pismo_data *pismo, int i, | 91 | static int pismo_add_device(struct pismo_data *pismo, int i, |
92 | struct pismo_mem *region, const char *name, void *pdata, size_t psize) | 92 | struct pismo_mem *region, const char *name, |
93 | void *pdata, size_t psize) | ||
93 | { | 94 | { |
94 | struct platform_device *dev; | 95 | struct platform_device *dev; |
95 | struct resource res = { }; | 96 | struct resource res = { }; |
@@ -130,7 +131,7 @@ static int pismo_add_device(struct pismo_data *pismo, int i, | |||
130 | } | 131 | } |
131 | 132 | ||
132 | static int pismo_add_nor(struct pismo_data *pismo, int i, | 133 | static int pismo_add_nor(struct pismo_data *pismo, int i, |
133 | struct pismo_mem *region) | 134 | struct pismo_mem *region) |
134 | { | 135 | { |
135 | struct physmap_flash_data data = { | 136 | struct physmap_flash_data data = { |
136 | .width = region->width, | 137 | .width = region->width, |
@@ -144,7 +145,7 @@ static int pismo_add_nor(struct pismo_data *pismo, int i, | |||
144 | } | 145 | } |
145 | 146 | ||
146 | static int pismo_add_sram(struct pismo_data *pismo, int i, | 147 | static int pismo_add_sram(struct pismo_data *pismo, int i, |
147 | struct pismo_mem *region) | 148 | struct pismo_mem *region) |
148 | { | 149 | { |
149 | struct platdata_mtd_ram data = { | 150 | struct platdata_mtd_ram data = { |
150 | .bankwidth = region->width, | 151 | .bankwidth = region->width, |
@@ -155,7 +156,7 @@ static int pismo_add_sram(struct pismo_data *pismo, int i, | |||
155 | } | 156 | } |
156 | 157 | ||
157 | static void pismo_add_one(struct pismo_data *pismo, int i, | 158 | static void pismo_add_one(struct pismo_data *pismo, int i, |
158 | const struct pismo_cs_block *cs, phys_addr_t base) | 159 | const struct pismo_cs_block *cs, phys_addr_t base) |
159 | { | 160 | { |
160 | struct device *dev = &pismo->client->dev; | 161 | struct device *dev = &pismo->client->dev; |
161 | struct pismo_mem region; | 162 | struct pismo_mem region; |
@@ -211,7 +212,7 @@ static int pismo_remove(struct i2c_client *client) | |||
211 | } | 212 | } |
212 | 213 | ||
213 | static int pismo_probe(struct i2c_client *client, | 214 | static int pismo_probe(struct i2c_client *client, |
214 | const struct i2c_device_id *id) | 215 | const struct i2c_device_id *id) |
215 | { | 216 | { |
216 | struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent); | 217 | struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent); |
217 | struct pismo_pdata *pdata = client->dev.platform_data; | 218 | struct pismo_pdata *pdata = client->dev.platform_data; |