mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-29 23:53:32 +00:00
thinkpad-acpi: move greeting messages out of the first subdriver (v2)
Move the driver initial greetings out of the first subdriver, as we do a lot of other initialization before that point, and the initial greetings should go as soon as the driver decides that it should load. These greetings are not cosmetic, they make my life easier when users report bugs. Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
This commit is contained in:
parent
5d756db99a
commit
7a43f78898
1 changed files with 27 additions and 29 deletions
|
@ -1888,36 +1888,9 @@ static bool __init tpacpi_is_fw_known(void)
|
|||
****************************************************************************/
|
||||
|
||||
/*************************************************************************
|
||||
* thinkpad-acpi init subdriver
|
||||
* thinkpad-acpi metadata subdriver
|
||||
*/
|
||||
|
||||
static int __init thinkpad_acpi_driver_init(struct ibm_init_struct *iibm)
|
||||
{
|
||||
printk(TPACPI_INFO "%s v%s\n", TPACPI_DESC, TPACPI_VERSION);
|
||||
printk(TPACPI_INFO "%s\n", TPACPI_URL);
|
||||
|
||||
printk(TPACPI_INFO "ThinkPad BIOS %s, EC %s\n",
|
||||
(thinkpad_id.bios_version_str) ?
|
||||
thinkpad_id.bios_version_str : "unknown",
|
||||
(thinkpad_id.ec_version_str) ?
|
||||
thinkpad_id.ec_version_str : "unknown");
|
||||
|
||||
BUG_ON(!thinkpad_id.vendor);
|
||||
|
||||
if (thinkpad_id.model_str)
|
||||
printk(TPACPI_INFO "%s %s, model %s\n",
|
||||
(thinkpad_id.vendor == PCI_VENDOR_ID_IBM) ?
|
||||
"IBM" : ((thinkpad_id.vendor ==
|
||||
PCI_VENDOR_ID_LENOVO) ?
|
||||
"Lenovo" : "Unknown vendor"),
|
||||
thinkpad_id.model_str,
|
||||
(thinkpad_id.nummodel_str) ?
|
||||
thinkpad_id.nummodel_str : "unknown");
|
||||
|
||||
tpacpi_check_outdated_fw();
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int thinkpad_acpi_driver_read(struct seq_file *m)
|
||||
{
|
||||
seq_printf(m, "driver:\t\t%s\n", TPACPI_DESC);
|
||||
|
@ -8753,12 +8726,34 @@ static int __init probe_for_thinkpad(void)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static void __init thinkpad_acpi_init_banner(void)
|
||||
{
|
||||
printk(TPACPI_INFO "%s v%s\n", TPACPI_DESC, TPACPI_VERSION);
|
||||
printk(TPACPI_INFO "%s\n", TPACPI_URL);
|
||||
|
||||
printk(TPACPI_INFO "ThinkPad BIOS %s, EC %s\n",
|
||||
(thinkpad_id.bios_version_str) ?
|
||||
thinkpad_id.bios_version_str : "unknown",
|
||||
(thinkpad_id.ec_version_str) ?
|
||||
thinkpad_id.ec_version_str : "unknown");
|
||||
|
||||
BUG_ON(!thinkpad_id.vendor);
|
||||
|
||||
if (thinkpad_id.model_str)
|
||||
printk(TPACPI_INFO "%s %s, model %s\n",
|
||||
(thinkpad_id.vendor == PCI_VENDOR_ID_IBM) ?
|
||||
"IBM" : ((thinkpad_id.vendor ==
|
||||
PCI_VENDOR_ID_LENOVO) ?
|
||||
"Lenovo" : "Unknown vendor"),
|
||||
thinkpad_id.model_str,
|
||||
(thinkpad_id.nummodel_str) ?
|
||||
thinkpad_id.nummodel_str : "unknown");
|
||||
}
|
||||
|
||||
/* Module init, exit, parameters */
|
||||
|
||||
static struct ibm_init_struct ibms_init[] __initdata = {
|
||||
{
|
||||
.init = thinkpad_acpi_driver_init,
|
||||
.data = &thinkpad_acpi_driver_data,
|
||||
},
|
||||
{
|
||||
|
@ -9028,6 +9023,9 @@ static int __init thinkpad_acpi_module_init(void)
|
|||
|
||||
/* Driver initialization */
|
||||
|
||||
thinkpad_acpi_init_banner();
|
||||
tpacpi_check_outdated_fw();
|
||||
|
||||
TPACPI_ACPIHANDLE_INIT(ecrd);
|
||||
TPACPI_ACPIHANDLE_INIT(ecwr);
|
||||
|
||||
|
|
Loading…
Reference in a new issue