lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-ID: <20100311180706.4824.39674.stgit@angua> Date: Thu, 11 Mar 2010 11:07:06 -0700 From: Grant Likely <grant.likely@...retlab.ca> To: monstr@...str.eu, gregkh@...e.de, benh@...nel.crashing.org, akpm@...ux-foundation.org, davem@...emloft.net, sfr@...b.auug.org.au, jgarzik@...ox.com, ben-linux@...ff.org, dwmw2@...radead.org, jeremy.kerr@...onical.com, James.Bottomley@...e.de, broonie@...nsource.wolfsonmicro.com, microblaze-uclinux@...e.uq.edu.au, linux-kernel@...r.kernel.org, linuxppc-dev@...abs.org, sparclinux@...r.kernel.org, linux-ide@...r.kernel.org, netdev@...r.kernel.org, linux-i2c@...r.kernel.org, devicetree-discuss@...ts.ozlabs.org, linux-scsi@...r.kernel.org, alsa-devel@...a-project.org Subject: [PATCH 36/37] arch/microblaze: Remove .archdata.of_node and use .of_node in struct device .archdata.of_node is being removed from Microblaze, SPARC and PowerPC because it duplicates the struct device .of_node pointer. This patch also removes .node from struct of_device for the same reason. Signed-off-by: Grant Likely <grant.likely@...retlab.ca> --- arch/microblaze/include/asm/device.h | 8 -------- arch/microblaze/include/asm/of_device.h | 1 - arch/microblaze/kernel/of_device.c | 4 +--- 3 files changed, 1 insertions(+), 12 deletions(-) diff --git a/arch/microblaze/include/asm/device.h b/arch/microblaze/include/asm/device.h index 2370888..8d46822 100644 --- a/arch/microblaze/include/asm/device.h +++ b/arch/microblaze/include/asm/device.h @@ -12,19 +12,11 @@ struct device_node; struct dev_archdata { - /* Optional pointer to an OF device node */ - struct device_node *of_node; }; struct pdev_archdata { }; -static inline void dev_archdata_set_node(struct dev_archdata *ad, - struct device_node *np) -{ - ad->of_node = np; -} - #endif /* _ASM_MICROBLAZE_DEVICE_H */ diff --git a/arch/microblaze/include/asm/of_device.h b/arch/microblaze/include/asm/of_device.h index ba917cf..ab25a40 100644 --- a/arch/microblaze/include/asm/of_device.h +++ b/arch/microblaze/include/asm/of_device.h @@ -21,7 +21,6 @@ * probed using OF properties. */ struct of_device { - struct device_node *node; /* to be obsoleted */ u64 dma_mask; /* DMA mask */ struct device dev; /* Generic device interface */ }; diff --git a/arch/microblaze/kernel/of_device.c b/arch/microblaze/kernel/of_device.c index ae165fc..ac7e6e1 100644 --- a/arch/microblaze/kernel/of_device.c +++ b/arch/microblaze/kernel/of_device.c @@ -49,12 +49,10 @@ struct of_device *of_device_alloc(struct device_node *np, if (!dev) return NULL; - dev->node = of_node_get(np); + dev->dev.of_node = of_node_get(np); dev->dev.dma_mask = &dev->dma_mask; dev->dev.parent = parent; dev->dev.release = of_release_dev; - dev->dev.archdata.of_node = np; /* temporary; remove after merging */ - dev->dev.of_node = np; if (bus_id) dev_set_name(&dev->dev, bus_id); -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists