[PATCH] powerpc: make iSeries flat device tree stuff static (29629b29) · Commits · e / devices / android_kernel_xiaomi_markw

arch/powerpc/platforms/iseries/setup.c

+22 −18

Original line number	Diff line number	Diff line
		@@ -723,9 +723,9 @@ struct iseries_flat_dt {
		struct blob strings;
		};

		struct iseries_flat_dt iseries_dt;
		static struct iseries_flat_dt iseries_dt;

		void dt_init(struct iseries_flat_dt *dt)
		static void dt_init(struct iseries_flat_dt *dt)
		{
		dt->header.off_mem_rsvmap =
		offsetof(struct iseries_flat_dt, reserve_map);
		@@ -748,7 +748,7 @@ void dt_init(struct iseries_flat_dt *dt)
		dt->reserve_map[1] = 0;
		}

		void dt_check_blob(struct blob *b)
		static void dt_check_blob(struct blob *b)
		{
		if (b->next >= (unsigned long)&b->next) {
		DBG("Ran out of space in flat device tree blob!\n");
		@@ -756,7 +756,7 @@ void dt_check_blob(struct blob *b)
		}
		}

		void dt_push_u32(struct iseries_flat_dt *dt, u32 value)
		static void dt_push_u32(struct iseries_flat_dt *dt, u32 value)
		{
		((u32)dt->dt.next) = value;
		dt->dt.next += sizeof(u32);
		@@ -764,15 +764,17 @@ void dt_push_u32(struct iseries_flat_dt *dt, u32 value)
		dt_check_blob(&dt->dt);
		}

		void dt_push_u64(struct iseries_flat_dt *dt, u64 value)
		#ifdef notyet
		static void dt_push_u64(struct iseries_flat_dt *dt, u64 value)
		{
		((u64)dt->dt.next) = value;
		dt->dt.next += sizeof(u64);

		dt_check_blob(&dt->dt);
		}
		#endif

		unsigned long dt_push_bytes(struct blob blob, char data, int len)
		static unsigned long dt_push_bytes(struct blob blob, char data, int len)
		{
		unsigned long start = blob->next - (unsigned long)blob->data;

		@@ -784,7 +786,7 @@ unsigned long dt_push_bytes(struct blob blob, char data, int len)
		return start;
		}

		void dt_start_node(struct iseries_flat_dt dt, char name)
		static void dt_start_node(struct iseries_flat_dt dt, char name)
		{
		dt_push_u32(dt, OF_DT_BEGIN_NODE);
		dt_push_bytes(&dt->dt, name, strlen(name) + 1);
		@@ -792,7 +794,7 @@ void dt_start_node(struct iseries_flat_dt dt, char name)

		#define dt_end_node(dt) dt_push_u32(dt, OF_DT_END_NODE)

		void dt_prop(struct iseries_flat_dt dt, char name, char *data, int len)
		static void dt_prop(struct iseries_flat_dt dt, char name, char *data, int len)
		{
		unsigned long offset;

		@@ -811,37 +813,39 @@ void dt_prop(struct iseries_flat_dt dt, char name, char *data, int len)
		dt_push_bytes(&dt->dt, data, len);
		}

		void dt_prop_str(struct iseries_flat_dt dt, char name, char *data)
		static void dt_prop_str(struct iseries_flat_dt dt, char name, char *data)
		{
		dt_prop(dt, name, data, strlen(data) + 1); /* + 1 for NULL */
		}

		void dt_prop_u32(struct iseries_flat_dt dt, char name, u32 data)
		static void dt_prop_u32(struct iseries_flat_dt dt, char name, u32 data)
		{
		dt_prop(dt, name, (char *)&data, sizeof(u32));
		}

		void dt_prop_u64(struct iseries_flat_dt dt, char name, u64 data)
		static void dt_prop_u64(struct iseries_flat_dt dt, char name, u64 data)
		{
		dt_prop(dt, name, (char *)&data, sizeof(u64));
		}

		void dt_prop_u64_list(struct iseries_flat_dt dt, char name, u64 *data, int n)
		static void dt_prop_u64_list(struct iseries_flat_dt dt, char name, u64 *data, int n)
		{
		dt_prop(dt, name, (char )data, sizeof(u64) n);
		}

		void dt_prop_u32_list(struct iseries_flat_dt dt, char name, u32 *data, int n)
		static void dt_prop_u32_list(struct iseries_flat_dt dt, char name, u32 *data, int n)
		{
		dt_prop(dt, name, (char )data, sizeof(u32) n);
		}

		void dt_prop_empty(struct iseries_flat_dt dt, char name)
		#ifdef notyet
		static void dt_prop_empty(struct iseries_flat_dt dt, char name)
		{
		dt_prop(dt, name, NULL, 0);
		}
		#endif

		void dt_cpus(struct iseries_flat_dt *dt)
		static void dt_cpus(struct iseries_flat_dt *dt)
		{
		unsigned char buf[32];
		unsigned char *p;
		@@ -895,7 +899,7 @@ void dt_cpus(struct iseries_flat_dt *dt)
		dt_end_node(dt);
		}

		void dt_model(struct iseries_flat_dt *dt)
		static void dt_model(struct iseries_flat_dt *dt)
		{
		char buf[16] = "IBM,";

		@@ -913,7 +917,7 @@ void dt_model(struct iseries_flat_dt *dt)
		dt_prop_str(dt, "compatible", "IBM,iSeries");
		}

		void dt_vdevices(struct iseries_flat_dt *dt)
		static void dt_vdevices(struct iseries_flat_dt *dt)
		{
		u32 reg = 0;
		HvLpIndexMap vlan_map;
		@@ -1203,7 +1207,7 @@ static void dt_pci_devices(struct iseries_flat_dt *dt)
		}
		}

		void build_flat_dt(struct iseries_flat_dt *dt, unsigned long phys_mem_size)
		static void build_flat_dt(struct iseries_flat_dt *dt, unsigned long phys_mem_size)
		{
		u64 tmp[2];