diff options
| author | Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2016-06-09 16:53:47 +0200 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2016-06-17 12:41:25 +0200 |
| commit | b4f210541fc319bd643ad9a4fdbfe2ce31be6cfc (patch) | |
| tree | 2357245596d833d1de83be817a08bbd2ba410966 /drivers/char/ipmi | |
| parent | 33c77abcf4aa5e9679f702a2f979d44a470f6e6e (diff) | |
| download | linux-stable-b4f210541fc319bd643ad9a4fdbfe2ce31be6cfc.tar.gz linux-stable-b4f210541fc319bd643ad9a4fdbfe2ce31be6cfc.tar.bz2 linux-stable-b4f210541fc319bd643ad9a4fdbfe2ce31be6cfc.zip | |
i2c: add a protocol parameter to the alert callback
.alert() is meant to be generic, but there is currently no way
for the device driver to know which protocol generated the alert.
Add a parameter in .alert() to help the device driver to understand
what is given in data.
This patch is required to have the support of SMBus Host Notify protocol
through .alert().
Tested-by: Andrew Duggan <aduggan@synaptics.com>
For hwmon:
Acked-by: Guenter Roeck <linux@roeck-us.net>
For IPMI:
Acked-by: Corey Minyard <cminyard@mvista.com>
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/char/ipmi')
| -rw-r--r-- | drivers/char/ipmi/ipmi_ssif.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/char/ipmi/ipmi_ssif.c b/drivers/char/ipmi/ipmi_ssif.c index 097c86898608..5673ffff00be 100644 --- a/drivers/char/ipmi/ipmi_ssif.c +++ b/drivers/char/ipmi/ipmi_ssif.c @@ -568,12 +568,16 @@ static void retry_timeout(unsigned long data) } -static void ssif_alert(struct i2c_client *client, unsigned int data) +static void ssif_alert(struct i2c_client *client, enum i2c_alert_protocol type, + unsigned int data) { struct ssif_info *ssif_info = i2c_get_clientdata(client); unsigned long oflags, *flags; bool do_get = false; + if (type != I2C_PROTOCOL_SMBUS_ALERT) + return; + ssif_inc_stat(ssif_info, alerts); flags = ipmi_ssif_lock_cond(ssif_info, &oflags); |