[PATCH] - cleanup for new module primitives

drivers/usb/core/devio.c

@@ -1122,16 +1122,14 @@ static int proc_ioctl (struct dev_state *ps, void *arg)
 			unlock_kernel();
 			retval = -ENOSYS;
 		} else {
-			if (driver->owner
-					&& !try_inc_mod_count (driver->owner)) {
+			if (!try_module_get (driver->owner)) {
 				unlock_kernel();
 				retval = -ENOSYS;
 				break;
 			}
 			unlock_kernel ();
 			retval = driver->ioctl (ifp, ctrl.ioctl_code, buf);
-			if (driver->owner)
-				__MOD_DEC_USE_COUNT (driver->owner);
+			put_module (driver->owner);
 		}
 
 		if (retval == -ENOIOCTLCMD)

drivers/usb/core/usb.c

@@ -70,6 +70,7 @@ static struct device_driver usb_generic_driver = {
 	.remove = generic_remove,
 };
 
+/* needs to be called with BKL held */
 int usb_device_probe(struct device *dev)
 {
 	struct usb_interface * intf = to_usb_interface(dev);
@@ -83,11 +84,8 @@ int usb_device_probe(struct device *dev)
 	if (!driver->probe)
 		return error;
 
-	if (driver->owner) {
-		m = try_inc_mod_count(driver->owner);
-		if (m == 0)
+	if (!try_module_get(driver->owner))
 		return error;
-	}
 
 	id = usb_match_id (intf, driver->id_table);
 	if (id) {
@@ -99,8 +97,7 @@ int usb_device_probe(struct device *dev)
 	if (!error)
 		intf->driver = driver;
 
-	if (driver->owner)
-		__MOD_DEC_USE_COUNT(driver->owner);
+	put_module(driver->owner);
 
 	return error;
 }
@@ -120,15 +117,13 @@ int usb_device_remove(struct device *dev)
 		return -ENODEV;
 	}
 
-	if (driver->owner) {
-		m = try_inc_mod_count(driver->owner);
+	m = try_module_get(driver->owner);
 	if (m == 0) {
 		// FIXME this happens even when we just rmmod
 		// drivers that aren't in active use...
 		err("Dieing driver still bound to device.\n");
 		return -EIO;
 	}
-	}
 
 	/* if we sleep here on an umanaged driver 
 	 * the holder of the lock guards against 
@@ -143,8 +138,7 @@ int usb_device_remove(struct device *dev)
 		usb_driver_release_interface(driver, intf);
 
 	up(&driver->serialize);
-	if (driver->owner)
-		__MOD_DEC_USE_COUNT(driver->owner);
+	module_put(driver->owner)
 
 	return 0;
 }