Commit 88574551 authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik
Browse files

[PATCH] libata: cosmetic updates 



Cosmetic updates in libata-core.c.

* trim trailing whitespaces
* break lines which are over 80 column
* kill unnecessary braces
* make indentation consistent

Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 353dcf7c

drivers/scsi/libata-core.c

+32 −29
Original line number Diff line number Diff line
@@ -781,11 +781,9 @@ void ata_std_dev_select (struct ata_port *ap, unsigned int device) 
void ata_dev_select(struct ata_port *ap, unsigned int device,

			   unsigned int wait, unsigned int can_sleep)

{

	if (ata_msg_probe(ap)) {

	if (ata_msg_probe(ap))

		ata_port_printk(ap, KERN_INFO, "ata_dev_select: ENTER, ata%u: "

				"device %u, wait %u\n",

				ap->id, device, wait);

	}

				"device %u, wait %u\n", ap->id, device, wait);



	if (wait)

		ata_wait_idle(ap);
@@ -954,7 +952,8 @@ void ata_port_flush_task(struct ata_port *ap) 
	 */

	if (!cancel_delayed_work(&ap->port_task)) {

		if (ata_msg_ctl(ap))

			ata_port_printk(ap, KERN_DEBUG, "%s: flush #2\n", __FUNCTION__);

			ata_port_printk(ap, KERN_DEBUG, "%s: flush #2\n",

					__FUNCTION__);

		flush_workqueue(ata_wq);

	}
@@ -1349,7 +1348,8 @@ int ata_dev_configure(struct ata_device *dev, int print_info) 
	int i, rc;



	if (!ata_dev_enabled(dev) && ata_msg_info(ap)) {

		ata_dev_printk(dev, KERN_INFO, "%s: ENTER/EXIT (host %u, dev %u) -- nodev\n",

		ata_dev_printk(dev, KERN_INFO,

			       "%s: ENTER/EXIT (host %u, dev %u) -- nodev\n",

			       __FUNCTION__, ap->id, dev->devno);

		return 0;

	}
@@ -1360,8 +1360,9 @@ int ata_dev_configure(struct ata_device *dev, int print_info) 


	/* print device capabilities */

	if (ata_msg_probe(ap))

		ata_dev_printk(dev, KERN_DEBUG, "%s: cfg 49:%04x 82:%04x 83:%04x "

			       "84:%04x 85:%04x 86:%04x 87:%04x 88:%04x\n",

		ata_dev_printk(dev, KERN_DEBUG,

			       "%s: cfg 49:%04x 82:%04x 83:%04x 84:%04x "

			       "85:%04x 86:%04x 87:%04x 88:%04x\n",

			       __FUNCTION__,

			       id[49], id[82], id[83], id[84],

			       id[85], id[86], id[87], id[88]);
@@ -1433,13 +1434,15 @@ int ata_dev_configure(struct ata_device *dev, int print_info) 
					ata_id_major_version(id),

					ata_mode_string(xfer_mask),

					(unsigned long long)dev->n_sectors,

					dev->cylinders, dev->heads, dev->sectors);

					dev->cylinders, dev->heads,

					dev->sectors);

		}



		if (dev->id[59] & 0x100) {

			dev->multi_count = dev->id[59] & 0xff;

			if (ata_msg_info(ap))

				ata_dev_printk(dev, KERN_INFO, "ata%u: dev %u multi count %u\n",

				ata_dev_printk(dev, KERN_INFO,

					"ata%u: dev %u multi count %u\n",

					ap->id, dev->devno, dev->multi_count);

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE