diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-21 12:42:58 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-21 12:42:58 -0400 |
commit | 1fc149933fd49a5b0e7738dc0853dbfbac4ae0e1 (patch) | |
tree | dfe99751c21aaf39e49765379d0b9b32114c757d /lib | |
parent | 41d5e08ea86af3359239d5a6f7021cdc61beaa49 (diff) | |
parent | ea5505fabd3b59608750bfd3721d0f8bc5c8b0bb (diff) |
Merge tag 'char-misc-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char/misc driver updates from Greg KH:
"Here's the big char/misc driver patchset for 4.1-rc1.
Lots of different driver subsystem updates here, nothing major, full
details are in the shortlog.
All of this has been in linux-next for a while"
* tag 'char-misc-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (133 commits)
mei: trace: remove unused TRACE_SYSTEM_STRING
DTS: ARM: OMAP3-N900: Add lis3lv02d support
Documentation: DT: lis302: update wakeup binding
lis3lv02d: DT: add wakeup unit 2 and wakeup threshold
lis3lv02d: DT: use s32 to support negative values
Drivers: hv: hv_balloon: correctly handle num_pages>INT_MAX case
Drivers: hv: hv_balloon: correctly handle val.freeram<num_pages case
mei: replace check for connection instead of transitioning
mei: use mei_cl_is_connected consistently
mei: fix mei_poll operation
hv_vmbus: Add gradually increased delay for retries in vmbus_post_msg()
Drivers: hv: hv_balloon: survive ballooning request with num_pages=0
Drivers: hv: hv_balloon: eliminate jumps in piecewiese linear floor function
Drivers: hv: hv_balloon: do not online pages in offline blocks
hv: remove the per-channel workqueue
hv: don't schedule new works in vmbus_onoffer()/vmbus_onoffer_rescind()
hv: run non-blocking message handlers in the dispatch tasklet
coresight: moving to new "hwtracing" directory
coresight-tmc: Adding a status interface to sysfs
coresight: remove the unnecessary configuration coresight-default-sink
...
Diffstat (limited to 'lib')
-rw-r--r-- | lib/devres.c | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/lib/devres.c b/lib/devres.c index 0f1dd2e9d2c1..fbe2aac522e6 100644 --- a/lib/devres.c +++ b/lib/devres.c | |||
@@ -72,6 +72,34 @@ void __iomem *devm_ioremap_nocache(struct device *dev, resource_size_t offset, | |||
72 | EXPORT_SYMBOL(devm_ioremap_nocache); | 72 | EXPORT_SYMBOL(devm_ioremap_nocache); |
73 | 73 | ||
74 | /** | 74 | /** |
75 | * devm_ioremap_wc - Managed ioremap_wc() | ||
76 | * @dev: Generic device to remap IO address for | ||
77 | * @offset: BUS offset to map | ||
78 | * @size: Size of map | ||
79 | * | ||
80 | * Managed ioremap_wc(). Map is automatically unmapped on driver detach. | ||
81 | */ | ||
82 | void __iomem *devm_ioremap_wc(struct device *dev, resource_size_t offset, | ||
83 | resource_size_t size) | ||
84 | { | ||
85 | void __iomem **ptr, *addr; | ||
86 | |||
87 | ptr = devres_alloc(devm_ioremap_release, sizeof(*ptr), GFP_KERNEL); | ||
88 | if (!ptr) | ||
89 | return NULL; | ||
90 | |||
91 | addr = ioremap_wc(offset, size); | ||
92 | if (addr) { | ||
93 | *ptr = addr; | ||
94 | devres_add(dev, ptr); | ||
95 | } else | ||
96 | devres_free(ptr); | ||
97 | |||
98 | return addr; | ||
99 | } | ||
100 | EXPORT_SYMBOL(devm_ioremap_wc); | ||
101 | |||
102 | /** | ||
75 | * devm_iounmap - Managed iounmap() | 103 | * devm_iounmap - Managed iounmap() |
76 | * @dev: Generic device to unmap for | 104 | * @dev: Generic device to unmap for |
77 | * @addr: Address to unmap | 105 | * @addr: Address to unmap |