aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/ioport.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/ioport.h')
-rw-r--r--include/linux/ioport.h23
1 files changed, 13 insertions, 10 deletions
diff --git a/include/linux/ioport.h b/include/linux/ioport.h
index 535bd9585897..d4895236b7e9 100644
--- a/include/linux/ioport.h
+++ b/include/linux/ioport.h
@@ -98,31 +98,34 @@ extern struct resource * ____request_resource(struct resource *root, struct reso
98extern int release_resource(struct resource *new); 98extern int release_resource(struct resource *new);
99extern __deprecated_for_modules int insert_resource(struct resource *parent, struct resource *new); 99extern __deprecated_for_modules int insert_resource(struct resource *parent, struct resource *new);
100extern int allocate_resource(struct resource *root, struct resource *new, 100extern int allocate_resource(struct resource *root, struct resource *new,
101 unsigned long size, 101 resource_size_t size, resource_size_t min,
102 unsigned long min, unsigned long max, 102 resource_size_t max, resource_size_t align,
103 unsigned long align,
104 void (*alignf)(void *, struct resource *, 103 void (*alignf)(void *, struct resource *,
105 unsigned long, unsigned long), 104 resource_size_t, resource_size_t),
106 void *alignf_data); 105 void *alignf_data);
107int adjust_resource(struct resource *res, unsigned long start, 106int adjust_resource(struct resource *res, resource_size_t start,
108 unsigned long size); 107 resource_size_t size);
109 108
110/* Convenience shorthand with allocation */ 109/* Convenience shorthand with allocation */
111#define request_region(start,n,name) __request_region(&ioport_resource, (start), (n), (name)) 110#define request_region(start,n,name) __request_region(&ioport_resource, (start), (n), (name))
112#define request_mem_region(start,n,name) __request_region(&iomem_resource, (start), (n), (name)) 111#define request_mem_region(start,n,name) __request_region(&iomem_resource, (start), (n), (name))
113#define rename_region(region, newname) do { (region)->name = (newname); } while (0) 112#define rename_region(region, newname) do { (region)->name = (newname); } while (0)
114 113
115extern struct resource * __request_region(struct resource *, unsigned long start, unsigned long n, const char *name); 114extern struct resource * __request_region(struct resource *,
115 resource_size_t start,
116 resource_size_t n, const char *name);
116 117
117/* Compatibility cruft */ 118/* Compatibility cruft */
118#define release_region(start,n) __release_region(&ioport_resource, (start), (n)) 119#define release_region(start,n) __release_region(&ioport_resource, (start), (n))
119#define check_mem_region(start,n) __check_region(&iomem_resource, (start), (n)) 120#define check_mem_region(start,n) __check_region(&iomem_resource, (start), (n))
120#define release_mem_region(start,n) __release_region(&iomem_resource, (start), (n)) 121#define release_mem_region(start,n) __release_region(&iomem_resource, (start), (n))
121 122
122extern int __check_region(struct resource *, unsigned long, unsigned long); 123extern int __check_region(struct resource *, resource_size_t, resource_size_t);
123extern void __release_region(struct resource *, unsigned long, unsigned long); 124extern void __release_region(struct resource *, resource_size_t,
125 resource_size_t);
124 126
125static inline int __deprecated check_region(unsigned long s, unsigned long n) 127static inline int __deprecated check_region(resource_size_t s,
128 resource_size_t n)
126{ 129{
127 return __check_region(&ioport_resource, s, n); 130 return __check_region(&ioport_resource, s, n);
128} 131}