Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 325179
b: refs/heads/master
c: daf8007
h: refs/heads/master
i:
  325177: 398b0af
  325175: fd29619
v: v3
  • Loading branch information
Samuel Iglesias Gonsálvez authored and Greg Kroah-Hartman committed Sep 11, 2012
1 parent 87be15d commit 966ccc6
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 26 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9c0d169e8fd9637eebe98e1ad4e61c0de9edc43e
refs/heads/master: daf8007c02558a61a27ba035844787269406274e
26 changes: 1 addition & 25 deletions trunk/drivers/staging/ipack/bridges/tpci200.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ static u16 tpci200_status_error[] = {
TPCI200_D_ERROR,
};

static int tpci200_slot_unregister(struct ipack_device *dev);

static struct tpci200_board *check_slot(struct ipack_device *dev)
{
struct tpci200_board *tpci200;
Expand Down Expand Up @@ -368,28 +366,6 @@ static int tpci200_slot_unmap_space(struct ipack_device *dev, int space)
return 0;
}

static int tpci200_slot_unregister(struct ipack_device *dev)
{
struct tpci200_board *tpci200;

if (dev == NULL)
return -ENODEV;

tpci200 = check_slot(dev);
if (tpci200 == NULL)
return -EINVAL;

tpci200_free_irq(dev);

if (mutex_lock_interruptible(&tpci200->mutex))
return -ERESTARTSYS;

tpci200->slots[dev->slot].dev = NULL;
mutex_unlock(&tpci200->mutex);

return 0;
}

static int tpci200_slot_map_space(struct ipack_device *dev,
unsigned int memory_size, int space)
{
Expand Down Expand Up @@ -619,7 +595,7 @@ 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 = tpci200_slot_unregister,
.remove_device = NULL,
.get_clockrate = tpci200_get_clockrate,
.set_clockrate = tpci200_set_clockrate,
.get_error = tpci200_get_error,
Expand Down

0 comments on commit 966ccc6

Please sign in to comment.