projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] remove many unneeded #includes of sched.h
[deliverable/linux.git]
/
drivers
/
pcmcia
/
rsrc_nonstatic.c
diff --git
a/drivers/pcmcia/rsrc_nonstatic.c
b/drivers/pcmcia/rsrc_nonstatic.c
index 0f8b157c97177d30c3dc2389a70dd85a211c5b75..bfcaad6021cf05dead89b7a63052b282f457158d 100644
(file)
--- a/
drivers/pcmcia/rsrc_nonstatic.c
+++ b/
drivers/pcmcia/rsrc_nonstatic.c
@@
-72,7
+72,7
@@
static DEFINE_MUTEX(rsrc_mutex);
======================================================================*/
static struct resource *
======================================================================*/
static struct resource *
-make_resource(
unsigned long b, unsigned long
n, int flags, char *name)
+make_resource(
resource_size_t b, resource_size_t
n, int flags, char *name)
{
struct resource *res = kzalloc(sizeof(*res), GFP_KERNEL);
{
struct resource *res = kzalloc(sizeof(*res), GFP_KERNEL);
@@
-86,8
+86,8
@@
make_resource(unsigned long b, unsigned long n, int flags, char *name)
}
static struct resource *
}
static struct resource *
-claim_region(struct pcmcia_socket *s,
unsigned long base, unsigned long siz
e,
- int type, char *name)
+claim_region(struct pcmcia_socket *s,
resource_size_t bas
e,
+
resource_size_t size,
int type, char *name)
{
struct resource *res, *parent;
{
struct resource *res, *parent;
@@
-519,10
+519,10
@@
struct pcmcia_align_data {
static void
pcmcia_common_align(void *align_data, struct resource *res,
static void
pcmcia_common_align(void *align_data, struct resource *res,
-
unsigned long size, unsigned long
align)
+
resource_size_t size, resource_size_t
align)
{
struct pcmcia_align_data *data = align_data;
{
struct pcmcia_align_data *data = align_data;
-
unsigned long
start;
+
resource_size_t
start;
/*
* Ensure that we have the correct start address
*/
/*
* Ensure that we have the correct start address
*/
@@
-533,8
+533,8
@@
pcmcia_common_align(void *align_data, struct resource *res,
}
static void
}
static void
-pcmcia_align(void *align_data, struct resource *res,
-
unsigned long size, unsigned long
align)
+pcmcia_align(void *align_data, struct resource *res,
resource_size_t size,
+
resource_size_t
align)
{
struct pcmcia_align_data *data = align_data;
struct resource_map *m;
{
struct pcmcia_align_data *data = align_data;
struct resource_map *m;
@@
-616,7
+616,7
@@
static int nonstatic_adjust_io_region(struct resource *res, unsigned long r_star
static struct resource *nonstatic_find_io_region(unsigned long base, int num,
unsigned long align, struct pcmcia_socket *s)
{
static struct resource *nonstatic_find_io_region(unsigned long base, int num,
unsigned long align, struct pcmcia_socket *s)
{
- struct resource *res = make_resource(0, num, IORESOURCE_IO, s->dev.
clas
s_id);
+ struct resource *res = make_resource(0, num, IORESOURCE_IO, s->dev.
bu
s_id);
struct socket_data *s_data = s->resource_data;
struct pcmcia_align_data data;
unsigned long min = base;
struct socket_data *s_data = s->resource_data;
struct pcmcia_align_data data;
unsigned long min = base;
@@
-650,7
+650,7
@@
static struct resource *nonstatic_find_io_region(unsigned long base, int num,
static struct resource * nonstatic_find_mem_region(u_long base, u_long num,
u_long align, int low, struct pcmcia_socket *s)
{
static struct resource * nonstatic_find_mem_region(u_long base, u_long num,
u_long align, int low, struct pcmcia_socket *s)
{
- struct resource *res = make_resource(0, num, IORESOURCE_MEM, s->dev.
clas
s_id);
+ struct resource *res = make_resource(0, num, IORESOURCE_MEM, s->dev.
bu
s_id);
struct socket_data *s_data = s->resource_data;
struct pcmcia_align_data data;
unsigned long min, max;
struct socket_data *s_data = s->resource_data;
struct pcmcia_align_data data;
unsigned long min, max;
@@
-808,8
+808,10
@@
static int nonstatic_autoadd_resources(struct pcmcia_socket *s)
if (res->flags & IORESOURCE_IO) {
if (res == &ioport_resource)
continue;
if (res->flags & IORESOURCE_IO) {
if (res == &ioport_resource)
continue;
- printk(KERN_INFO "pcmcia: parent PCI bridge I/O window: 0x%lx - 0x%lx\n",
- res->start, res->end);
+ printk(KERN_INFO "pcmcia: parent PCI bridge I/O "
+ "window: 0x%llx - 0x%llx\n",
+ (unsigned long long)res->start,
+ (unsigned long long)res->end);
if (!adjust_io(s, ADD_MANAGED_RESOURCE, res->start, res->end))
done |= IORESOURCE_IO;
if (!adjust_io(s, ADD_MANAGED_RESOURCE, res->start, res->end))
done |= IORESOURCE_IO;
@@
-818,8
+820,10
@@
static int nonstatic_autoadd_resources(struct pcmcia_socket *s)
if (res->flags & IORESOURCE_MEM) {
if (res == &iomem_resource)
continue;
if (res->flags & IORESOURCE_MEM) {
if (res == &iomem_resource)
continue;
- printk(KERN_INFO "pcmcia: parent PCI bridge Memory window: 0x%lx - 0x%lx\n",
- res->start, res->end);
+ printk(KERN_INFO "pcmcia: parent PCI bridge Memory "
+ "window: 0x%llx - 0x%llx\n",
+ (unsigned long long)res->start,
+ (unsigned long long)res->end);
if (!adjust_memory(s, ADD_MANAGED_RESOURCE, res->start, res->end))
done |= IORESOURCE_MEM;
}
if (!adjust_memory(s, ADD_MANAGED_RESOURCE, res->start, res->end))
done |= IORESOURCE_MEM;
}
@@
-893,9
+897,10
@@
EXPORT_SYMBOL(pccard_nonstatic_ops);
/* sysfs interface to the resource database */
/* sysfs interface to the resource database */
-static ssize_t show_io_db(struct class_device *class_dev, char *buf)
+static ssize_t show_io_db(struct device *dev,
+ struct device_attribute *attr, char *buf)
{
{
- struct pcmcia_socket *s =
class_get_devdata(class_
dev);
+ struct pcmcia_socket *s =
dev_get_drvdata(
dev);
struct socket_data *data;
struct resource_map *p;
ssize_t ret = 0;
struct socket_data *data;
struct resource_map *p;
ssize_t ret = 0;
@@
-916,9
+921,11
@@
static ssize_t show_io_db(struct class_device *class_dev, char *buf)
return (ret);
}
return (ret);
}
-static ssize_t store_io_db(struct class_device *class_dev, const char *buf, size_t count)
+static ssize_t store_io_db(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t count)
{
{
- struct pcmcia_socket *s =
class_get_devdata(class_
dev);
+ struct pcmcia_socket *s =
dev_get_drvdata(
dev);
unsigned long start_addr, end_addr;
unsigned int add = ADD_MANAGED_RESOURCE;
ssize_t ret = 0;
unsigned long start_addr, end_addr;
unsigned int add = ADD_MANAGED_RESOURCE;
ssize_t ret = 0;
@@
-943,11
+950,12
@@
static ssize_t store_io_db(struct class_device *class_dev, const char *buf, size
return ret ? ret : count;
}
return ret ? ret : count;
}
-static
CLASS_
DEVICE_ATTR(available_resources_io, 0600, show_io_db, store_io_db);
+static DEVICE_ATTR(available_resources_io, 0600, show_io_db, store_io_db);
-static ssize_t show_mem_db(struct class_device *class_dev, char *buf)
+static ssize_t show_mem_db(struct device *dev,
+ struct device_attribute *attr, char *buf)
{
{
- struct pcmcia_socket *s =
class_get_devdata(class_
dev);
+ struct pcmcia_socket *s =
dev_get_drvdata(
dev);
struct socket_data *data;
struct resource_map *p;
ssize_t ret = 0;
struct socket_data *data;
struct resource_map *p;
ssize_t ret = 0;
@@
-968,9
+976,11
@@
static ssize_t show_mem_db(struct class_device *class_dev, char *buf)
return (ret);
}
return (ret);
}
-static ssize_t store_mem_db(struct class_device *class_dev, const char *buf, size_t count)
+static ssize_t store_mem_db(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t count)
{
{
- struct pcmcia_socket *s =
class_get_devdata(class_
dev);
+ struct pcmcia_socket *s =
dev_get_drvdata(
dev);
unsigned long start_addr, end_addr;
unsigned int add = ADD_MANAGED_RESOURCE;
ssize_t ret = 0;
unsigned long start_addr, end_addr;
unsigned int add = ADD_MANAGED_RESOURCE;
ssize_t ret = 0;
@@
-995,25
+1005,25
@@
static ssize_t store_mem_db(struct class_device *class_dev, const char *buf, siz
return ret ? ret : count;
}
return ret ? ret : count;
}
-static
CLASS_
DEVICE_ATTR(available_resources_mem, 0600, show_mem_db, store_mem_db);
+static DEVICE_ATTR(available_resources_mem, 0600, show_mem_db, store_mem_db);
-static struct
class_
device_attribute *pccard_rsrc_attributes[] = {
- &
class_device
_attr_available_resources_io,
- &
class_device
_attr_available_resources_mem,
+static struct device_attribute *pccard_rsrc_attributes[] = {
+ &
dev
_attr_available_resources_io,
+ &
dev
_attr_available_resources_mem,
NULL,
};
NULL,
};
-static int __devinit pccard_sysfs_add_rsrc(struct
class_device *class_
dev,
+static int __devinit pccard_sysfs_add_rsrc(struct
device *
dev,
struct class_interface *class_intf)
{
struct class_interface *class_intf)
{
- struct pcmcia_socket *s =
class_get_devdata(class_
dev);
- struct
class_
device_attribute **attr;
+ struct pcmcia_socket *s =
dev_get_drvdata(
dev);
+ struct device_attribute **attr;
int ret = 0;
if (s->resource_ops != &pccard_nonstatic_ops)
return 0;
for (attr = pccard_rsrc_attributes; *attr; attr++) {
int ret = 0;
if (s->resource_ops != &pccard_nonstatic_ops)
return 0;
for (attr = pccard_rsrc_attributes; *attr; attr++) {
- ret =
class_device_create_file(class_
dev, *attr);
+ ret =
device_create_file(
dev, *attr);
if (ret)
break;
}
if (ret)
break;
}
@@
-1021,23
+1031,23
@@
static int __devinit pccard_sysfs_add_rsrc(struct class_device *class_dev,
return ret;
}
return ret;
}
-static void __devexit pccard_sysfs_remove_rsrc(struct
class_device *class_
dev,
+static void __devexit pccard_sysfs_remove_rsrc(struct
device *
dev,
struct class_interface *class_intf)
{
struct class_interface *class_intf)
{
- struct pcmcia_socket *s =
class_get_devdata(class_
dev);
- struct
class_
device_attribute **attr;
+ struct pcmcia_socket *s =
dev_get_drvdata(
dev);
+ struct device_attribute **attr;
if (s->resource_ops != &pccard_nonstatic_ops)
return;
for (attr = pccard_rsrc_attributes; *attr; attr++)
if (s->resource_ops != &pccard_nonstatic_ops)
return;
for (attr = pccard_rsrc_attributes; *attr; attr++)
-
class_device_remove_file(class_
dev, *attr);
+
device_remove_file(
dev, *attr);
}
static struct class_interface pccard_rsrc_interface = {
.class = &pcmcia_socket_class,
}
static struct class_interface pccard_rsrc_interface = {
.class = &pcmcia_socket_class,
- .add = &pccard_sysfs_add_rsrc,
- .remove = __devexit_p(&pccard_sysfs_remove_rsrc),
+ .add
_dev
= &pccard_sysfs_add_rsrc,
+ .remove
_dev
= __devexit_p(&pccard_sysfs_remove_rsrc),
};
static int __init nonstatic_sysfs_init(void)
};
static int __init nonstatic_sysfs_init(void)
This page took
0.027384 seconds
and
5
git commands to generate.