From patchwork Fri Nov 5 20:10:01 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean Delvare X-Patchwork-Id: 304762 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oA5KABwo008644 for ; Fri, 5 Nov 2010 20:10:12 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753502Ab0KEUKI (ORCPT ); Fri, 5 Nov 2010 16:10:08 -0400 Received: from zone0.gcu-squad.org ([212.85.147.21]:27794 "EHLO services.gcu-squad.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752270Ab0KEUKI (ORCPT ); Fri, 5 Nov 2010 16:10:08 -0400 Received: from jdelvare.pck.nerim.net ([62.212.121.182] helo=endymion.delvare) by services.gcu-squad.org (GCU Mailer Daemon) with esmtpsa id 1PESi4-00017b-6h (TLSv1:AES128-SHA:128) (envelope-from ) ; Fri, 05 Nov 2010 21:16:28 +0100 Date: Fri, 5 Nov 2010 21:10:01 +0100 From: Jean Delvare To: Linux I2C , LMML Cc: Hans Verkuil , Jarod Wilson Subject: [PATCH 3/3] i2c: Mark i2c_adapter.id as deprecated Message-ID: <20101105211001.1cc93ac7@endymion.delvare> X-Mailer: Claws Mail 3.7.5 (GTK+ 2.20.1; x86_64-unknown-linux-gnu) Mime-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Fri, 05 Nov 2010 20:10:12 +0000 (UTC) --- linux-2.6.37-rc1.orig/include/linux/i2c.h 2010-11-05 13:55:17.000000000 +0100 +++ linux-2.6.37-rc1/include/linux/i2c.h 2010-11-05 15:41:20.000000000 +0100 @@ -353,7 +353,7 @@ struct i2c_algorithm { */ struct i2c_adapter { struct module *owner; - unsigned int id; + unsigned int id __deprecated; unsigned int class; /* classes to allow probing for */ const struct i2c_algorithm *algo; /* the algorithm to access the bus */ void *algo_data; --- linux-2.6.37-rc1.orig/drivers/i2c/i2c-mux.c 2010-11-05 16:06:18.000000000 +0100 +++ linux-2.6.37-rc1/drivers/i2c/i2c-mux.c 2010-11-05 16:06:33.000000000 +0100 @@ -120,7 +120,6 @@ struct i2c_adapter *i2c_add_mux_adapter( snprintf(priv->adap.name, sizeof(priv->adap.name), "i2c-%d-mux (chan_id %d)", i2c_adapter_id(parent), chan_id); priv->adap.owner = THIS_MODULE; - priv->adap.id = parent->id; priv->adap.algo = &priv->algo; priv->adap.algo_data = priv; priv->adap.dev.parent = &parent->dev;