Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 127453 | Differences between
and this patch

Collapse All | Expand All

(-)thinkpad-5.9.orig/2.6/drivers/rtcmosram.c (-5 / +1 lines)
Lines 52-58 Link Here
52
/****** variables ******/
52
/****** variables ******/
53
53
54
static const char _szMyName[] = "rtcmosram";
54
static const char _szMyName[] = "rtcmosram";
55
static const char _szImName[] = "rtcmosram_do";
56
static const char _szMyVersion[] = "5.0";
55
static const char _szMyVersion[] = "5.0";
57
static const char _szProcfile[] = "driver/thinkpad/rtcmosram";
56
static const char _szProcfile[] = "driver/thinkpad/rtcmosram";
58
static struct resource *_presourceRtcmosram;
57
static struct resource *_presourceRtcmosram;
Lines 226-233 Link Here
226
	}
225
	}
227
	/* proc entry created */
226
	/* proc entry created */
228
227
229
	inter_module_register( _szImName, THIS_MODULE, &rtcmosram_do );
230
231
	return 0;
228
	return 0;
232
}
229
}
233
230
Lines 235-242 Link Here
235
static void __exit rtcmosram_exit( void )
232
static void __exit rtcmosram_exit( void )
236
{
233
{
237
234
238
	inter_module_unregister( _szImName );
239
240
 	remove_proc_entry( _szProcfile, NULL );
235
 	remove_proc_entry( _szProcfile, NULL );
241
236
242
	if ( _presourceRtcmosram != NULL ) release_resource( _presourceRtcmosram );
237
	if ( _presourceRtcmosram != NULL ) release_resource( _presourceRtcmosram );
Lines 244-248 Link Here
244
	return;
239
	return;
245
}
240
}
246
241
242
EXPORT_SYMBOL(rtcmosram_do);
247
module_init(rtcmosram_init);
243
module_init(rtcmosram_init);
248
module_exit(rtcmosram_exit);
244
module_exit(rtcmosram_exit);
(-)thinkpad-5.9.orig/2.6/drivers/smapi_core.c (-5 / +1 lines)
Lines 52-58 Link Here
52
/****** variables ******/
52
/****** variables ******/
53
53
54
static const char _szMyName[] = "smapi";
54
static const char _szMyName[] = "smapi";
55
static const char _szImName[] = "smapi_do";
56
static const char _szMyVersion[] = "5.0";
55
static const char _szMyVersion[] = "5.0";
57
static const char _szProcfile[] = "driver/thinkpad/smapi";
56
static const char _szProcfile[] = "driver/thinkpad/smapi";
58
57
Lines 298-305 Link Here
298
	}
297
	}
299
	/* proc entry created */
298
	/* proc entry created */
300
299
301
	inter_module_register( _szImName, THIS_MODULE, &smapi_do );
302
303
	return 0;
300
	return 0;
304
}
301
}
305
302
Lines 307-318 Link Here
307
static void __exit smapi_exit( void )
304
static void __exit smapi_exit( void )
308
{
305
{
309
306
310
	inter_module_unregister( _szImName );
311
312
	remove_proc_entry( _szProcfile, NULL );
307
	remove_proc_entry( _szProcfile, NULL );
313
308
314
	return;
309
	return;
315
}
310
}
316
311
312
EXPORT_SYMBOL(smapi_do);
317
module_init(smapi_init);
313
module_init(smapi_init);
318
module_exit(smapi_exit);
314
module_exit(smapi_exit);
(-)thinkpad-5.9.orig/2.6/drivers/superio.c (-5 / +1 lines)
Lines 52-58 Link Here
52
52
53
/****** variables ******/
53
/****** variables ******/
54
static const char _szMyName[] = "superio";
54
static const char _szMyName[] = "superio";
55
static const char _szImName[] = "superio_do";
56
static const char _szMyVersion[] = "5.0";
55
static const char _szMyVersion[] = "5.0";
57
static const char _szProcfile[] = "driver/thinkpad/superio";
56
static const char _szProcfile[] = "driver/thinkpad/superio";
58
static word _wPortIndex, _wPortData;
57
static word _wPortIndex, _wPortData;
Lines 887-894 Link Here
887
	}
886
	}
888
	/* proc entry created */
887
	/* proc entry created */
889
888
890
	inter_module_register( _szImName, THIS_MODULE, &superio_do );
891
892
	return 0;
889
	return 0;
893
}
890
}
894
891
Lines 896-903 Link Here
896
static void __exit superio_exit( void )
893
static void __exit superio_exit( void )
897
{
894
{
898
895
899
	inter_module_unregister( _szImName );
900
901
 	remove_proc_entry( _szProcfile, NULL );
896
 	remove_proc_entry( _szProcfile, NULL );
902
897
903
	if ( _presourceSuperio != NULL ) release_resource( _presourceSuperio );
898
	if ( _presourceSuperio != NULL ) release_resource( _presourceSuperio );
Lines 905-909 Link Here
905
	return;
900
	return;
906
}
901
}
907
902
903
EXPORT_SYMBOL(superio_do);
908
module_init(superio_init);
904
module_init(superio_init);
909
module_exit(superio_exit);
905
module_exit(superio_exit);
(-)thinkpad-5.9.orig/2.6/drivers/thinkpad.c (-6 / +6 lines)
Lines 230-242 Link Here
230
			pxint_do_t pxint_doSmapi;
230
			pxint_do_t pxint_doSmapi;
231
			int intRet;
231
			int intRet;
232
			if ( ! enable_smapi ) return -ETHINKPAD_MODULE_DISABLED;
232
			if ( ! enable_smapi ) return -ETHINKPAD_MODULE_DISABLED;
233
			pxint_doSmapi = (pxint_do_t)inter_module_get_request( "smapi_do" , _szSmapiName );
233
			pxint_doSmapi = (pxint_do_t)try_then_request_module( __symbol_get("smapi_do") , _szSmapiName );
234
			if ( pxint_doSmapi == NULL ) return -ETHINKPAD_MODULE_NOT_FOUND;
234
			if ( pxint_doSmapi == NULL ) return -ETHINKPAD_MODULE_NOT_FOUND;
235
			intRet = (*pxint_doSmapi)(
235
			intRet = (*pxint_doSmapi)(
236
				ulongIoctlArg, 
236
				ulongIoctlArg, 
237
				caller_has_w( pfileThe )
237
				caller_has_w( pfileThe )
238
			);
238
			);
239
			inter_module_put("smapi_do");
239
			__symbol_put("smapi_do");
240
			if ( intRet > 0 ) intRet = -ETHINKPAD_PROGRAMMING;
240
			if ( intRet > 0 ) intRet = -ETHINKPAD_PROGRAMMING;
241
			return intRet;
241
			return intRet;
242
		}
242
		}
Lines 245-257 Link Here
245
			pxint_do_t pxint_doSuperio;
245
			pxint_do_t pxint_doSuperio;
246
			int intRet;
246
			int intRet;
247
			if ( ! enable_superio ) return -ETHINKPAD_MODULE_DISABLED;
247
			if ( ! enable_superio ) return -ETHINKPAD_MODULE_DISABLED;
248
			pxint_doSuperio = (pxint_do_t)inter_module_get_request( "superio_do" , _szSuperioName );
248
			pxint_doSuperio = (pxint_do_t)try_then_request_module( __symbol_get("superio_do") , _szSuperioName );
249
			if ( pxint_doSuperio == NULL ) return -ETHINKPAD_MODULE_NOT_FOUND;
249
			if ( pxint_doSuperio == NULL ) return -ETHINKPAD_MODULE_NOT_FOUND;
250
			intRet = (*pxint_doSuperio)(
250
			intRet = (*pxint_doSuperio)(
251
				ulongIoctlArg, 
251
				ulongIoctlArg, 
252
				caller_has_w( pfileThe )
252
				caller_has_w( pfileThe )
253
			);
253
			);
254
			inter_module_put("superio_do");
254
			__symbol_put("superio_do");
255
			if ( intRet > 0 ) intRet = -ETHINKPAD_PROGRAMMING;
255
			if ( intRet > 0 ) intRet = -ETHINKPAD_PROGRAMMING;
256
			return intRet;
256
			return intRet;
257
		}
257
		}
Lines 260-272 Link Here
260
			pxint_do_t pxint_doRtcmosram;
260
			pxint_do_t pxint_doRtcmosram;
261
			int intRet;
261
			int intRet;
262
			if ( ! enable_rtcmosram ) return -ETHINKPAD_MODULE_DISABLED;
262
			if ( ! enable_rtcmosram ) return -ETHINKPAD_MODULE_DISABLED;
263
			pxint_doRtcmosram = (pxint_do_t)inter_module_get_request( "rtcmosram_do" , _szRtcmosramName );
263
			pxint_doRtcmosram = (pxint_do_t)try_then_request_module( __symbol_get("rtcmosram_do") , _szRtcmosramName );
264
			if ( pxint_doRtcmosram == NULL ) return -ETHINKPAD_MODULE_NOT_FOUND;
264
			if ( pxint_doRtcmosram == NULL ) return -ETHINKPAD_MODULE_NOT_FOUND;
265
			intRet = (*pxint_doRtcmosram)(
265
			intRet = (*pxint_doRtcmosram)(
266
				ulongIoctlArg, 
266
				ulongIoctlArg, 
267
				caller_has_w( pfileThe )
267
				caller_has_w( pfileThe )
268
			);
268
			);
269
			inter_module_put("rtcmosram_do");
269
			__symbol_put("rtcmosram_do");
270
			if ( intRet > 0 ) intRet = -ETHINKPAD_PROGRAMMING;
270
			if ( intRet > 0 ) intRet = -ETHINKPAD_PROGRAMMING;
271
			return intRet;
271
			return intRet;
272
		}
272
		}
(-)thinkpad-5.9.orig/2.6/drivers/thinkpadpm.c (-6 / +2 lines)
Lines 57-63 Link Here
57
/****** variables ******/
57
/****** variables ******/
58
58
59
static const char _szMyName[] = "thinkpadpm";
59
static const char _szMyName[] = "thinkpadpm";
60
static const char _szImName[] = "thinkpadpm_do";
61
static const char _szMyVersion[] = "5.9";
60
static const char _szMyVersion[] = "5.9";
62
static const char _szProcfile[] = "driver/thinkpad/thinkpadpm";
61
static const char _szProcfile[] = "driver/thinkpad/thinkpadpm";
63
62
Lines 516-536 Link Here
516
	}
515
	}
517
	/* proc entry created */
516
	/* proc entry created */
518
517
519
	inter_module_register( _szImName, THIS_MODULE, &thinkpadpm_do );
520
521
	return 0;
518
	return 0;
522
}
519
}
523
520
524
521
525
static void __exit thinkpadpm_exit( void )
522
static void __exit thinkpadpm_exit( void )
526
{
523
{
527
524
	
528
	inter_module_unregister( _szImName );
529
530
	remove_proc_entry( _szProcfile, NULL );
525
	remove_proc_entry( _szProcfile, NULL );
531
526
532
	return;
527
	return;
533
}
528
}
534
529
530
EXPORT_SYMBOL(thinkpadpm_do);
535
module_init(thinkpadpm_init);
531
module_init(thinkpadpm_init);
536
module_exit(thinkpadpm_exit);
532
module_exit(thinkpadpm_exit);

Return to bug 127453