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

Commit e8b33617 authored by Corey Minyard's avatar Corey Minyard Committed by Linus Torvalds
Browse files

[PATCH] ipmi: style cleanups 



Clean up various style issues in the IPMI driver.  Should be no functional
changes.

Signed-off-by: default avatarCorey Minyard <minyard@acm.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 168524d6

drivers/char/ipmi/ipmi_bt_sm.c

+44 −22
Original line number Diff line number Diff line
@@ -161,7 +161,8 @@ static int bt_start_transaction(struct si_sm_data *bt, 
{

	unsigned int i;



	if ((size < 2) || (size > IPMI_MAX_MSG_LENGTH)) return -1;

	if ((size < 2) || (size > IPMI_MAX_MSG_LENGTH))

	       return -1;



	if ((bt->state != BT_STATE_IDLE) && (bt->state != BT_STATE_HOSED))

		return -2;
@@ -169,7 +170,8 @@ static int bt_start_transaction(struct si_sm_data *bt, 
	if (bt_debug & BT_DEBUG_MSG) {

    		printk(KERN_WARNING "+++++++++++++++++++++++++++++++++++++\n");

		printk(KERN_WARNING "BT: write seq=0x%02X:", bt->seq);

		for (i = 0; i < size; i ++) printk (" %02x", data[i]);

		for (i = 0; i < size; i ++)

		       printk (" %02x", data[i]);

		printk("\n");

	}

	bt->write_data[0] = size + 1;	/* all data plus seq byte */
@@ -208,15 +210,18 @@ static int bt_get_result(struct si_sm_data *bt, 
	} else {

		data[0] = bt->read_data[1];

		data[1] = bt->read_data[3];

		if (length < msg_len) bt->truncated = 1;

		if (length < msg_len)

		       bt->truncated = 1;

		if (bt->truncated) {	/* can be set in read_all_bytes() */

			data[2] = IPMI_ERR_MSG_TRUNCATED;

			msg_len = 3;

		} else memcpy(data + 2, bt->read_data + 4, msg_len - 2);

		} else

		       memcpy(data + 2, bt->read_data + 4, msg_len - 2);



		if (bt_debug & BT_DEBUG_MSG) {

			printk (KERN_WARNING "BT: res (raw)");

			for (i = 0; i < msg_len; i++) printk(" %02x", data[i]);

			for (i = 0; i < msg_len; i++)

			       printk(" %02x", data[i]);

			printk ("\n");

		}

	}
@@ -229,8 +234,10 @@ static int bt_get_result(struct si_sm_data *bt, 


static void reset_flags(struct si_sm_data *bt)

{

	if (BT_STATUS & BT_H_BUSY) BT_CONTROL(BT_H_BUSY);

	if (BT_STATUS & BT_B_BUSY) BT_CONTROL(BT_B_BUSY);

	if (BT_STATUS & BT_H_BUSY)

	       BT_CONTROL(BT_H_BUSY);

	if (BT_STATUS & BT_B_BUSY)

	       BT_CONTROL(BT_B_BUSY);

	BT_CONTROL(BT_CLR_WR_PTR);

	BT_CONTROL(BT_SMS_ATN);

#ifdef DEVELOPMENT_ONLY_NOT_FOR_PRODUCTION
@@ -239,7 +246,8 @@ static void reset_flags(struct si_sm_data *bt) 
		BT_CONTROL(BT_H_BUSY);

		BT_CONTROL(BT_B2H_ATN);

		BT_CONTROL(BT_CLR_RD_PTR);

		for (i = 0; i < IPMI_MAX_MSG_LENGTH + 2; i++) BMC2HOST;

		for (i = 0; i < IPMI_MAX_MSG_LENGTH + 2; i++)

		       BMC2HOST;

		BT_CONTROL(BT_H_BUSY);

	}

#endif
@@ -256,7 +264,8 @@ static inline void write_all_bytes(struct si_sm_data *bt) 
			printk (" %02x", bt->write_data[i]);

		printk ("\n");

	}

	for (i = 0; i < bt->write_count; i++) HOST2BMC(bt->write_data[i]);

	for (i = 0; i < bt->write_count; i++)

	       HOST2BMC(bt->write_data[i]);

}



static inline int read_all_bytes(struct si_sm_data *bt)
@@ -276,7 +285,8 @@ static inline int read_all_bytes(struct si_sm_data *bt) 
		bt->truncated = 1;

		return 1;	/* let next XACTION START clean it up */

	}

	for (i = 1; i <= bt->read_count; i++) bt->read_data[i] = BMC2HOST;

	for (i = 1; i <= bt->read_count; i++)

	       bt->read_data[i] = BMC2HOST;

	bt->read_count++;	/* account for the length byte */



	if (bt_debug & BT_DEBUG_MSG) {
@@ -293,7 +303,8 @@ static inline int read_all_bytes(struct si_sm_data *bt) 
        	((bt->read_data[1] & 0xF8) == (bt->write_data[1] & 0xF8)))

			return 1;



	if (bt_debug & BT_DEBUG_MSG) printk(KERN_WARNING "BT: bad packet: "

	if (bt_debug & BT_DEBUG_MSG)

	       printk(KERN_WARNING "BT: bad packet: "

		"want 0x(%02X, %02X, %02X) got (%02X, %02X, %02X)\n",

		bt->write_data[1], bt->write_data[2], bt->write_data[3],

		bt->read_data[1],  bt->read_data[2],  bt->read_data[3]);
@@ -357,7 +368,8 @@ static enum si_sm_result bt_event(struct si_sm_data *bt, long time) 
			time);

	bt->last_state = bt->state;



	if (bt->state == BT_STATE_HOSED) return SI_SM_HOSED;

	if (bt->state == BT_STATE_HOSED)

	       return SI_SM_HOSED;



	if (bt->state != BT_STATE_IDLE) {	/* do timeout test */
@@ -369,7 +381,8 @@ static enum si_sm_result bt_event(struct si_sm_data *bt, long time) 
    	/* FIXME: bt_event is sometimes called with time > BT_NORMAL_TIMEOUT

              (noticed in ipmi_smic_sm.c January 2004) */



		if ((time <= 0) || (time >= BT_NORMAL_TIMEOUT)) time = 100;

		if ((time <= 0) || (time >= BT_NORMAL_TIMEOUT))

		       time = 100;

		bt->timeout -= time;

		if ((bt->timeout < 0) && (bt->state < BT_STATE_RESET1)) {

			error_recovery(bt, "timed out");
@@ -391,12 +404,14 @@ static enum si_sm_result bt_event(struct si_sm_data *bt, long time) 
			BT_CONTROL(BT_H_BUSY);

			break;

		}

    		if (status & BT_B2H_ATN) break;

    		if (status & BT_B2H_ATN)

		       break;

		bt->state = BT_STATE_WRITE_BYTES;

		return SI_SM_CALL_WITHOUT_DELAY;	/* for logging */



	case BT_STATE_WRITE_BYTES:

		if (status & (BT_B_BUSY | BT_H2B_ATN)) break;

		if (status & (BT_B_BUSY | BT_H2B_ATN))

		       break;

		BT_CONTROL(BT_CLR_WR_PTR);

		write_all_bytes(bt);

		BT_CONTROL(BT_H2B_ATN);	/* clears too fast to catch? */
@@ -404,7 +419,8 @@ static enum si_sm_result bt_event(struct si_sm_data *bt, long time) 
		return SI_SM_CALL_WITHOUT_DELAY; /* it MIGHT sail through */



	case BT_STATE_WRITE_CONSUME: /* BMCs usually blow right thru here */

        	if (status & (BT_H2B_ATN | BT_B_BUSY)) break;

        	if (status & (BT_H2B_ATN | BT_B_BUSY))

		       break;

		bt->state = BT_STATE_B2H_WAIT;

		/* fall through with status */
@@ -413,15 +429,18 @@ static enum si_sm_result bt_event(struct si_sm_data *bt, long time) 
	   generation of B2H_ATN so ALWAYS return CALL_WITH_DELAY. */



	case BT_STATE_B2H_WAIT:

    		if (!(status & BT_B2H_ATN)) break;

    		if (!(status & BT_B2H_ATN))

		       break;



		/* Assume ordered, uncached writes: no need to wait */

		if (!(status & BT_H_BUSY)) BT_CONTROL(BT_H_BUSY); /* set */

		if (!(status & BT_H_BUSY))

		       BT_CONTROL(BT_H_BUSY); /* set */

		BT_CONTROL(BT_B2H_ATN);		/* clear it, ACK to the BMC */

		BT_CONTROL(BT_CLR_RD_PTR);	/* reset the queue */

		i = read_all_bytes(bt);

		BT_CONTROL(BT_H_BUSY);		/* clear */

		if (!i) break;			/* Try this state again */

		if (!i)				/* Try this state again */

		       break;

		bt->state = BT_STATE_READ_END;

		return SI_SM_CALL_WITHOUT_DELAY;	/* for logging */
@@ -434,7 +453,8 @@ static enum si_sm_result bt_event(struct si_sm_data *bt, long time) 


#ifdef MAKE_THIS_TRUE_IF_NECESSARY



		if (status & BT_H_BUSY) break;

		if (status & BT_H_BUSY)

		       break;

#endif

		bt->seq++;

		bt->state = BT_STATE_IDLE;
@@ -457,7 +477,8 @@ static enum si_sm_result bt_event(struct si_sm_data *bt, long time) 
		break;



	case BT_STATE_RESET3:

		if (bt->timeout > 0) return SI_SM_CALL_WITH_DELAY;

		if (bt->timeout > 0)

		       return SI_SM_CALL_WITH_DELAY;

		bt->state = BT_STATE_RESTART;	/* printk in debug modes */

		break;
@@ -483,7 +504,8 @@ static int bt_detect(struct si_sm_data *bt) 
	   but that's what you get from reading a bogus address, so we

	   test that first.  The calling routine uses negative logic. */



	if ((BT_STATUS == 0xFF) && (BT_INTMASK_R == 0xFF)) return 1;

	if ((BT_STATUS == 0xFF) && (BT_INTMASK_R == 0xFF))

	       return 1;

	reset_flags(bt);

	return 0;

}

drivers/char/ipmi/ipmi_si_intf.c

+69 −72
Original line number Diff line number Diff line
@@ -1814,14 +1814,14 @@ static int find_pci_smic(int intf_num, struct smi_info **new_info) 


	pci_smic_checked = 1;



	if ((pci_dev = pci_get_device(PCI_HP_VENDOR_ID, PCI_MMC_DEVICE_ID,

				       NULL)))

		;

	else if ((pci_dev = pci_get_class(PCI_ERMC_CLASSCODE, NULL)) &&

		 pci_dev->subsystem_vendor == PCI_HP_VENDOR_ID)

	pci_dev = pci_get_device(PCI_HP_VENDOR_ID, PCI_MMC_DEVICE_ID, NULL);

	if (! pci_dev) {

		pci_dev = pci_get_class(PCI_ERMC_CLASSCODE, NULL);

		if (pci_dev && (pci_dev->subsystem_vendor == PCI_HP_VENDOR_ID))

			fe_rmc = 1;

		else

			return -ENODEV;

	}



	error = pci_read_config_word(pci_dev, PCI_MMC_ADDR_CW, &base_addr);

	if (error)
@@ -2024,8 +2024,8 @@ static int stat_file_read_proc(char *page, char **start, off_t off, 
 */

static int oem_data_avail_to_receive_msg_avail(struct smi_info *smi_info)

{

	smi_info->msg_flags = (smi_info->msg_flags & ~OEM_DATA_AVAIL) |

		RECEIVE_MSG_AVAIL;

	smi_info->msg_flags = ((smi_info->msg_flags & ~OEM_DATA_AVAIL) |

			      	RECEIVE_MSG_AVAIL);

	return 1;

}
@@ -2059,10 +2059,11 @@ static void setup_dell_poweredge_oem_data_handler(struct smi_info *smi_info) 
{

	struct ipmi_device_id *id = &smi_info->device_id;

	const char mfr[3]=DELL_IANA_MFR_ID;

	if (!memcmp(mfr, id->manufacturer_id, sizeof(mfr)) &&

	    id->device_id       == DELL_POWEREDGE_8G_BMC_DEVICE_ID &&

	    id->device_revision == DELL_POWEREDGE_8G_BMC_DEVICE_REV &&

	    id->ipmi_version    == DELL_POWEREDGE_8G_BMC_IPMI_VERSION) {

	if (! memcmp(mfr, id->manufacturer_id, sizeof(mfr))

	    && (id->device_id       == DELL_POWEREDGE_8G_BMC_DEVICE_ID)

	    && (id->device_revision == DELL_POWEREDGE_8G_BMC_DEVICE_REV)

	    && (id->ipmi_version    == DELL_POWEREDGE_8G_BMC_IPMI_VERSION))

	{

		smi_info->oem_data_avail_handler =

			oem_data_avail_to_receive_msg_avail;

	}
@@ -2092,19 +2093,15 @@ static int init_one_smi(int intf_num, struct smi_info **smi) 
	if (rv)

		rv = try_init_port(intf_num, &new_smi);

#ifdef CONFIG_ACPI_INTERPRETER

	if ((rv) && (si_trydefaults)) {

	if (rv && si_trydefaults)

		rv = try_init_acpi(intf_num, &new_smi);

	}

#endif

#ifdef CONFIG_X86

	if ((rv) && (si_trydefaults)) {

	if (rv && si_trydefaults)

		rv = try_init_smbios(intf_num, &new_smi);

        }

#endif

	if ((rv) && (si_trydefaults)) {

	if (rv && si_trydefaults)

		rv = try_init_plug_and_play(intf_num, &new_smi);

	}





	if (rv)

		return rv;
@@ -2386,7 +2383,7 @@ static void __exit cleanup_one_si(struct smi_info *to_clean) 


	/* Interrupts and timeouts are stopped, now make sure the

	   interface is in a clean state. */

	while ((to_clean->curr_msg) || (to_clean->si_state != SI_NORMAL)) {

	while (to_clean->curr_msg || (to_clean->si_state != SI_NORMAL)) {

		poll(to_clean);

		set_current_state(TASK_UNINTERRUPTIBLE);

		schedule_timeout(1);

drivers/char/ipmi/ipmi_watchdog.c

+9 −10
Original line number Diff line number Diff line
@@ -657,8 +657,7 @@ static ssize_t ipmi_read(struct file *file, 


static int ipmi_open(struct inode *ino, struct file *filep)

{

        switch (iminor(ino))

        {

        switch (iminor(ino)) {

        case WATCHDOG_MINOR:

		if (test_and_set_bit(0, &ipmi_wdog_open))

                        return -EBUSY;

drivers/char/ipmi/ipmi_msghandler.c

+23 −23

File changed.

Contains only whitespace changes.

drivers/char/ipmi/ipmi_poweroff.c

+1 −1

File changed.

Contains only whitespace changes.