diff options
Diffstat (limited to 'lib/devres.c')
-rw-r--r-- | lib/devres.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/devres.c b/lib/devres.c index 2f16c133fd36..f562bf6ff71d 100644 --- a/lib/devres.c +++ b/lib/devres.c | |||
@@ -157,12 +157,12 @@ EXPORT_SYMBOL(devm_ioremap_resource); | |||
157 | * if (!base) | 157 | * if (!base) |
158 | * return -EADDRNOTAVAIL; | 158 | * return -EADDRNOTAVAIL; |
159 | */ | 159 | */ |
160 | void __iomem *devm_request_and_ioremap(struct device *device, | 160 | void __iomem *devm_request_and_ioremap(struct device *dev, |
161 | struct resource *res) | 161 | struct resource *res) |
162 | { | 162 | { |
163 | void __iomem *dest_ptr; | 163 | void __iomem *dest_ptr; |
164 | 164 | ||
165 | dest_ptr = devm_ioremap_resource(device, res); | 165 | dest_ptr = devm_ioremap_resource(dev, res); |
166 | if (IS_ERR(dest_ptr)) | 166 | if (IS_ERR(dest_ptr)) |
167 | return NULL; | 167 | return NULL; |
168 | 168 | ||
@@ -194,7 +194,7 @@ static int devm_ioport_map_match(struct device *dev, void *res, | |||
194 | * Managed ioport_map(). Map is automatically unmapped on driver | 194 | * Managed ioport_map(). Map is automatically unmapped on driver |
195 | * detach. | 195 | * detach. |
196 | */ | 196 | */ |
197 | void __iomem * devm_ioport_map(struct device *dev, unsigned long port, | 197 | void __iomem *devm_ioport_map(struct device *dev, unsigned long port, |
198 | unsigned int nr) | 198 | unsigned int nr) |
199 | { | 199 | { |
200 | void __iomem **ptr, *addr; | 200 | void __iomem **ptr, *addr; |
@@ -265,7 +265,7 @@ static void pcim_iomap_release(struct device *gendev, void *res) | |||
265 | * be safely called without context and guaranteed to succed once | 265 | * be safely called without context and guaranteed to succed once |
266 | * allocated. | 266 | * allocated. |
267 | */ | 267 | */ |
268 | void __iomem * const * pcim_iomap_table(struct pci_dev *pdev) | 268 | void __iomem * const *pcim_iomap_table(struct pci_dev *pdev) |
269 | { | 269 | { |
270 | struct pcim_iomap_devres *dr, *new_dr; | 270 | struct pcim_iomap_devres *dr, *new_dr; |
271 | 271 | ||
@@ -290,7 +290,7 @@ EXPORT_SYMBOL(pcim_iomap_table); | |||
290 | * Managed pci_iomap(). Map is automatically unmapped on driver | 290 | * Managed pci_iomap(). Map is automatically unmapped on driver |
291 | * detach. | 291 | * detach. |
292 | */ | 292 | */ |
293 | void __iomem * pcim_iomap(struct pci_dev *pdev, int bar, unsigned long maxlen) | 293 | void __iomem *pcim_iomap(struct pci_dev *pdev, int bar, unsigned long maxlen) |
294 | { | 294 | { |
295 | void __iomem **tbl; | 295 | void __iomem **tbl; |
296 | 296 | ||