From: Akash Choudhari Date: Sat, 2 Apr 2016 03:10:01 +0000 (-0700) Subject: greybus: Revert "Added a sysfs entry to power down the SVC" X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f053f44c9f7f85dd2bab589930d5f3171bb1eaf7;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git greybus: Revert "Added a sysfs entry to power down the SVC" This reverts commit a1d8f2c3856804ed26157104bb203edf4c882a6c. --- diff --git a/drivers/staging/greybus/greybus_protocols.h b/drivers/staging/greybus/greybus_protocols.h index a160e73a76a9..06888e029473 100644 --- a/drivers/staging/greybus/greybus_protocols.h +++ b/drivers/staging/greybus/greybus_protocols.h @@ -798,7 +798,6 @@ struct gb_spi_transfer_response { #define GB_SVC_TYPE_INTF_EJECT 0x11 #define GB_SVC_TYPE_KEY_EVENT 0x12 #define GB_SVC_TYPE_PING 0x13 -#define GB_SVC_TYPE_PWR_DOWN 0x1d /* * SVC version request/response has the same payload as diff --git a/drivers/staging/greybus/svc.c b/drivers/staging/greybus/svc.c index f96c645558be..a19e575de029 100644 --- a/drivers/staging/greybus/svc.c +++ b/drivers/staging/greybus/svc.c @@ -99,31 +99,11 @@ static ssize_t watchdog_store(struct device *dev, } static DEVICE_ATTR_RW(watchdog); -static ssize_t pwr_off_store(struct device *dev, - struct device_attribute *attr, const char *buf, - size_t len) -{ - struct gb_svc *svc = to_gb_svc(dev); - int retval; - bool user_request; - - retval = strtobool(buf, &user_request); - if (retval) { - return retval; - } - if (user_request) { - retval = gb_svc_pwr_off(svc); - } - return len; -} -static DEVICE_ATTR_WO(pwr_off); - static struct attribute *svc_attrs[] = { &dev_attr_endo_id.attr, &dev_attr_ap_intf_id.attr, &dev_attr_intf_eject.attr, &dev_attr_watchdog.attr, - &dev_attr_pwr_off.attr, NULL, }; ATTRIBUTE_GROUPS(svc); @@ -340,14 +320,6 @@ int gb_svc_ping(struct gb_svc *svc) } EXPORT_SYMBOL_GPL(gb_svc_ping); -int gb_svc_pwr_off(struct gb_svc *svc) -{ - return gb_operation_sync_timeout(svc->connection, GB_SVC_TYPE_PWR_DOWN, - NULL, 0, NULL, 0, - GB_OPERATION_TIMEOUT_DEFAULT * 2); -} -EXPORT_SYMBOL_GPL(gb_svc_pwr_off); - static int gb_svc_version_request(struct gb_operation *op) { struct gb_connection *connection = op->connection; diff --git a/drivers/staging/greybus/svc.h b/drivers/staging/greybus/svc.h index 09d868877c82..8950baff9aef 100644 --- a/drivers/staging/greybus/svc.h +++ b/drivers/staging/greybus/svc.h @@ -71,7 +71,6 @@ void gb_svc_watchdog_destroy(struct gb_svc *svc); bool gb_svc_watchdog_enabled(struct gb_svc *svc); int gb_svc_watchdog_enable(struct gb_svc *svc); int gb_svc_watchdog_disable(struct gb_svc *svc); -int gb_svc_pwr_off(struct gb_svc *svc); int gb_svc_protocol_init(void); void gb_svc_protocol_exit(void);