From a7421abdc6d78952bf8fd388a1bf79e32b377d06 Mon Sep 17 00:00:00 2001 From: Jens Taprogge Date: Wed, 12 Sep 2012 14:55:39 +0200 Subject: [PATCH] --- yaml --- r: 325244 b: refs/heads/master c: 1adda49706ff832e9fc4f4bcb62d38285145307c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/ipack/devices/ipoctal.c | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index c30693f1dd61..7446509ad6b3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: faa75c406e7396a952c3ebedfc2b1d6f1b8d2648 +refs/heads/master: 1adda49706ff832e9fc4f4bcb62d38285145307c diff --git a/trunk/drivers/staging/ipack/devices/ipoctal.c b/trunk/drivers/staging/ipack/devices/ipoctal.c index 8e61ebd648ee..b84ab5eb4b11 100644 --- a/trunk/drivers/staging/ipack/devices/ipoctal.c +++ b/trunk/drivers/staging/ipack/devices/ipoctal.c @@ -725,6 +725,7 @@ static int ipoctal_probe(struct ipack_device *dev) if (res) goto out_uninst; + dev_set_drvdata(&dev->dev, ipoctal); list_add_tail(&ipoctal->list, &ipoctal_list); return 0; @@ -751,14 +752,9 @@ static void __ipoctal_remove(struct ipoctal *ipoctal) kfree(ipoctal); } -static void ipoctal_remove(struct ipack_device *device) +static void ipoctal_remove(struct ipack_device *idev) { - struct ipoctal *ipoctal, *next; - - list_for_each_entry_safe(ipoctal, next, &ipoctal_list, list) { - if (ipoctal->dev == device) - __ipoctal_remove(ipoctal); - } + __ipoctal_remove(dev_get_drvdata(&idev->dev)); } static DEFINE_IPACK_DEVICE_TABLE(ipoctal_ids) = {