scsi: ufs: Remove select of phy-qcom-ufs from ufs-qcom

[linux-2.6-block.git] / drivers / gpio / gpiolib-acpi.c

diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c
index 7f93954c58ea47f3be84c0955d6887f45fac5c25..48534bda73d39eb90e6ffde1a305e32582f8ef51 100644 (file)
--- a/drivers/gpio/gpiolib-acpi.c
+++ b/drivers/gpio/gpiolib-acpi.c
@@ -217,7 +217,7 @@ static acpi_status acpi_gpiochip_alloc_event(struct acpi_resource *ares,
        if (!handler)
                return AE_OK;
 
-       desc = gpiochip_request_own_desc(chip, pin, "ACPI:Event");
+       desc = gpiochip_request_own_desc(chip, pin, "ACPI:Event", 0);
        if (IS_ERR(desc)) {
                dev_err(chip->parent, "Failed to request GPIO\n");
                return AE_ERROR;
@@ -913,23 +913,15 @@ acpi_gpio_adr_space_handler(u32 function, acpi_physical_address address,
                if (!found) {
                        enum gpiod_flags flags = acpi_gpio_to_gpiod_flags(agpio);
                        const char *label = "ACPI:OpRegion";
-                       int err;
 
-                       desc = gpiochip_request_own_desc(chip, pin, label);
+                       desc = gpiochip_request_own_desc(chip, pin, label,
+                                                        flags);
                        if (IS_ERR(desc)) {
                                status = AE_ERROR;
                                mutex_unlock(&achip->conn_lock);
                                goto out;
                        }
 
-                       err = gpiod_configure_flags(desc, label, 0, flags);
-                       if (err < 0) {
-                               status = AE_NOT_CONFIGURED;
-                               gpiochip_free_own_desc(desc);
-                               mutex_unlock(&achip->conn_lock);
-                               goto out;
-                       }
-
                        conn = kzalloc(sizeof(*conn), GFP_KERNEL);
                        if (!conn) {
                                status = AE_NO_MEMORY;