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>

diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
index 9157a9e17c36bfe0be7f48c06de2a77839bfd092..ee108be1334876c6efd6eaed1827614c04ac3c44 100644 (file)
--- a/drivers/char/ipmi/ipmi_msghandler.c
+++ b/drivers/char/ipmi/ipmi_msghandler.c
@@ -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)
 {

diff --git a/drivers/char/ipmi/ipmi_powernv.c b/drivers/char/ipmi/ipmi_powernv.c
index b338a4becbf8c72baa8a8e9b6b0396c1e6ee3c60..07fddbefefe482f4ce0c32fe1a92e7858d68c4d5 100644 (file)
--- a/drivers/char/ipmi/ipmi_powernv.c
+++ b/drivers/char/ipmi/ipmi_powernv.c
@@ -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;

diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index bc99369fca4975bb36fa05c577333d51c33e20f0..4caa793a6765baca8813145dbd0f4fffe4f45a27 100644 (file)
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -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) {

diff --git a/drivers/char/ipmi/ipmi_ssif.c b/drivers/char/ipmi/ipmi_ssif.c
index 20ab098cd661563c37abb1b6e65a99d56c0e141b..dd716d06ce73ee12ccf8cedcaacf158c6704223e 100644 (file)
--- a/drivers/char/ipmi/ipmi_ssif.c
+++ b/drivers/char/ipmi/ipmi_ssif.c
@@ -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) {

diff --git a/include/linux/ipmi_smi.h b/include/linux/ipmi_smi.h
index 75542c837c07c16b63e9814e53f695bd36507276..97771e36b7f05413a8097cb707b7af820052d23d 100644 (file)
--- a/include/linux/ipmi_smi.h
+++ b/include/linux/ipmi_smi.h
@@ -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);