Skip to content

Commit 3664ff8

Browse files
bbkzzMike Snitzer
authored andcommitted
dm: add helper macro for simple DM target module init and exit
Eliminate duplicate boilerplate code for simple modules that contain a single DM target driver without any additional setup code. Add a new module_dm() macro, which replaces the module_init() and module_exit() with template functions that call dm_register_target() and dm_unregister_target() respectively. Signed-off-by: Yangtao Li <frank.li@vivo.com> Signed-off-by: Mike Snitzer <snitzer@kernel.org>
1 parent 306fbc2 commit 3664ff8

15 files changed

Lines changed: 35 additions & 189 deletions

drivers/md/dm-crypt.c

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3659,19 +3659,7 @@ static struct target_type crypt_target = {
36593659
.iterate_devices = crypt_iterate_devices,
36603660
.io_hints = crypt_io_hints,
36613661
};
3662-
3663-
static int __init dm_crypt_init(void)
3664-
{
3665-
return dm_register_target(&crypt_target);
3666-
}
3667-
3668-
static void __exit dm_crypt_exit(void)
3669-
{
3670-
dm_unregister_target(&crypt_target);
3671-
}
3672-
3673-
module_init(dm_crypt_init);
3674-
module_exit(dm_crypt_exit);
3662+
module_dm(crypt);
36753663

36763664
MODULE_AUTHOR("Jana Saout <jana@saout.de>");
36773665
MODULE_DESCRIPTION(DM_NAME " target for transparent encryption / decryption");

drivers/md/dm-delay.c

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -367,20 +367,7 @@ static struct target_type delay_target = {
367367
.status = delay_status,
368368
.iterate_devices = delay_iterate_devices,
369369
};
370-
371-
static int __init dm_delay_init(void)
372-
{
373-
return dm_register_target(&delay_target);
374-
}
375-
376-
static void __exit dm_delay_exit(void)
377-
{
378-
dm_unregister_target(&delay_target);
379-
}
380-
381-
/* Module hooks */
382-
module_init(dm_delay_init);
383-
module_exit(dm_delay_exit);
370+
module_dm(delay);
384371

385372
MODULE_DESCRIPTION(DM_NAME " delay target");
386373
MODULE_AUTHOR("Heinz Mauelshagen <mauelshagen@redhat.com>");

drivers/md/dm-dust.c

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -570,19 +570,7 @@ static struct target_type dust_target = {
570570
.status = dust_status,
571571
.prepare_ioctl = dust_prepare_ioctl,
572572
};
573-
574-
static int __init dm_dust_init(void)
575-
{
576-
return dm_register_target(&dust_target);
577-
}
578-
579-
static void __exit dm_dust_exit(void)
580-
{
581-
dm_unregister_target(&dust_target);
582-
}
583-
584-
module_init(dm_dust_init);
585-
module_exit(dm_dust_exit);
573+
module_dm(dust);
586574

587575
MODULE_DESCRIPTION(DM_NAME " dust test target");
588576
MODULE_AUTHOR("Bryan Gurney <dm-devel@redhat.com>");

drivers/md/dm-ebs-target.c

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -452,19 +452,7 @@ static struct target_type ebs_target = {
452452
.prepare_ioctl = ebs_prepare_ioctl,
453453
.iterate_devices = ebs_iterate_devices,
454454
};
455-
456-
static int __init dm_ebs_init(void)
457-
{
458-
return dm_register_target(&ebs_target);
459-
}
460-
461-
static void dm_ebs_exit(void)
462-
{
463-
dm_unregister_target(&ebs_target);
464-
}
465-
466-
module_init(dm_ebs_init);
467-
module_exit(dm_ebs_exit);
455+
module_dm(ebs);
468456

469457
MODULE_AUTHOR("Heinz Mauelshagen <dm-devel@redhat.com>");
470458
MODULE_DESCRIPTION(DM_NAME " emulated block size target");

drivers/md/dm-era-target.c

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1753,19 +1753,7 @@ static struct target_type era_target = {
17531753
.iterate_devices = era_iterate_devices,
17541754
.io_hints = era_io_hints
17551755
};
1756-
1757-
static int __init dm_era_init(void)
1758-
{
1759-
return dm_register_target(&era_target);
1760-
}
1761-
1762-
static void __exit dm_era_exit(void)
1763-
{
1764-
dm_unregister_target(&era_target);
1765-
}
1766-
1767-
module_init(dm_era_init);
1768-
module_exit(dm_era_exit);
1756+
module_dm(era);
17691757

17701758
MODULE_DESCRIPTION(DM_NAME " era target");
17711759
MODULE_AUTHOR("Joe Thornber <ejt@redhat.com>");

drivers/md/dm-flakey.c

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -506,20 +506,7 @@ static struct target_type flakey_target = {
506506
.prepare_ioctl = flakey_prepare_ioctl,
507507
.iterate_devices = flakey_iterate_devices,
508508
};
509-
510-
static int __init dm_flakey_init(void)
511-
{
512-
return dm_register_target(&flakey_target);
513-
}
514-
515-
static void __exit dm_flakey_exit(void)
516-
{
517-
dm_unregister_target(&flakey_target);
518-
}
519-
520-
/* Module hooks */
521-
module_init(dm_flakey_init);
522-
module_exit(dm_flakey_exit);
509+
module_dm(flakey);
523510

524511
MODULE_DESCRIPTION(DM_NAME " flakey target");
525512
MODULE_AUTHOR("Joe Thornber <dm-devel@redhat.com>");

drivers/md/dm-log-writes.c

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -937,19 +937,7 @@ static struct target_type log_writes_target = {
937937
.dax_zero_page_range = log_writes_dax_zero_page_range,
938938
.dax_recovery_write = log_writes_dax_recovery_write,
939939
};
940-
941-
static int __init dm_log_writes_init(void)
942-
{
943-
return dm_register_target(&log_writes_target);
944-
}
945-
946-
static void __exit dm_log_writes_exit(void)
947-
{
948-
dm_unregister_target(&log_writes_target);
949-
}
950-
951-
module_init(dm_log_writes_init);
952-
module_exit(dm_log_writes_exit);
940+
module_dm(log_writes);
953941

954942
MODULE_DESCRIPTION(DM_NAME " log writes target");
955943
MODULE_AUTHOR("Josef Bacik <jbacik@fb.com>");

drivers/md/dm-raid.c

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4077,23 +4077,7 @@ static struct target_type raid_target = {
40774077
.preresume = raid_preresume,
40784078
.resume = raid_resume,
40794079
};
4080-
4081-
static int __init dm_raid_init(void)
4082-
{
4083-
DMINFO("Loading target version %u.%u.%u",
4084-
raid_target.version[0],
4085-
raid_target.version[1],
4086-
raid_target.version[2]);
4087-
return dm_register_target(&raid_target);
4088-
}
4089-
4090-
static void __exit dm_raid_exit(void)
4091-
{
4092-
dm_unregister_target(&raid_target);
4093-
}
4094-
4095-
module_init(dm_raid_init);
4096-
module_exit(dm_raid_exit);
4080+
module_dm(raid);
40974081

40984082
module_param(devices_handle_discard_safely, bool, 0644);
40994083
MODULE_PARM_DESC(devices_handle_discard_safely,

drivers/md/dm-switch.c

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -565,19 +565,7 @@ static struct target_type switch_target = {
565565
.prepare_ioctl = switch_prepare_ioctl,
566566
.iterate_devices = switch_iterate_devices,
567567
};
568-
569-
static int __init dm_switch_init(void)
570-
{
571-
return dm_register_target(&switch_target);
572-
}
573-
574-
static void __exit dm_switch_exit(void)
575-
{
576-
dm_unregister_target(&switch_target);
577-
}
578-
579-
module_init(dm_switch_init);
580-
module_exit(dm_switch_exit);
568+
module_dm(switch);
581569

582570
MODULE_DESCRIPTION(DM_NAME " dynamic path switching target");
583571
MODULE_AUTHOR("Kevin D. O'Kelley <Kevin_OKelley@dell.com>");

drivers/md/dm-unstripe.c

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -192,19 +192,7 @@ static struct target_type unstripe_target = {
192192
.iterate_devices = unstripe_iterate_devices,
193193
.io_hints = unstripe_io_hints,
194194
};
195-
196-
static int __init dm_unstripe_init(void)
197-
{
198-
return dm_register_target(&unstripe_target);
199-
}
200-
201-
static void __exit dm_unstripe_exit(void)
202-
{
203-
dm_unregister_target(&unstripe_target);
204-
}
205-
206-
module_init(dm_unstripe_init);
207-
module_exit(dm_unstripe_exit);
195+
module_dm(unstripe);
208196

209197
MODULE_DESCRIPTION(DM_NAME " unstriped target");
210198
MODULE_ALIAS("dm-unstriped");

0 commit comments

Comments
 (0)