From 9fe66334911512cfd2d5bfb116428c00ad4f3bd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Iglesias=20Gons=C3=A1lvez?= Date: Tue, 11 Sep 2012 13:35:12 +0200 Subject: [PATCH] --- yaml --- r: 325180 b: refs/heads/master c: 4a589c54eeecfab774bbdb11ff2e658ef1a076bc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/ipack/bridges/tpci200.c | 1 - trunk/drivers/staging/ipack/ipack.h | 3 --- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 1269dce7cfd3..fed1c68b7ef1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: daf8007c02558a61a27ba035844787269406274e +refs/heads/master: 4a589c54eeecfab774bbdb11ff2e658ef1a076bc diff --git a/trunk/drivers/staging/ipack/bridges/tpci200.c b/trunk/drivers/staging/ipack/bridges/tpci200.c index 0823cdbb3e6d..5aff0d07e564 100644 --- a/trunk/drivers/staging/ipack/bridges/tpci200.c +++ b/trunk/drivers/staging/ipack/bridges/tpci200.c @@ -595,7 +595,6 @@ static const struct ipack_bus_ops tpci200_bus_ops = { .unmap_space = tpci200_slot_unmap_space, .request_irq = tpci200_request_irq, .free_irq = tpci200_free_irq, - .remove_device = NULL, .get_clockrate = tpci200_get_clockrate, .set_clockrate = tpci200_set_clockrate, .get_error = tpci200_get_error, diff --git a/trunk/drivers/staging/ipack/ipack.h b/trunk/drivers/staging/ipack/ipack.h index 77d8075d9a38..0ea9d849e36e 100644 --- a/trunk/drivers/staging/ipack/ipack.h +++ b/trunk/drivers/staging/ipack/ipack.h @@ -113,7 +113,6 @@ struct ipack_driver { * @unmap_space: unmap IP address space * @request_irq: request IRQ * @free_irq: free IRQ - * @remove_device: tell the bridge module that the device has been removed * @get_clockrate: Returns the clockrate the carrier is currently * communicating with the device at. * @set_clockrate: Sets the clock-rate for carrier / module communication. @@ -129,8 +128,6 @@ struct ipack_bus_ops { int (*unmap_space) (struct ipack_device *dev, int space); int (*request_irq) (struct ipack_device *dev, int vector, int (*handler)(void *), void *arg); int (*free_irq) (struct ipack_device *dev); - int (*remove_device) (struct ipack_device *dev); - int (*get_clockrate) (struct ipack_device *dev); int (*set_clockrate) (struct ipack_device *dev, int mherz); int (*get_error) (struct ipack_device *dev);