MIPS: Octeon: Move code to avoid forward declaration (653e0528) · Commits · 戴 / test

arch/mips/cavium-octeon/executive/octeon-model.c

+19 −19

Original line number	Diff line number	Diff line
		@@ -47,25 +47,6 @@ uint8_t cvmx_fuse_read_byte(int byte_addr)
		return read_cmd.s.dat;
		}

		/**
		* Given the chip processor ID from COP0, this function returns a
		* string representing the chip model number. The string is of the
		* form CNXXXXpX.X-FREQ-SUFFIX.
		* - XXXX = The chip model number
		* - X.X = Chip pass number
		* - FREQ = Current frequency in Mhz
		* - SUFFIX = NSP, EXP, SCP, SSP, or CP
		*
		* @chip_id: Chip ID
		*
		* Returns Model string
		*/
		const char *octeon_model_get_string(uint32_t chip_id)
		{
		static char buffer[32];
		return octeon_model_get_string_buffer(chip_id, buffer);
		}

		/*
		* Version of octeon_model_get_string() that takes buffer as argument,
		* as running early in u-boot static/global variables don't work when
		@@ -427,3 +408,22 @@ const char octeon_model_get_string_buffer(uint32_t chip_id, char buffer)
		sprintf(buffer, "CN%s%sp%s-%d-%s", family, core_model, pass, clock_mhz, suffix);
		return buffer;
		}

		/**
		* Given the chip processor ID from COP0, this function returns a
		* string representing the chip model number. The string is of the
		* form CNXXXXpX.X-FREQ-SUFFIX.
		* - XXXX = The chip model number
		* - X.X = Chip pass number
		* - FREQ = Current frequency in Mhz
		* - SUFFIX = NSP, EXP, SCP, SSP, or CP
		*
		* @chip_id: Chip ID
		*
		* Returns Model string
		*/
		const char *octeon_model_get_string(uint32_t chip_id)
		{
		static char buffer[32];
		return octeon_model_get_string_buffer(chip_id, buffer);
		}