Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
linux
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Martyn Welch
linux
Commits
98c90e5e
Commit
98c90e5e
authored
5 years ago
by
Christoph Hellwig
Browse files
Options
Downloads
Patches
Plain Diff
sh: remove __iounmap
No need to indirect iounmap for sh. Signed-off-by:
Christoph Hellwig
<
hch@lst.de
>
parent
3f3ded99
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
arch/sh/include/asm/io.h
+2
-7
2 additions, 7 deletions
arch/sh/include/asm/io.h
arch/sh/mm/ioremap.c
+2
-2
2 additions, 2 deletions
arch/sh/mm/ioremap.c
with
4 additions
and
9 deletions
arch/sh/include/asm/io.h
+
2
−
7
View file @
98c90e5e
...
...
@@ -267,7 +267,7 @@ unsigned long long poke_real_address_q(unsigned long long addr,
#ifdef CONFIG_MMU
void
__iomem
*
__ioremap_caller
(
phys_addr_t
offset
,
unsigned
long
size
,
pgprot_t
prot
,
void
*
caller
);
void
__
iounmap
(
void
__iomem
*
addr
);
void
iounmap
(
void
__iomem
*
addr
);
static
inline
void
__iomem
*
__ioremap
(
phys_addr_t
offset
,
unsigned
long
size
,
pgprot_t
prot
)
...
...
@@ -328,7 +328,7 @@ __ioremap_mode(phys_addr_t offset, unsigned long size, pgprot_t prot)
#else
#define __ioremap(offset, size, prot) ((void __iomem *)(offset))
#define __ioremap_mode(offset, size, prot) ((void __iomem *)(offset))
#define
__
iounmap(addr) do { } while (0)
#define iounmap(addr) do { } while (0)
#endif
/* CONFIG_MMU */
static
inline
void
__iomem
*
ioremap
(
phys_addr_t
offset
,
unsigned
long
size
)
...
...
@@ -370,11 +370,6 @@ static inline int iounmap_fixed(void __iomem *addr) { return -EINVAL; }
#define ioremap_nocache ioremap
#define ioremap_uc ioremap
static
inline
void
iounmap
(
void
__iomem
*
addr
)
{
__iounmap
(
addr
);
}
/*
* Convert a physical pointer to a virtual kernel pointer for /dev/mem
* access
...
...
This diff is collapsed.
Click to expand it.
arch/sh/mm/ioremap.c
+
2
−
2
View file @
98c90e5e
...
...
@@ -103,7 +103,7 @@ static inline int iomapping_nontranslatable(unsigned long offset)
return
0
;
}
void
__
iounmap
(
void
__iomem
*
addr
)
void
iounmap
(
void
__iomem
*
addr
)
{
unsigned
long
vaddr
=
(
unsigned
long
__force
)
addr
;
struct
vm_struct
*
p
;
...
...
@@ -134,4 +134,4 @@ void __iounmap(void __iomem *addr)
kfree
(
p
);
}
EXPORT_SYMBOL
(
__
iounmap
);
EXPORT_SYMBOL
(
iounmap
);
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment