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

Commit 62afe5d7 authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Jeff Garzik
Browse files

libata: use ATA_ID_CFA_* 



Use ATA_ID_CFA_* constants for CFA specific identify data words 162 and 163.

Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 20cbf5f8

drivers/ata/libata-core.c

+4 −3
Original line number Diff line number Diff line
@@ -1656,8 +1656,8 @@ unsigned long ata_id_xfermask(const u16 *id) 
		/*

		 *	Process compact flash extended modes

		 */

		int pio = id[163] & 0x7;

		int dma = (id[163] >> 3) & 7;

		int pio = (id[ATA_ID_CFA_MODES] >> 0) & 0x7;

		int dma = (id[ATA_ID_CFA_MODES] >> 3) & 0x7;



		if (pio)

			pio_mask |= (1 << 5);
@@ -2426,7 +2426,8 @@ int ata_dev_configure(struct ata_device *dev) 
	/* ATA-specific feature tests */

	if (dev->class == ATA_DEV_ATA) {

		if (ata_id_is_cfa(id)) {

			if (id[162] & 1) /* CPRM may make this media unusable */

			/* CPRM may make this media unusable */

			if (id[ATA_ID_CFA_KEY_MGMT] & 1)

				ata_dev_printk(dev, KERN_WARNING,

					       "supports DRM functions and may "

					       "not be fully accessable.\n");