Commit db1019ca authored by Dominik Brodowski's avatar Dominik Brodowski
Browse files

[PATCH] pcmcia: runtime powermanagement interface



With the "power/state" sysfs interface being deprecated, make another
one available which is compatible to what was discussed on the linux
PM mailinglist.
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent f542ff6d
...@@ -920,6 +920,37 @@ pcmcia_device_stringattr(prod_id2, prod_id[1]); ...@@ -920,6 +920,37 @@ pcmcia_device_stringattr(prod_id2, prod_id[1]);
pcmcia_device_stringattr(prod_id3, prod_id[2]); pcmcia_device_stringattr(prod_id3, prod_id[2]);
pcmcia_device_stringattr(prod_id4, prod_id[3]); pcmcia_device_stringattr(prod_id4, prod_id[3]);
static ssize_t pcmcia_show_pm_state(struct device *dev, struct device_attribute *attr, char *buf)
{
struct pcmcia_device *p_dev = to_pcmcia_dev(dev);
if (p_dev->dev.power.power_state.event != PM_EVENT_ON)
return sprintf(buf, "off\n");
else
return sprintf(buf, "on\n");
}
static ssize_t pcmcia_store_pm_state(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count)
{
struct pcmcia_device *p_dev = to_pcmcia_dev(dev);
int ret = 0;
if (!count)
return -EINVAL;
if ((p_dev->dev.power.power_state.event == PM_EVENT_ON) &&
(!strncmp(buf, "off", 3)))
ret = dpm_runtime_suspend(dev, PMSG_SUSPEND);
else if ((p_dev->dev.power.power_state.event != PM_EVENT_ON) &&
(!strncmp(buf, "on", 2)))
dpm_runtime_resume(dev);
return ret ? ret : count;
}
static ssize_t modalias_show(struct device *dev, struct device_attribute *attr, char *buf) static ssize_t modalias_show(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct pcmcia_device *p_dev = to_pcmcia_dev(dev); struct pcmcia_device *p_dev = to_pcmcia_dev(dev);
...@@ -945,8 +976,9 @@ static ssize_t pcmcia_store_allow_func_id_match(struct device *dev, ...@@ -945,8 +976,9 @@ static ssize_t pcmcia_store_allow_func_id_match(struct device *dev,
struct device_attribute *attr, const char *buf, size_t count) struct device_attribute *attr, const char *buf, size_t count)
{ {
struct pcmcia_device *p_dev = to_pcmcia_dev(dev); struct pcmcia_device *p_dev = to_pcmcia_dev(dev);
if (!count)
return -EINVAL; if (!count)
return -EINVAL;
down(&p_dev->socket->skt_sem); down(&p_dev->socket->skt_sem);
p_dev->allow_func_id_match = 1; p_dev->allow_func_id_match = 1;
...@@ -959,6 +991,7 @@ static ssize_t pcmcia_store_allow_func_id_match(struct device *dev, ...@@ -959,6 +991,7 @@ static ssize_t pcmcia_store_allow_func_id_match(struct device *dev,
static struct device_attribute pcmcia_dev_attrs[] = { static struct device_attribute pcmcia_dev_attrs[] = {
__ATTR(function, 0444, func_show, NULL), __ATTR(function, 0444, func_show, NULL),
__ATTR(pm_state, 0644, pcmcia_show_pm_state, pcmcia_store_pm_state),
__ATTR_RO(func_id), __ATTR_RO(func_id),
__ATTR_RO(manf_id), __ATTR_RO(manf_id),
__ATTR_RO(card_id), __ATTR_RO(card_id),
......
...@@ -98,6 +98,30 @@ static ssize_t pccard_store_insert(struct class_device *dev, const char *buf, si ...@@ -98,6 +98,30 @@ static ssize_t pccard_store_insert(struct class_device *dev, const char *buf, si
} }
static CLASS_DEVICE_ATTR(card_insert, 0200, NULL, pccard_store_insert); static CLASS_DEVICE_ATTR(card_insert, 0200, NULL, pccard_store_insert);
static ssize_t pccard_show_card_pm_state(struct class_device *dev, char *buf)
{
struct pcmcia_socket *s = to_socket(dev);
return sprintf(buf, "%s\n", s->state & SOCKET_SUSPEND ? "off" : "on");
}
static ssize_t pccard_store_card_pm_state(struct class_device *dev, const char *buf, size_t count)
{
ssize_t ret = -EINVAL;
struct pcmcia_socket *s = to_socket(dev);
if (!count)
return -EINVAL;
if (!(s->state & SOCKET_SUSPEND) && !strncmp(buf, "off", 3))
ret = pcmcia_suspend_card(s);
else if ((s->state & SOCKET_SUSPEND) && !strncmp(buf, "on", 2))
ret = pcmcia_resume_card(s);
return ret ? -ENODEV : count;
}
static CLASS_DEVICE_ATTR(card_pm_state, 0644, pccard_show_card_pm_state, pccard_store_card_pm_state);
static ssize_t pccard_store_eject(struct class_device *dev, const char *buf, size_t count) static ssize_t pccard_store_eject(struct class_device *dev, const char *buf, size_t count)
{ {
ssize_t ret; ssize_t ret;
...@@ -320,6 +344,7 @@ static struct class_device_attribute *pccard_socket_attributes[] = { ...@@ -320,6 +344,7 @@ static struct class_device_attribute *pccard_socket_attributes[] = {
&class_device_attr_card_vpp, &class_device_attr_card_vpp,
&class_device_attr_card_vcc, &class_device_attr_card_vcc,
&class_device_attr_card_insert, &class_device_attr_card_insert,
&class_device_attr_card_pm_state,
&class_device_attr_card_eject, &class_device_attr_card_eject,
&class_device_attr_card_irq_mask, &class_device_attr_card_irq_mask,
&class_device_attr_available_resources_setup_done, &class_device_attr_available_resources_setup_done,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment