[POWERPC] celleb: Coding style cleanup (2fe37a6e) · Commits · 戴 / test

arch/powerpc/platforms/celleb/beat.c

+7 −10

Original line number	Diff line number	Diff line
		@@ -48,6 +48,7 @@ void beat_power_off(void)
		}

		u64 beat_halt_code = 0x1000000000000000UL;
		EXPORT_SYMBOL(beat_halt_code);

		void beat_halt(void)
		{
		@@ -94,9 +95,8 @@ ssize_t beat_nvram_read(char buf, size_t count, loff_t index)
		len = count;
		if (len > BEAT_NVRW_CNT)
		len = BEAT_NVRW_CNT;
		if (beat_eeprom_read(i, len, p)) {
		if (beat_eeprom_read(i, len, p))
		return -EIO;
		}

		p += len;
		i += len;
		@@ -121,9 +121,8 @@ ssize_t beat_nvram_write(char buf, size_t count, loff_t index)
		len = count;
		if (len > BEAT_NVRW_CNT)
		len = BEAT_NVRW_CNT;
		if (beat_eeprom_write(i, len, p)) {
		if (beat_eeprom_write(i, len, p))
		return -EIO;
		}

		p += len;
		i += len;
		@@ -156,6 +155,7 @@ int64_t beat_get_term_char(u64 vterm, u64 len, u64 t1, u64 *t2)
		}
		return ret;
		}
		EXPORT_SYMBOL(beat_get_term_char);

		int64_t beat_put_term_char(u64 vterm, u64 len, u64 t1, u64 t2)
		{
		@@ -165,6 +165,7 @@ int64_t beat_put_term_char(u64 vterm, u64 len, u64 t1, u64 t2)
		db[1] = t2;
		return beat_put_characters_to_console(vterm, len, (u8 *)db);
		}
		EXPORT_SYMBOL(beat_put_term_char);

		void beat_power_save(void)
		{
		@@ -261,7 +262,3 @@ static int __init beat_event_init(void)
		}

		device_initcall(beat_event_init);

		EXPORT_SYMBOL(beat_get_term_char);
		EXPORT_SYMBOL(beat_put_term_char);
		EXPORT_SYMBOL(beat_halt_code);

+2 −1

Original line number	Diff line number	Diff line
		@@ -197,7 +197,8 @@ static inline s64 beat_put_characters_to_console(u64 termno, u64 len,
		u64 b[2];

		memcpy(b, buffer, len);
		return beat_hcall_norets(HV_put_characters_to_console, termno, len, b[0], b[1]);
		return beat_hcall_norets(HV_put_characters_to_console, termno, len,
		b[0], b[1]);
		}

		static inline s64 beat_get_spe_privileged_state_1_registers(

+4 −3

Original line number	Diff line number	Diff line
		@@ -116,7 +116,8 @@ static long beat_lpar_hpte_insert(unsigned long hpte_group,
		hpte_r &= ~_PAGE_COHERENT;

		spin_lock(&beat_htab_lock);
		if ((lpar_rc = beat_read_mask(hpte_group)) == 0) {
		lpar_rc = beat_read_mask(hpte_group);
		if (lpar_rc == 0) {
		if (!(vflags & HPTE_V_BOLTED))
		DBG_LOW(" full\n");
		spin_unlock(&beat_htab_lock);

+14 −12

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@ static DEFINE_SPINLOCK(beatic_irq_mask_lock);
		static uint64_t beatic_irq_mask_enable[(MAX_IRQS+255)/64];
		static uint64_t beatic_irq_mask_ack[(MAX_IRQS+255)/64];

		static struct irq_host *beatic_host = NULL;
		static struct irq_host *beatic_host;

		/*
		* In this implementation, "virq" == "IRQ plug number",
		@@ -96,7 +96,8 @@ static void beatic_end_irq(unsigned int irq_plug)
		s64 err;
		unsigned long flags;

		if ((err = beat_downcount_of_interrupt(irq_plug)) != 0) {
		err = beat_downcount_of_interrupt(irq_plug);
		if (err != 0) {
		if ((err & 0xFFFFFFFF) != 0xFFFFFFF5) /* -11: wrong state */
		panic("Failed to downcount IRQ! Error = %16lx", err);

		@@ -138,7 +139,8 @@ static int beatic_pic_host_map(struct irq_host *h, unsigned int virq,
		struct irq_desc *desc = get_irq_desc(virq);
		int64_t err;

		if ((err = beat_construct_and_connect_irq_plug(virq, hw)) < 0)
		err = beat_construct_and_connect_irq_plug(virq, hw);
		if (err < 0)
		return -EIO;

		desc->status \|= IRQ_LEVEL;

+2 −2

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@

		/* sio irq0=0xb00010022 irq0=0xb00010023 irq2=0xb00010024
		mmio=0xfff000-0x1000,0xff2000-0x1000 */
		static int txx9_serial_bitmap __initdata = 0;
		static int txx9_serial_bitmap __initdata;

		static struct {
		uint32_t offset;