diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2012-11-19 13:23:07 -0500 |
---|---|---|
committer | Artem Bityutskiy <artem.bityutskiy@linux.intel.com> | 2012-11-22 05:07:03 -0500 |
commit | 06f25510692385ed4dadd23f7d3d064d1ab11c2d (patch) | |
tree | 2affb62af83cf8082caf40ff4e68a5b1f8725e4e /drivers/mtd/maps/pismo.c | |
parent | 5153b88cac39b0a14662f0e15439b826bacfe213 (diff) |
mtd: remove use of __devinit
CONFIG_HOTPLUG is going away as an option so __devinit is no longer
needed.
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Diffstat (limited to 'drivers/mtd/maps/pismo.c')
-rw-r--r-- | drivers/mtd/maps/pismo.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/mtd/maps/pismo.c b/drivers/mtd/maps/pismo.c index 9f4e5947c99f..01db0d0b076a 100644 --- a/drivers/mtd/maps/pismo.c +++ b/drivers/mtd/maps/pismo.c | |||
@@ -58,7 +58,7 @@ static void pismo_set_vpp(struct platform_device *pdev, int on) | |||
58 | pismo->vpp(pismo->vpp_data, on); | 58 | pismo->vpp(pismo->vpp_data, on); |
59 | } | 59 | } |
60 | 60 | ||
61 | static unsigned int __devinit pismo_width_to_bytes(unsigned int width) | 61 | static unsigned int pismo_width_to_bytes(unsigned int width) |
62 | { | 62 | { |
63 | width &= 15; | 63 | width &= 15; |
64 | if (width > 2) | 64 | if (width > 2) |
@@ -66,7 +66,7 @@ static unsigned int __devinit pismo_width_to_bytes(unsigned int width) | |||
66 | return 1 << width; | 66 | return 1 << width; |
67 | } | 67 | } |
68 | 68 | ||
69 | static int __devinit pismo_eeprom_read(struct i2c_client *client, void *buf, | 69 | static int pismo_eeprom_read(struct i2c_client *client, void *buf, |
70 | u8 addr, size_t size) | 70 | u8 addr, size_t size) |
71 | { | 71 | { |
72 | int ret; | 72 | int ret; |
@@ -88,7 +88,7 @@ static int __devinit pismo_eeprom_read(struct i2c_client *client, void *buf, | |||
88 | return ret == ARRAY_SIZE(msg) ? size : -EIO; | 88 | return ret == ARRAY_SIZE(msg) ? size : -EIO; |
89 | } | 89 | } |
90 | 90 | ||
91 | static int __devinit 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, void *pdata, size_t psize) |
93 | { | 93 | { |
94 | struct platform_device *dev; | 94 | struct platform_device *dev; |
@@ -129,7 +129,7 @@ static int __devinit pismo_add_device(struct pismo_data *pismo, int i, | |||
129 | return ret; | 129 | return ret; |
130 | } | 130 | } |
131 | 131 | ||
132 | static int __devinit pismo_add_nor(struct pismo_data *pismo, int i, | 132 | static int pismo_add_nor(struct pismo_data *pismo, int i, |
133 | struct pismo_mem *region) | 133 | struct pismo_mem *region) |
134 | { | 134 | { |
135 | struct physmap_flash_data data = { | 135 | struct physmap_flash_data data = { |
@@ -143,7 +143,7 @@ static int __devinit pismo_add_nor(struct pismo_data *pismo, int i, | |||
143 | &data, sizeof(data)); | 143 | &data, sizeof(data)); |
144 | } | 144 | } |
145 | 145 | ||
146 | static int __devinit pismo_add_sram(struct pismo_data *pismo, int i, | 146 | static int pismo_add_sram(struct pismo_data *pismo, int i, |
147 | struct pismo_mem *region) | 147 | struct pismo_mem *region) |
148 | { | 148 | { |
149 | struct platdata_mtd_ram data = { | 149 | struct platdata_mtd_ram data = { |
@@ -154,7 +154,7 @@ static int __devinit pismo_add_sram(struct pismo_data *pismo, int i, | |||
154 | &data, sizeof(data)); | 154 | &data, sizeof(data)); |
155 | } | 155 | } |
156 | 156 | ||
157 | static void __devinit pismo_add_one(struct pismo_data *pismo, int i, | 157 | static void pismo_add_one(struct pismo_data *pismo, int i, |
158 | const struct pismo_cs_block *cs, phys_addr_t base) | 158 | const struct pismo_cs_block *cs, phys_addr_t base) |
159 | { | 159 | { |
160 | struct device *dev = &pismo->client->dev; | 160 | struct device *dev = &pismo->client->dev; |
@@ -210,7 +210,7 @@ static int __devexit pismo_remove(struct i2c_client *client) | |||
210 | return 0; | 210 | return 0; |
211 | } | 211 | } |
212 | 212 | ||
213 | static int __devinit pismo_probe(struct i2c_client *client, | 213 | static int pismo_probe(struct i2c_client *client, |
214 | const struct i2c_device_id *id) | 214 | const struct i2c_device_id *id) |
215 | { | 215 | { |
216 | struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent); | 216 | struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent); |