diff options
Diffstat (limited to 'drivers/platform/chrome/cros_ec_spi.c')
| -rw-r--r-- | drivers/platform/chrome/cros_ec_spi.c | 14 | 
1 files changed, 11 insertions, 3 deletions
diff --git a/drivers/platform/chrome/cros_ec_spi.c b/drivers/platform/chrome/cros_ec_spi.c index 006a8ff64057..a831bd5a5b2f 100644 --- a/drivers/platform/chrome/cros_ec_spi.c +++ b/drivers/platform/chrome/cros_ec_spi.c @@ -6,9 +6,9 @@  #include <linux/delay.h>  #include <linux/kernel.h>  #include <linux/module.h> -#include <linux/mfd/cros_ec.h> -#include <linux/mfd/cros_ec_commands.h>  #include <linux/of.h> +#include <linux/platform_data/cros_ec_commands.h> +#include <linux/platform_data/cros_ec_proto.h>  #include <linux/platform_device.h>  #include <linux/slab.h>  #include <linux/spi/spi.h> @@ -706,7 +706,7 @@ static int cros_ec_spi_devm_high_pri_alloc(struct device *dev,  					   struct cros_ec_spi *ec_spi)  {  	struct sched_param sched_priority = { -		.sched_priority = MAX_RT_PRIO - 1, +		.sched_priority = MAX_RT_PRIO / 2,  	};  	int err; @@ -785,6 +785,13 @@ static int cros_ec_spi_probe(struct spi_device *spi)  	return 0;  } +static int cros_ec_spi_remove(struct spi_device *spi) +{ +	struct cros_ec_device *ec_dev = spi_get_drvdata(spi); + +	return cros_ec_unregister(ec_dev); +} +  #ifdef CONFIG_PM_SLEEP  static int cros_ec_spi_suspend(struct device *dev)  { @@ -823,6 +830,7 @@ static struct spi_driver cros_ec_driver_spi = {  		.pm	= &cros_ec_spi_pm_ops,  	},  	.probe		= cros_ec_spi_probe, +	.remove		= cros_ec_spi_remove,  	.id_table	= cros_ec_spi_id,  };  |