summaryrefslogtreecommitdiffstats
path: root/drivers/staging/ipack/ipack.h
diff options
context:
space:
mode:
authorJens Taprogge2012-09-13 12:32:21 +0200
committerGreg Kroah-Hartman2012-09-14 05:21:38 +0200
commitc6e2dfaa5251f584a05df74911685775dd750e2d (patch)
tree75a5db35c3d52ef7d1f6388a831e7e478e16b7ac /drivers/staging/ipack/ipack.h
parentStaging: ipack: move the responsibility to clear interrupts to the IPack devi... (diff)
downloadkernel-qcow2-linux-c6e2dfaa5251f584a05df74911685775dd750e2d.tar.gz
kernel-qcow2-linux-c6e2dfaa5251f584a05df74911685775dd750e2d.tar.xz
kernel-qcow2-linux-c6e2dfaa5251f584a05df74911685775dd750e2d.zip
staging: ipack: remove irq field in struct ipack_device.
The field irq currently is identical to the slot number. It does not seem to have any real use. The number is written to hardware in ipoctal but it seems the value that is written does not matter. Signed-off-by: Jens Taprogge <jens.taprogge@taprogge.org> Signed-off-by: Samuel Iglesias Gonsalvez <siglesias@igalia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/ipack/ipack.h')
-rw-r--r--drivers/staging/ipack/ipack.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/staging/ipack/ipack.h b/drivers/staging/ipack/ipack.h
index f8405df856ae..d8e3bb6feac8 100644
--- a/drivers/staging/ipack/ipack.h
+++ b/drivers/staging/ipack/ipack.h
@@ -54,7 +54,6 @@ struct ipack_addr_space {
*
* @bus_nr: IP bus number where the device is plugged
* @slot: Slot where the device is plugged in the carrier board
- * @irq: IRQ vector
* @bus: ipack_bus_device where the device is plugged to.
* @id_space: Virtual address to ID space.
* @io_space: Virtual address to IO space.
@@ -68,7 +67,6 @@ struct ipack_addr_space {
struct ipack_device {
unsigned int bus_nr;
unsigned int slot;
- unsigned int irq;
struct ipack_bus_device *bus;
struct ipack_addr_space id_space;
struct ipack_addr_space io_space;
@@ -129,7 +127,7 @@ struct ipack_driver {
struct ipack_bus_ops {
int (*map_space) (struct ipack_device *dev, unsigned int memory_size, int space);
int (*unmap_space) (struct ipack_device *dev, int space);
- int (*request_irq) (struct ipack_device *dev, int vector,
+ int (*request_irq) (struct ipack_device *dev,
irqreturn_t (*handler)(void *), void *arg);
int (*free_irq) (struct ipack_device *dev);
int (*get_clockrate) (struct ipack_device *dev);
@@ -187,13 +185,11 @@ void ipack_driver_unregister(struct ipack_driver *edrv);
*
* @bus: ipack bus device it is plugged to.
* @slot: slot position in the bus device.
- * @irqv: IRQ vector for the mezzanine.
*
* 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);
void ipack_device_unregister(struct ipack_device *dev);
/**