提交 9d84c9e8 编写于 作者: J Jean Delvare 提交者: Jean Delvare

hwmon: (ibmaem) Make instance initializations independent

There is no good reason that I can see why the failure to initialize
one instance should prevent other instances from being initialized.
Signed-off-by: NJean Delvare <khali@linux-fr.org>
Acked-by: NDarrick J. Wong <djwong@us.ibm.com>
Acked-by: NGuenter Roeck <guenter.roeck@ericsson.com>
上级 547a1c99
...@@ -245,8 +245,6 @@ static void aem_bmc_gone(int iface); ...@@ -245,8 +245,6 @@ static void aem_bmc_gone(int iface);
static void aem_msg_handler(struct ipmi_recv_msg *msg, void *user_msg_data); static void aem_msg_handler(struct ipmi_recv_msg *msg, void *user_msg_data);
static void aem_remove_sensors(struct aem_data *data); static void aem_remove_sensors(struct aem_data *data);
static int aem_init_aem1(struct aem_ipmi_data *probe);
static int aem_init_aem2(struct aem_ipmi_data *probe);
static int aem1_find_sensors(struct aem_data *data); static int aem1_find_sensors(struct aem_data *data);
static int aem2_find_sensors(struct aem_data *data); static int aem2_find_sensors(struct aem_data *data);
static void update_aem1_sensors(struct aem_data *data); static void update_aem1_sensors(struct aem_data *data);
...@@ -616,7 +614,7 @@ static int aem_init_aem1_inst(struct aem_ipmi_data *probe, u8 module_handle) ...@@ -616,7 +614,7 @@ static int aem_init_aem1_inst(struct aem_ipmi_data *probe, u8 module_handle)
} }
/* Find and initialize all AEM1 instances */ /* Find and initialize all AEM1 instances */
static int aem_init_aem1(struct aem_ipmi_data *probe) static void aem_init_aem1(struct aem_ipmi_data *probe)
{ {
int num, i, err; int num, i, err;
...@@ -627,11 +625,8 @@ static int aem_init_aem1(struct aem_ipmi_data *probe) ...@@ -627,11 +625,8 @@ static int aem_init_aem1(struct aem_ipmi_data *probe)
dev_err(probe->bmc_device, dev_err(probe->bmc_device,
"Error %d initializing AEM1 0x%X\n", "Error %d initializing AEM1 0x%X\n",
err, i); err, i);
return err;
} }
} }
return 0;
} }
/* Probe functions for AEM2 devices */ /* Probe functions for AEM2 devices */
...@@ -752,7 +747,7 @@ static int aem_init_aem2_inst(struct aem_ipmi_data *probe, ...@@ -752,7 +747,7 @@ static int aem_init_aem2_inst(struct aem_ipmi_data *probe,
} }
/* Find and initialize all AEM2 instances */ /* Find and initialize all AEM2 instances */
static int aem_init_aem2(struct aem_ipmi_data *probe) static void aem_init_aem2(struct aem_ipmi_data *probe)
{ {
struct aem_find_instance_resp fi_resp; struct aem_find_instance_resp fi_resp;
int err; int err;
...@@ -771,12 +766,9 @@ static int aem_init_aem2(struct aem_ipmi_data *probe) ...@@ -771,12 +766,9 @@ static int aem_init_aem2(struct aem_ipmi_data *probe)
dev_err(probe->bmc_device, dev_err(probe->bmc_device,
"Error %d initializing AEM2 0x%X\n", "Error %d initializing AEM2 0x%X\n",
err, fi_resp.module_handle); err, fi_resp.module_handle);
return err;
} }
i++; i++;
} }
return 0;
} }
/* Probe a BMC for AEM firmware instances */ /* Probe a BMC for AEM firmware instances */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册