Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

iio: stx104: Utilize the module_isa_driver and max_num_isa_dev macros

The Apex Embedded Systems STX104 DAC drivers does not do anything
special in module init/exit. This patch eliminates the module init/exit
boilerplate code by utilizing the module_isa_driver macro.

Additionally, the max_num_isa_dev macro is utilized to simplify the
determination of maximum possible STX104 devices in the system.

Cc: Jonathan Cameron <jic23@kernel.org>
Cc: Hartmut Knaack <knaack.h@gmx.de>
Cc: Lars-Peter Clausen <lars@metafoo.de>
Cc: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

William Breathitt Gray and committed by
Greg Kroah-Hartman
9c2cfc19 136c9568

+3 -21
+3 -21
drivers/iio/dac/stx104.c
··· 33 33 } 34 34 35 35 #define STX104_EXTENT 16 36 - /** 37 - * The highest base address possible for an ISA device is 0x3FF; this results in 38 - * 1024 possible base addresses. Dividing the number of possible base addresses 39 - * by the address extent taken by each device results in the maximum number of 40 - * devices on a system. 41 - */ 42 - #define MAX_NUM_STX104 (1024 / STX104_EXTENT) 43 36 44 - static unsigned base[MAX_NUM_STX104]; 45 - static unsigned num_stx104; 37 + static unsigned int base[max_num_isa_dev(STX104_EXTENT)]; 38 + static unsigned int num_stx104; 46 39 module_param_array(base, uint, &num_stx104, 0); 47 40 MODULE_PARM_DESC(base, "Apex Embedded Systems STX104 base addresses"); 48 41 ··· 127 134 } 128 135 }; 129 136 130 - static void __exit stx104_exit(void) 131 - { 132 - isa_unregister_driver(&stx104_driver); 133 - } 134 - 135 - static int __init stx104_init(void) 136 - { 137 - return isa_register_driver(&stx104_driver, num_stx104); 138 - } 139 - 140 - module_init(stx104_init); 141 - module_exit(stx104_exit); 137 + module_isa_driver(stx104_driver, num_stx104); 142 138 143 139 MODULE_AUTHOR("William Breathitt Gray <vilhelm.gray@gmail.com>"); 144 140 MODULE_DESCRIPTION("Apex Embedded Systems STX104 DAC driver");