| Message ID | 1363168080-12697-1-git-send-email-dahuang@nvidia.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Mar 13, 2013 at 05:48:00PM +0800, Danny Huang wrote: > + soc_dev = soc_device_register(soc_dev_attr); > + if (IS_ERR(soc_dev)) { > + kfree(soc_dev_attr->soc_id); > + kfree(soc_dev_attr->revision); > + kfree(soc_dev_attr->family); > + kfree(soc_dev_attr); > + goto out; > + } > + > + parent = soc_device_to_device(soc_dev); > + if (IS_ERR(parent)) > + parent = NULL; I know other places have done this kind of thing but what use is it? struct device *soc_device_to_device(struct soc_device *soc_dev) { return &soc_dev->dev; } Now, consider that soc_device_register() returns one of two things: 1. A valid pointer - it must be valid, because soc_device_register() already dereferences it. 2. An error pointer, trappable with IS_ERR(). You are trapping it with IS_ERR() - that's good news. So, by the time we get to soc_device_to_device(), we know that it _is_ a valid pointer. So why would soc_device_to_device() return an error pointer?
On 03/13/2013 03:48 AM, Danny Huang wrote: > Expose Tegra chip ID and revision in /sys/devices/soc for user mode > usage > diff --git a/arch/arm/mach-tegra/tegra.c b/arch/arm/mach-tegra/tegra.c > static void __init tegra_dt_init(void) > { > + struct device *parent = NULL; > + struct soc_device *soc_dev; > + struct soc_device_attribute *soc_dev_attr; Since Russell asked you to redo the patch anyway, I'd prefer that variables be declared in the order they're used. So, soc_dev_attr, then soc_dev, then parent.
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 2363926..12fa4e5 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -675,6 +675,7 @@ config ARCH_TEGRA select HAVE_CLK select HAVE_SMP select MIGHT_HAVE_CACHE_L2X0 + select SOC_BUS select SPARSE_IRQ select USE_OF help diff --git a/arch/arm/mach-tegra/tegra.c b/arch/arm/mach-tegra/tegra.c index 27232c9..536ed3e 100644 --- a/arch/arm/mach-tegra/tegra.c +++ b/arch/arm/mach-tegra/tegra.c @@ -33,6 +33,8 @@ #include <linux/io.h> #include <linux/i2c.h> #include <linux/i2c-tegra.h> +#include <linux/slab.h> +#include <linux/sys_soc.h> #include <linux/usb/tegra_usb_phy.h> #include <asm/mach-types.h> @@ -42,6 +44,7 @@ #include "board.h" #include "common.h" +#include "fuse.h" #include "iomap.h" static struct tegra_ehci_platform_data tegra_ehci1_pdata = { @@ -80,12 +83,38 @@ static struct of_dev_auxdata tegra20_auxdata_lookup[] __initdata = { static void __init tegra_dt_init(void) { + struct device *parent = NULL; + struct soc_device *soc_dev; + struct soc_device_attribute *soc_dev_attr; + + soc_dev_attr = kzalloc(sizeof(*soc_dev_attr), GFP_KERNEL); + if (!soc_dev_attr) + goto out; + + soc_dev_attr->soc_id = kasprintf(GFP_KERNEL, "%d", tegra_chip_id); + soc_dev_attr->revision = kasprintf(GFP_KERNEL, "%d", tegra_revision); + soc_dev_attr->family = kasprintf(GFP_KERNEL, "Tegra"); + + soc_dev = soc_device_register(soc_dev_attr); + if (IS_ERR(soc_dev)) { + kfree(soc_dev_attr->soc_id); + kfree(soc_dev_attr->revision); + kfree(soc_dev_attr->family); + kfree(soc_dev_attr); + goto out; + } + + parent = soc_device_to_device(soc_dev); + if (IS_ERR(parent)) + parent = NULL; + /* * Finished with the static registrations now; fill in the missing * devices */ +out: of_platform_populate(NULL, of_default_bus_match_table, - tegra20_auxdata_lookup, NULL); + tegra20_auxdata_lookup, parent); } static void __init trimslice_init(void)
Expose Tegra chip ID and revision in /sys/devices/soc for user mode usage Signed-off-by: Danny Huang <dahuang@nvidia.com> --- arch/arm/Kconfig | 1 + arch/arm/mach-tegra/tegra.c | 31 ++++++++++++++++++++++++++++++- 2 files changed, 31 insertions(+), 1 deletion(-)