From mboxrd@z Thu Jan 1 00:00:00 1970 From: Heiko Schocher Date: Fri, 23 May 2014 05:56:40 +0200 Subject: [U-Boot] [RFC, PATCH v2 1/4] dm: rename device struct to udevice In-Reply-To: References: <1400755388-14922-1-git-send-email-hs@denx.de> <1400755388-14922-2-git-send-email-hs@denx.de> Message-ID: <537EC6F8.6010706@denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hello Simon, Am 22.05.2014 22:34, schrieb Simon Glass: > +Tom > > Hi Heiko, > > On 22 May 2014 00:43, Heiko Schocher wrote: >> using UBI and DM together leads in compiler error, as >> both define a "struct device", so rename "struct device" >> in include/dm/device.h to "struct udevice", as we use >> linux code (MTD/UBI/UBIFS some USB code,...) and cannot >> change the linux "struct device" >> >> Signed-off-by: Heiko Schocher >> Cc: Simon Glass >> Cc: Marek Vasut > > I'm not 100% comfortable with this but if we really want to avoid > changing kernel code that moves into U-Boot it is either this or a I vote for this, as we want to sync with newer linux code from time to time, and not changing linux code in U-Boot makes this easier. > '#define device ldevice' at the top of the linux code/in a header. I'm > not sure which is preferable. Some USB Code (more too?) is also from linux ... Marek? What do you think? I just did not change the current situation, but if we decide to go in this direction, I can try it ... but what, if a source code file uses the U-Boot driver model and linux code? Could we fall into such a case? > If Tom decides to apply this, I'd like to request that it be done > soon, since it has wide impact on driver model code. Another possibility is, to move driver model specific vars into the linux struct device ... which leads in a bigger "struct device" for the driver model ... > Acked-by: Simon Glass > > Regards, > Simon bye, Heiko -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany