ipmi:ssif: Use i2c_adapter_id instead of adapter->nr

Signed-off-by: Corey Minyard <cminyard@mvista.com>

diff --git a/drivers/char/ipmi/ipmi_ssif.c b/drivers/char/ipmi/ipmi_ssif.c
index 1d4fd846e45748c3851ac5601000a401373ae0c6..05e18041c357e8d26eca7aa708acf61288af32a9 100644 (file)
--- a/drivers/char/ipmi/ipmi_ssif.c
+++ b/drivers/char/ipmi/ipmi_ssif.c
@@ -1096,7 +1096,7 @@ static int inc_usecount(void *send_info)
 {
        struct ssif_info *ssif_info = send_info;
 
-       if (!i2c_get_adapter(ssif_info->client->adapter->nr))
+       if (!i2c_get_adapter(i2c_adapter_id(ssif_info->client->adapter)))
                return -ENODEV;
 
        i2c_use_client(ssif_info->client);
@@ -1665,7 +1665,8 @@ static int ssif_probe(struct i2c_client *client, const struct i2c_device_id *id)
        {
                unsigned int thread_num;
 
-               thread_num = ((ssif_info->client->adapter->nr << 8) |
+               thread_num = ((i2c_adapter_id(ssif_info->client->adapter)
+                              << 8) |
                              ssif_info->client->addr);
                init_completion(&ssif_info->wake_thread);
                ssif_info->thread = kthread_run(ipmi_ssif_thread, ssif_info,