Hi,
just search and replace.
Please apply.
Regards
Oliver
You can import this changeset into BK by piping this whole message to:
'| bk receive [path to repository]' or apply the patch as usual.
===================================================================
[EMAIL PROTECTED], 2002-11-30 14:53:15+01:00, [EMAIL PROTECTED]
- cleanup for new module primitives
devio.c | 16 +++++++---------
usb.c | 30 ++++++++++++------------------
2 files changed, 19 insertions(+), 27 deletions(-)
diff -Nru a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
--- a/drivers/usb/core/devio.c Sat Nov 30 14:57:11 2002
+++ b/drivers/usb/core/devio.c Sat Nov 30 14:57:11 2002
@@ -860,7 +860,7 @@
if (uurb.buffer_length > 16384)
return -EINVAL;
if (!access_ok((uurb.endpoint & USB_DIR_IN) ? VERIFY_WRITE :
VERIFY_READ, uurb.buffer, uurb.buffer_length))
- return -EFAULT;
+ return -EFAULT;
break;
default:
@@ -955,10 +955,10 @@
if (!(usb_pipeisoc(urb->pipe)))
return 0;
for (i = 0; i < urb->number_of_packets; i++) {
- if (put_user(urb->iso_frame_desc[i].actual_length,
+ if (put_user(urb->iso_frame_desc[i].actual_length,
&((struct usbdevfs_urb
*)as->userurb)->iso_frame_desc[i].actual_length))
return -EFAULT;
- if (put_user(urb->iso_frame_desc[i].status,
+ if (put_user(urb->iso_frame_desc[i].status,
&((struct usbdevfs_urb
*)as->userurb)->iso_frame_desc[i].status))
return -EFAULT;
}
@@ -1122,18 +1122,16 @@
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)
retval = -ENOTTY;
}
@@ -1188,7 +1186,7 @@
case USBDEVFS_RESET:
ret = proc_resetdevice(ps);
break;
-
+
case USBDEVFS_CLEAR_HALT:
ret = proc_clearhalt(ps, (void *)arg);
if (ret >= 0)
diff -Nru a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
--- a/drivers/usb/core/usb.c Sat Nov 30 14:57:11 2002
+++ b/drivers/usb/core/usb.c Sat Nov 30 14:57:11 2002
@@ -69,7 +69,8 @@
.probe = generic_probe,
.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 @@
if (!driver->probe)
return error;
- if (driver->owner) {
- m = try_inc_mod_count(driver->owner);
- if (m == 0)
- return error;
- }
+ if (!try_module_get(driver->owner))
+ return error;
id = usb_match_id (intf, driver->id_table);
if (id) {
@@ -99,8 +97,7 @@
if (!error)
intf->driver = driver;
- if (driver->owner)
- __MOD_DEC_USE_COUNT(driver->owner);
+ put_module(driver->owner);
return error;
}
@@ -120,14 +117,12 @@
return -ENODEV;
}
- if (driver->owner) {
- m = try_inc_mod_count(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;
- }
+ 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
@@ -143,8 +138,7 @@
usb_driver_release_interface(driver, intf);
up(&driver->serialize);
- if (driver->owner)
- __MOD_DEC_USE_COUNT(driver->owner);
+ module_put(driver->owner)
return 0;
}
===================================================================
This BitKeeper patch contains the following changesets:
1.1070
## Wrapped with gzip_uu ##
begin 664 bkpatch2408
M'XL(`+?#Z#T``[U6:V_;-A3]+/Z*N_;#TG:2^)!DV8&#M$W:&4W1(%N``4UA
MZ'%E:98E@Z+B%=./+RD9\1*X29,!-6S1)GDNSST\]\+/X;)!.;'JLKA&29[#
M[W6C]$^LZ@J=O%YA653M/TXM%WKQHJ[UHFNFW0'AQDM;2<3&74A<<)_H7>>1
M2G+0B\W$8HZXF5%?USBQ+D[?7YZ]OB!D.H6W>50M\`]4,)V2>'F<ME@Z2UE'
MN3FPNUGN.*6,,>Y3X0?,[W@HA->Q@,:I_IKRT3B+@S%)H^LBM>/C=93$6)9.
MI9&W8G#&!*4A#>BH8XR&@IP`<Q@=4:#<9<P5%)@W\<6$^:\HFU`*0YK'^P2!
M5QQL2M[`_V?^EB1@0U)B5+5KR&H)%6Y@5:=MB;"6Q:I0FD9#/@#C(V],SG?2
M$?N1+T)H1,G1'M:I-+DV;MO$YN,D._8>';.@X\+SO2X).*(?<C9*XDA0_SZ-
M;L5,:HF[P/UE,.$SCW64F:P>XI3B=5'?9:5O,O1&8>?SC&$F.(LYTIB)Q['Z
M3^A;O`+A>[U5OX?8[]PGLR9Q5&IPLCS>1%64UK63R<^FM+X\S%D;F^I+8M0+
M6&_LP+MM:S;QV(_8>@3V^"?;NM?Y$]ART[^U2\^_*_D3''\2!@(8F0V#95D2
M52LKL$_?O;X\^_.0G(S]T&P8!LLJ,CA8MVK>ZNYXT,K8/BJ:>I[):(7S%)OD
M<_'%B1+51N6\Q&JA\M]TB(#U(?KAQT(T*E)MH[%&2^!DIL=@8&C@ORCY=3[(
M-5_H+GDP2&(?U9L*Y8L7\*]!"C$@A3<@S:%;C>\`#OOMYH#9=KPR,V,VS/3C
MU7Z[]V7[L-D?T3:(L?7Q$":I5_=W"JY+A&M01T,N!G?KEO$T>S/=MEGXL_NV
M:7`/&;S/^"GV'G%S@_K)]?VY+S4+3!M0-<0(2526F,*F4#F\^7`&.98IO'1-
M38"O[4HU:)_;[IJ-W%0-2EE+XR7*>^?1OJAVMMOC.BX@U#OU307$6L$4[CWK
M<""D]TV!&I=;ENO"N]E?'T]!Y44#>;1>8]4`7F,%F]P\$/YN&P5RI:,.^[?R
M:D2D())8_:J@J$"7K9X'79:.X^B=.IN#9R<%%M5B"X%&%64)<=U6J1'1])T$
MG:OJF6&VZQVS3R8U+^A%\$9&A&U*6HL[*>W^&"4Y)LNF74VS-,4(LXQ\`Q-$
&!XJ%"0``
`
end
-------------------------------------------------------
This SF.net email is sponsored by: Get the new Palm Tungsten T
handheld. Power & Color in a compact size!
http://ads.sourceforge.net/cgi-bin/redirect.pl?palm0002en
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
