From 9869a937d3a93c75c1d32e61df29149ce78ec3f9 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 10 Sep 2012 11:14:01 -0700 Subject: [PATCH] staging: ipack: make function tables const. Make some variables const: 1. bus oerations table 2. driver name 3. tpci control register table Signed-off-by: Stephen Hemminger Signed-off-by: Greg Kroah-Hartman --- drivers/staging/ipack/bridges/tpci200.c | 6 ++---- drivers/staging/ipack/ipack.c | 4 ++-- drivers/staging/ipack/ipack.h | 10 ++++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/staging/ipack/bridges/tpci200.c b/drivers/staging/ipack/bridges/tpci200.c index 0d61090819fe..302fc21670d7 100644 --- a/drivers/staging/ipack/bridges/tpci200.c +++ b/drivers/staging/ipack/bridges/tpci200.c @@ -14,10 +14,8 @@ #include #include "tpci200.h" -static struct ipack_bus_ops tpci200_bus_ops; - /* TPCI200 controls registers */ -static int control_reg[] = { +static const int control_reg[] = { TPCI200_CONTROL_A_REG, TPCI200_CONTROL_B_REG, TPCI200_CONTROL_C_REG, @@ -532,7 +530,7 @@ static void tpci200_uninstall(struct tpci200_board *tpci200) kfree(tpci200->slots); } -static struct ipack_bus_ops tpci200_bus_ops = { +static const struct ipack_bus_ops tpci200_bus_ops = { .map_space = tpci200_slot_map_space, .unmap_space = tpci200_slot_unmap_space, .request_irq = tpci200_request_irq, diff --git a/drivers/staging/ipack/ipack.c b/drivers/staging/ipack/ipack.c index 659aadcac04d..af47772da515 100644 --- a/drivers/staging/ipack/ipack.c +++ b/drivers/staging/ipack/ipack.c @@ -209,7 +209,7 @@ static struct bus_type ipack_bus_type = { }; struct ipack_bus_device *ipack_bus_register(struct device *parent, int slots, - struct ipack_bus_ops *ops) + const struct ipack_bus_ops *ops) { int bus_nr; struct ipack_bus_device *bus; @@ -241,7 +241,7 @@ int ipack_bus_unregister(struct ipack_bus_device *bus) EXPORT_SYMBOL_GPL(ipack_bus_unregister); int ipack_driver_register(struct ipack_driver *edrv, struct module *owner, - char *name) + const char *name) { edrv->driver.owner = owner; edrv->driver.name = name; diff --git a/drivers/staging/ipack/ipack.h b/drivers/staging/ipack/ipack.h index 0f482fd205d9..4d73f75c26d2 100644 --- a/drivers/staging/ipack/ipack.h +++ b/drivers/staging/ipack/ipack.h @@ -134,7 +134,7 @@ struct ipack_bus_device { struct device *parent; int slots; int bus_nr; - struct ipack_bus_ops *ops; + const struct ipack_bus_ops *ops; }; /** @@ -148,7 +148,7 @@ struct ipack_bus_device { * available bus device in ipack. */ struct ipack_bus_device *ipack_bus_register(struct device *parent, int slots, - struct ipack_bus_ops *ops); + const struct ipack_bus_ops *ops); /** * ipack_bus_unregister -- unregister an ipack bus @@ -161,7 +161,8 @@ int ipack_bus_unregister(struct ipack_bus_device *bus); * Called by a ipack driver to register itself as a driver * that can manage ipack devices. */ -int ipack_driver_register(struct ipack_driver *edrv, struct module *owner, char *name); +int ipack_driver_register(struct ipack_driver *edrv, struct module *owner, + const char *name); void ipack_driver_unregister(struct ipack_driver *edrv); /** @@ -174,7 +175,8 @@ void ipack_driver_unregister(struct ipack_driver *edrv); * Register a new ipack device (mezzanine device). The call is done by * the carrier device driver. */ -struct ipack_device *ipack_device_register(struct ipack_bus_device *bus, int slot, int irqv); +struct ipack_device *ipack_device_register(struct ipack_bus_device *bus, + int slot, int irqv); void ipack_device_unregister(struct ipack_device *dev); /** -- 2.39.2