Title: [8514] trunk/drivers/staging/iio/adc/ad7414.c: Task[#5912] Use IRQ flags in i2c_client in ad7414 driver.
Revision
8514
Author
sonicz
Date
2010-03-19 05:01:21 -0400 (Fri, 19 Mar 2010)

Log Message

Task[#5912] Use IRQ flags in i2c_client in ad7414 driver.

Modified Paths

Diff

Modified: trunk/drivers/staging/iio/adc/ad7414.c (8513 => 8514)


--- trunk/drivers/staging/iio/adc/ad7414.c	2010-03-19 08:58:23 UTC (rev 8513)
+++ trunk/drivers/staging/iio/adc/ad7414.c	2010-03-19 09:01:21 UTC (rev 8514)
@@ -436,15 +436,8 @@
 {
 	struct ad7414_chip_info *chip;
 	int ret = 0;
-	unsigned int irq_flags = (unsigned int)client->dev.platform_data;
 	u8 config;
 
-	if (!(irq_flags == IRQF_TRIGGER_HIGH ||
-		irq_flags == IRQF_TRIGGER_LOW)) {
-		dev_err(&client->dev, "Invalid ALART polarity defined.\n");
-		return -EINVAL;
-	}
-
 	chip = kzalloc(sizeof(struct ad7414_chip_info), GFP_KERNEL);
 
 	if (chip == NULL)
@@ -488,7 +481,7 @@
 		ret = iio_register_interrupt_line(client->irq,
 				chip->indio_dev,
 				0,
-				irq_flags,
+				chip->irq_flags,
 				chip->name);
 		if (ret)
 			goto error_unreg_dev;
@@ -507,7 +500,7 @@
 			goto error_unreg_irq;
 		}
 
-		if (irq_flags == IRQF_TRIGGER_HIGH)
+		if (chip->irq_flags & IRQF_TRIGGER_HIGH)
 			ret = ad7414_i2c_write(chip, AD7414_CONFIG,
 				config | AD7414_ALERT_POLARITY);
 		else
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits

Reply via email to