Index: uspace/drv/ns8250/ns8250.c
===================================================================
--- uspace/drv/ns8250/ns8250.c	(revision 667eac45adb7e050c43596b1f6c9786d689d0606)
+++ uspace/drv/ns8250/ns8250.c	(revision 33dbbd26f31453739b9eebe8e84a71c708bb110f)
@@ -123,5 +123,5 @@
 static void delete_ns8250_dev_data(ns8250_dev_data_t *data)
 {
-	if (NULL != data)
+	if (data != NULL)
 		free(data);
 }
@@ -251,5 +251,5 @@
 static void ns8250_dev_cleanup(device_t *dev)
 {
-	if (NULL != dev->driver_data) {
+	if (dev->driver_data != NULL) {
 		delete_ns8250_dev_data((ns8250_dev_data_t*) dev->driver_data);
 		dev->driver_data = NULL;
@@ -332,5 +332,5 @@
 	/* Allocate driver data for the device. */
 	ns8250_dev_data_t *data = create_ns8250_dev_data();
-	if (NULL == data)
+	if (data == NULL)
 		return ENOMEM;
 	dev->driver_data = data;
@@ -436,5 +436,5 @@
 	/* Enable interrupt globally. */
 	res = interrupt_enable(data->irq);
-	if (EOK != res)
+	if (res != EOK)
 		return res;
 	
@@ -480,5 +480,5 @@
 	uint8_t div_low, div_high;
 	
-	if (50 > baud_rate || 0 != MAX_BAUD_RATE % baud_rate) {
+	if (baud_rate < 50 || MAX_BAUD_RATE % baud_rate != 0) {
 		printf(NAME ": error - somebody tried to set invalid baud rate "
 		    "%d\n", baud_rate);
@@ -534,6 +534,5 @@
  * @param stop_bits	The number of stop bits used (one or two).
  */
-static void
-ns8250_port_get_com_props(ioport8_t *port, unsigned int *parity,
+static void ns8250_port_get_com_props(ioport8_t *port, unsigned int *parity,
     unsigned int *word_length, unsigned int *stop_bits)
 {
@@ -572,6 +571,5 @@
  *			is invalid.
  */
-static int
-ns8250_port_set_com_props(ioport8_t *port, unsigned int parity,
+static int ns8250_port_set_com_props(ioport8_t *port, unsigned int parity,
     unsigned int word_length, unsigned int stop_bits)
 {
@@ -691,6 +689,6 @@
  * @param dev		The serial port device.
  */
-static inline void
-ns8250_interrupt_handler(device_t *dev, ipc_callid_t iid, ipc_call_t *icall)
+static inline void ns8250_interrupt_handler(device_t *dev, ipc_callid_t iid,
+    ipc_call_t *icall)
 {
 	ns8250_read_from_device(dev);
@@ -726,5 +724,5 @@
  * @param dev		The serial port device.
  */
-static int ns8250_add_device(device_t *dev) 
+static int ns8250_add_device(device_t *dev)
 {
 	printf(NAME ": ns8250_add_device %s (handle = %d)\n",
@@ -732,5 +730,5 @@
 	
 	int res = ns8250_dev_initialize(dev);
-	if (EOK != res)
+	if (res != EOK)
 		return res;
 	
@@ -750,5 +748,5 @@
 	
 	/* Register interrupt handler. */
-	if (EOK != ns8250_register_interrupt_handler(dev)) {
+	if (ns8250_register_interrupt_handler(dev) != EOK) {
 		printf(NAME ": failed to register interrupt handler.\n");
 		ns8250_dev_cleanup(dev);
@@ -758,5 +756,5 @@
 	/* Enable interrupt. */
 	res = ns8250_interrupt_enable(dev);
-	if (EOK != res) {
+	if (res != EOK) {
 		printf(NAME ": failed to enable the interrupt. Error code = "
 		    "%d.\n", res);
@@ -859,7 +857,6 @@
  * @param stop_bits	The number of stop bits to be used.
  */
-static int
-ns8250_set_props(device_t *dev, unsigned int baud_rate, unsigned int parity,
-    unsigned int word_length, unsigned int stop_bits)
+static int ns8250_set_props(device_t *dev, unsigned int baud_rate,
+    unsigned int parity, unsigned int word_length, unsigned int stop_bits)
 {
 	printf(NAME ": ns8250_set_props: baud rate %d, parity 0x%x, word "
@@ -874,5 +871,5 @@
 	ns8250_port_interrupts_disable(port);
 	ret = ns8250_port_set_baud_rate(port, baud_rate);
-	if (EOK == ret)
+	if (ret == EOK)
 		ret = ns8250_port_set_com_props(port, parity, word_length, stop_bits);
 	ns8250_port_interrupts_enable(port);
@@ -887,6 +884,6 @@
  * Configure the parameters of the serial communication.
  */
-static void
-ns8250_default_handler(device_t *dev, ipc_callid_t callid, ipc_call_t *call)
+static void ns8250_default_handler(device_t *dev, ipc_callid_t callid,
+    ipc_call_t *call)
 {
 	ipcarg_t method = IPC_GET_METHOD(*call);