Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 651ec4b4 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "of: move kobj_to_device_node() into dynamic.c"

parents 7c003d0c 1b21d320

arch/arm/configs/msm8953-batcam-perf_defconfig

+1 −7
Original line number Original line Diff line number Diff line
@@ -141,11 +141,6 @@ CONFIG_MEDIA_CONTROLLER=y 
CONFIG_VIDEO_V4L2_SUBDEV_API=y

CONFIG_VIDEO_V4L2_SUBDEV_API=y

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_FB=y

CONFIG_FB=y

CONFIG_FB_MSM=y

CONFIG_FB_MSM_MDSS=y

CONFIG_FB_MSM_MDSS_WRITEBACK=y

CONFIG_FB_MSM_MDSS_DSI_CTRL_STATUS=y

CONFIG_FB_MSM_MDSS_XLOG_DEBUG=y

CONFIG_SOUND=y

CONFIG_SOUND=y

CONFIG_SND=y

CONFIG_SND=y

CONFIG_SND_DYNAMIC_MINORS=y

CONFIG_SND_DYNAMIC_MINORS=y
@@ -177,6 +172,7 @@ CONFIG_RTC_CLASS=y 
CONFIG_RTC_DRV_QPNP=y

CONFIG_RTC_DRV_QPNP=y

CONFIG_DMADEVICES=y

CONFIG_DMADEVICES=y

CONFIG_QCOM_SPS_DMA=y

CONFIG_QCOM_SPS_DMA=y

CONFIG_SYNC_FILE=y

CONFIG_UIO=y

CONFIG_UIO=y

CONFIG_UIO_MSM_SHAREDMEM=y

CONFIG_UIO_MSM_SHAREDMEM=y

CONFIG_STAGING=y

CONFIG_STAGING=y
@@ -190,7 +186,6 @@ CONFIG_SPS=y 
CONFIG_SPS_SUPPORT_NDP_BAM=y

CONFIG_SPS_SUPPORT_NDP_BAM=y

CONFIG_QPNP_COINCELL=y

CONFIG_QPNP_COINCELL=y

CONFIG_QPNP_REVID=y

CONFIG_QPNP_REVID=y

CONFIG_MSM_MDSS_PLL=y

CONFIG_REMOTE_SPINLOCK_MSM=y

CONFIG_REMOTE_SPINLOCK_MSM=y

CONFIG_MAILBOX=y

CONFIG_MAILBOX=y

CONFIG_ARM_SMMU=y

CONFIG_ARM_SMMU=y
@@ -213,7 +208,6 @@ CONFIG_MSM_SMP2P=y 
CONFIG_MSM_SUBSYSTEM_RESTART=y

CONFIG_MSM_SUBSYSTEM_RESTART=y

CONFIG_MSM_PIL=y

CONFIG_MSM_PIL=y

CONFIG_MSM_PIL_SSR_GENERIC=y

CONFIG_MSM_PIL_SSR_GENERIC=y

CONFIG_MSM_PIL_MSS_QDSP6V5=y

CONFIG_ICNSS=y

CONFIG_ICNSS=y

CONFIG_MSM_PERFORMANCE=y

CONFIG_MSM_PERFORMANCE=y

CONFIG_MSM_EVENT_TIMER=y

CONFIG_MSM_EVENT_TIMER=y

arch/arm/configs/msm8953-batcam_defconfig

+1 −7
Original line number Original line Diff line number Diff line
@@ -142,11 +142,6 @@ CONFIG_MEDIA_CONTROLLER=y 
CONFIG_VIDEO_V4L2_SUBDEV_API=y

CONFIG_VIDEO_V4L2_SUBDEV_API=y

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_FB=y

CONFIG_FB=y

CONFIG_FB_MSM=y

CONFIG_FB_MSM_MDSS=y

CONFIG_FB_MSM_MDSS_WRITEBACK=y

CONFIG_FB_MSM_MDSS_DSI_CTRL_STATUS=y

CONFIG_FB_MSM_MDSS_XLOG_DEBUG=y

CONFIG_SOUND=y

CONFIG_SOUND=y

CONFIG_SND=y

CONFIG_SND=y

CONFIG_SND_DYNAMIC_MINORS=y

CONFIG_SND_DYNAMIC_MINORS=y
@@ -178,6 +173,7 @@ CONFIG_RTC_CLASS=y 
CONFIG_RTC_DRV_QPNP=y

CONFIG_RTC_DRV_QPNP=y

CONFIG_DMADEVICES=y

CONFIG_DMADEVICES=y

CONFIG_QCOM_SPS_DMA=y

CONFIG_QCOM_SPS_DMA=y

CONFIG_SYNC_FILE=y

CONFIG_UIO=y

CONFIG_UIO=y

CONFIG_UIO_MSM_SHAREDMEM=y

CONFIG_UIO_MSM_SHAREDMEM=y

CONFIG_STAGING=y

CONFIG_STAGING=y
@@ -191,7 +187,6 @@ CONFIG_SPS=y 
CONFIG_SPS_SUPPORT_NDP_BAM=y

CONFIG_SPS_SUPPORT_NDP_BAM=y

CONFIG_QPNP_COINCELL=y

CONFIG_QPNP_COINCELL=y

CONFIG_QPNP_REVID=y

CONFIG_QPNP_REVID=y

CONFIG_MSM_MDSS_PLL=y

CONFIG_REMOTE_SPINLOCK_MSM=y

CONFIG_REMOTE_SPINLOCK_MSM=y

CONFIG_MAILBOX=y

CONFIG_MAILBOX=y

CONFIG_ARM_SMMU=y

CONFIG_ARM_SMMU=y
@@ -214,7 +209,6 @@ CONFIG_MSM_SMP2P=y 
CONFIG_MSM_SUBSYSTEM_RESTART=y

CONFIG_MSM_SUBSYSTEM_RESTART=y

CONFIG_MSM_PIL=y

CONFIG_MSM_PIL=y

CONFIG_MSM_PIL_SSR_GENERIC=y

CONFIG_MSM_PIL_SSR_GENERIC=y

CONFIG_MSM_PIL_MSS_QDSP6V5=y

CONFIG_ICNSS=y

CONFIG_ICNSS=y

CONFIG_MSM_PERFORMANCE=y

CONFIG_MSM_PERFORMANCE=y

CONFIG_MSM_EVENT_TIMER=y

CONFIG_MSM_EVENT_TIMER=y

drivers/of/dynamic.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -16,6 +16,11 @@ 




#include "of_private.h"

#include "of_private.h"





static struct device_node *kobj_to_device_node(struct kobject *kobj)

{

	return container_of(kobj, struct device_node, kobj);

}



/**

/**

 * of_node_get() - Increment refcount of a node

 * of_node_get() - Increment refcount of a node

 * @node:	Node to inc refcount, NULL is supported to simplify writing of

 * @node:	Node to inc refcount, NULL is supported to simplify writing of

drivers/of/of_private.h

+0 −6
Original line number Original line Diff line number Diff line
@@ -35,12 +35,6 @@ extern struct mutex of_mutex; 
extern struct list_head aliases_lookup;

extern struct list_head aliases_lookup;

extern struct kset *of_kset;

extern struct kset *of_kset;







static inline struct device_node *kobj_to_device_node(struct kobject *kobj)

{

	return container_of(kobj, struct device_node, kobj);

}



#if defined(CONFIG_OF_DYNAMIC)

#if defined(CONFIG_OF_DYNAMIC)

extern int of_property_notify(int action, struct device_node *np,

extern int of_property_notify(int action, struct device_node *np,

			      struct property *prop, struct property *old_prop);

			      struct property *prop, struct property *old_prop);