[RFC][PATCH 3/6] kconfigurable resources driver others changes

linux

[RFC][PATCH 3/6] kconfigurable resources driver others changes

Postby Vivek Goyal » Sun, 07 May 2006 02:40:32 GMT


o Changes to files under driver/* except driver/pci/* which is covered in a
separate patch.

Signed-off-by: Vivek Goyal < XXXX@XXXXX.COM >
---

drivers/ieee1394/ohci1394.c | 2 +-
drivers/infiniband/hw/ipath/ipath_driver.c | 8 ++++----
drivers/net/8139cp.c | 2 +-
drivers/pcmcia/rsrc_nonstatic.c | 13 ++++++++-----
drivers/pnp/manager.c | 11 ++++++-----
drivers/pnp/resource.c | 8 ++++----
include/linux/pnp.h | 7 +++++--
7 files changed, 29 insertions(+), 22 deletions(-)

diff -puN include/linux/pnp.h~kconfigurable-resources-drivers-others-changes include/linux/pnp.h
--- linux-2.6.17-rc3-mm1-1M/include/linux/pnp.h~kconfigurable-resources-drivers-others-changes 2006-05-05 11:56:25.000000000 -0400
+++ linux-2.6.17-rc3-mm1-1M-root/include/linux/pnp.h 2006-05-05 11:56:25.000000000 -0400
@@ -389,7 +389,8 @@ int pnp_start_dev(struct pnp_dev *dev);
int pnp_stop_dev(struct pnp_dev *dev);
int pnp_activate_dev(struct pnp_dev *dev);
int pnp_disable_dev(struct pnp_dev *dev);
-void pnp_resource_change(struct resource *resource, u64 start, u64 size);
+void pnp_resource_change(struct resource *resource, resource_size_t start,
+ resource_size_t size);

/* protocol helpers */
int pnp_is_active(struct pnp_dev * dev);
@@ -434,7 +435,9 @@ static inline int pnp_start_dev(struct p
static inline int pnp_stop_dev(struct pnp_dev *dev) { return -ENODEV; }
static inline int pnp_activate_dev(struct pnp_dev *dev) { return -ENODEV; }
static inline int pnp_disable_dev(struct pnp_dev *dev) { return -ENODEV; }
-static inline void pnp_resource_change(struct resource *resource, u64 start, u64 size) { }
+static inline void pnp_resource_change(struct resource *resource,
+ resource_size_t start,
+ resource_size_t size) { }

/* protocol helpers */
static inline int pnp_is_active(struct pnp_dev * dev) { return 0; }
diff -puN drivers/pnp/resource.c~kconfigurable-resources-drivers-others-changes drivers/pnp/resource.c
--- linux-2.6.17-rc3-mm1-1M/drivers/pnp/resource.c~kconfigurable-resources-drivers-others-changes 2006-05-05 11:56:25.000000000 -0400
+++ linux-2.6.17-rc3-mm1-1M-root/drivers/pnp/resource.c 2006-05-05 11:56:25.000000000 -0400
@@ -241,7 +241,7 @@ int pnp_check_port(struct pnp_dev * dev,
{
int tmp;
struct pnp_dev *tdev;
- u64 *port, *end, *tport, *tend;
+ resource_size_t *port, *end, *tport, *tend;
port = &dev->res.port_resource[idx].start;
end = &dev->res.port_resource[idx].end;

@@ -297,7 +297,7 @@ int pnp_check_mem(struct pnp_dev * dev,
{
int tmp;
struct pnp_dev *tdev;
- u64 *addr, *end, *taddr, *tend;
+ resource_size_t *addr, *end, *taddr, *tend;
addr = &dev->res.mem_resource[idx].start;
end = &dev->res.mem_resource[idx].end;

@@ -358,7 +358,7 @@ int pnp_check_irq(struct pnp_dev * dev,
{
int tmp;
struct pnp_dev *tdev;
- u64 * irq = &dev->res.irq_resource[idx].start;
+ resource_size_t * irq = &dev->res.irq_resource[idx].start;

/* if the resource doesn't exist, don't complain about it */
if (cannot_compare(dev->res.irq_resource[idx].flags))
@@ -423,7 +423,7 @@ int pnp_check_dma(struct pnp_dev * dev,
#ifndef CONFIG_IA64
int tmp;
struct pnp_dev *tdev;
- u64 * dma = &dev->res.dma_resource[idx].start;
+ resource_size_t * dma = &dev->res.dma_resource[idx].start;



Return to linux

 

Who is online

Users browsing this forum: No registered users and 25 guest