mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-17 10:16:41 +07:00
ipmi: Remove the device id from ipmi_register_smi()
It's no longer used, dynamic device id handling is in place now. Signed-off-by: Corey Minyard <cminyard@mvista.com>
This commit is contained in:
parent
aa9c9ab244
commit
1e5058ea21
@ -3112,7 +3112,6 @@ EXPORT_SYMBOL(ipmi_poll_interface);
|
||||
|
||||
int ipmi_register_smi(const struct ipmi_smi_handlers *handlers,
|
||||
void *send_info,
|
||||
struct ipmi_device_id *device_id,
|
||||
struct device *si_dev,
|
||||
unsigned char slave_addr)
|
||||
{
|
||||
|
@ -23,7 +23,6 @@
|
||||
|
||||
struct ipmi_smi_powernv {
|
||||
u64 interface_id;
|
||||
struct ipmi_device_id ipmi_id;
|
||||
ipmi_smi_t intf;
|
||||
unsigned int irq;
|
||||
|
||||
@ -266,8 +265,7 @@ static int ipmi_powernv_probe(struct platform_device *pdev)
|
||||
}
|
||||
|
||||
/* todo: query actual ipmi_device_id */
|
||||
rc = ipmi_register_smi(&ipmi_powernv_smi_handlers, ipmi,
|
||||
&ipmi->ipmi_id, dev, 0);
|
||||
rc = ipmi_register_smi(&ipmi_powernv_smi_handlers, ipmi, dev, 0);
|
||||
if (rc) {
|
||||
dev_warn(dev, "IPMI SMI registration failed (%d)\n", rc);
|
||||
goto err_free_msg;
|
||||
|
@ -3631,7 +3631,6 @@ static int try_smi_init(struct smi_info *new_smi)
|
||||
|
||||
rv = ipmi_register_smi(&handlers,
|
||||
new_smi,
|
||||
&new_smi->device_id,
|
||||
new_smi->dev,
|
||||
new_smi->slave_addr);
|
||||
if (rv) {
|
||||
|
@ -267,9 +267,6 @@ struct ssif_info {
|
||||
unsigned char *i2c_data;
|
||||
unsigned int i2c_size;
|
||||
|
||||
/* From the device id response. */
|
||||
struct ipmi_device_id device_id;
|
||||
|
||||
struct timer_list retry_timer;
|
||||
int retries_left;
|
||||
|
||||
@ -1481,21 +1478,6 @@ static int ssif_probe(struct i2c_client *client, const struct i2c_device_id *id)
|
||||
ipmi_addr_src_to_str(ssif_info->addr_source),
|
||||
client->addr, client->adapter->name, slave_addr);
|
||||
|
||||
/*
|
||||
* Do a Get Device ID command, since it comes back with some
|
||||
* useful info.
|
||||
*/
|
||||
msg[0] = IPMI_NETFN_APP_REQUEST << 2;
|
||||
msg[1] = IPMI_GET_DEVICE_ID_CMD;
|
||||
rv = do_cmd(client, 2, msg, &len, resp);
|
||||
if (rv)
|
||||
goto out;
|
||||
|
||||
rv = ipmi_demangle_device_id(resp[0] >> 2, resp[1],
|
||||
resp + 2, len - 2, &ssif_info->device_id);
|
||||
if (rv)
|
||||
goto out;
|
||||
|
||||
ssif_info->client = client;
|
||||
i2c_set_clientdata(client, ssif_info);
|
||||
|
||||
@ -1685,7 +1667,6 @@ static int ssif_probe(struct i2c_client *client, const struct i2c_device_id *id)
|
||||
|
||||
rv = ipmi_register_smi(&ssif_info->handlers,
|
||||
ssif_info,
|
||||
&ssif_info->device_id,
|
||||
&ssif_info->client->dev,
|
||||
slave_addr);
|
||||
if (rv) {
|
||||
|
@ -214,7 +214,6 @@ static inline int ipmi_demangle_device_id(uint8_t netfn, uint8_t cmd,
|
||||
call. */
|
||||
int ipmi_register_smi(const struct ipmi_smi_handlers *handlers,
|
||||
void *send_info,
|
||||
struct ipmi_device_id *device_id,
|
||||
struct device *dev,
|
||||
unsigned char slave_addr);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user