diff options
author | Jean Delvare <khali@linux-fr.org> | 2011-01-10 16:11:23 -0500 |
---|---|---|
committer | Jean Delvare <khali@endymion.delvare> | 2011-01-10 16:11:23 -0500 |
commit | 0cc43a1806f078f7fd414850d8f1f1761696e4af (patch) | |
tree | 2278fca3af95002a867fa72b34e4ca97ccf5489f /drivers/i2c/i2c-core.c | |
parent | af5a60baaee66e2f891dbb9a8519ca28ab7da7cd (diff) |
i2c: Constify i2c_client where possible
Helper functions for I2C and SMBus transactions don't modify the
i2c_client that is passed to them, so it can be marked const.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Diffstat (limited to 'drivers/i2c/i2c-core.c')
-rw-r--r-- | drivers/i2c/i2c-core.c | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index 6b4cc567645b..c7db6980e3a3 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c | |||
@@ -1362,7 +1362,7 @@ EXPORT_SYMBOL(i2c_transfer); | |||
1362 | * | 1362 | * |
1363 | * Returns negative errno, or else the number of bytes written. | 1363 | * Returns negative errno, or else the number of bytes written. |
1364 | */ | 1364 | */ |
1365 | int i2c_master_send(struct i2c_client *client, const char *buf, int count) | 1365 | int i2c_master_send(const struct i2c_client *client, const char *buf, int count) |
1366 | { | 1366 | { |
1367 | int ret; | 1367 | int ret; |
1368 | struct i2c_adapter *adap = client->adapter; | 1368 | struct i2c_adapter *adap = client->adapter; |
@@ -1389,7 +1389,7 @@ EXPORT_SYMBOL(i2c_master_send); | |||
1389 | * | 1389 | * |
1390 | * Returns negative errno, or else the number of bytes read. | 1390 | * Returns negative errno, or else the number of bytes read. |
1391 | */ | 1391 | */ |
1392 | int i2c_master_recv(struct i2c_client *client, char *buf, int count) | 1392 | int i2c_master_recv(const struct i2c_client *client, char *buf, int count) |
1393 | { | 1393 | { |
1394 | struct i2c_adapter *adap = client->adapter; | 1394 | struct i2c_adapter *adap = client->adapter; |
1395 | struct i2c_msg msg; | 1395 | struct i2c_msg msg; |
@@ -1679,7 +1679,7 @@ static int i2c_smbus_check_pec(u8 cpec, struct i2c_msg *msg) | |||
1679 | * This executes the SMBus "receive byte" protocol, returning negative errno | 1679 | * This executes the SMBus "receive byte" protocol, returning negative errno |
1680 | * else the byte received from the device. | 1680 | * else the byte received from the device. |
1681 | */ | 1681 | */ |
1682 | s32 i2c_smbus_read_byte(struct i2c_client *client) | 1682 | s32 i2c_smbus_read_byte(const struct i2c_client *client) |
1683 | { | 1683 | { |
1684 | union i2c_smbus_data data; | 1684 | union i2c_smbus_data data; |
1685 | int status; | 1685 | int status; |
@@ -1699,7 +1699,7 @@ EXPORT_SYMBOL(i2c_smbus_read_byte); | |||
1699 | * This executes the SMBus "send byte" protocol, returning negative errno | 1699 | * This executes the SMBus "send byte" protocol, returning negative errno |
1700 | * else zero on success. | 1700 | * else zero on success. |
1701 | */ | 1701 | */ |
1702 | s32 i2c_smbus_write_byte(struct i2c_client *client, u8 value) | 1702 | s32 i2c_smbus_write_byte(const struct i2c_client *client, u8 value) |
1703 | { | 1703 | { |
1704 | return i2c_smbus_xfer(client->adapter, client->addr, client->flags, | 1704 | return i2c_smbus_xfer(client->adapter, client->addr, client->flags, |
1705 | I2C_SMBUS_WRITE, value, I2C_SMBUS_BYTE, NULL); | 1705 | I2C_SMBUS_WRITE, value, I2C_SMBUS_BYTE, NULL); |
@@ -1714,7 +1714,7 @@ EXPORT_SYMBOL(i2c_smbus_write_byte); | |||
1714 | * This executes the SMBus "read byte" protocol, returning negative errno | 1714 | * This executes the SMBus "read byte" protocol, returning negative errno |
1715 | * else a data byte received from the device. | 1715 | * else a data byte received from the device. |
1716 | */ | 1716 | */ |
1717 | s32 i2c_smbus_read_byte_data(struct i2c_client *client, u8 command) | 1717 | s32 i2c_smbus_read_byte_data(const struct i2c_client *client, u8 command) |
1718 | { | 1718 | { |
1719 | union i2c_smbus_data data; | 1719 | union i2c_smbus_data data; |
1720 | int status; | 1720 | int status; |
@@ -1735,7 +1735,8 @@ EXPORT_SYMBOL(i2c_smbus_read_byte_data); | |||
1735 | * This executes the SMBus "write byte" protocol, returning negative errno | 1735 | * This executes the SMBus "write byte" protocol, returning negative errno |
1736 | * else zero on success. | 1736 | * else zero on success. |
1737 | */ | 1737 | */ |
1738 | s32 i2c_smbus_write_byte_data(struct i2c_client *client, u8 command, u8 value) | 1738 | s32 i2c_smbus_write_byte_data(const struct i2c_client *client, u8 command, |
1739 | u8 value) | ||
1739 | { | 1740 | { |
1740 | union i2c_smbus_data data; | 1741 | union i2c_smbus_data data; |
1741 | data.byte = value; | 1742 | data.byte = value; |
@@ -1753,7 +1754,7 @@ EXPORT_SYMBOL(i2c_smbus_write_byte_data); | |||
1753 | * This executes the SMBus "read word" protocol, returning negative errno | 1754 | * This executes the SMBus "read word" protocol, returning negative errno |
1754 | * else a 16-bit unsigned "word" received from the device. | 1755 | * else a 16-bit unsigned "word" received from the device. |
1755 | */ | 1756 | */ |
1756 | s32 i2c_smbus_read_word_data(struct i2c_client *client, u8 command) | 1757 | s32 i2c_smbus_read_word_data(const struct i2c_client *client, u8 command) |
1757 | { | 1758 | { |
1758 | union i2c_smbus_data data; | 1759 | union i2c_smbus_data data; |
1759 | int status; | 1760 | int status; |
@@ -1774,7 +1775,8 @@ EXPORT_SYMBOL(i2c_smbus_read_word_data); | |||
1774 | * This executes the SMBus "write word" protocol, returning negative errno | 1775 | * This executes the SMBus "write word" protocol, returning negative errno |
1775 | * else zero on success. | 1776 | * else zero on success. |
1776 | */ | 1777 | */ |
1777 | s32 i2c_smbus_write_word_data(struct i2c_client *client, u8 command, u16 value) | 1778 | s32 i2c_smbus_write_word_data(const struct i2c_client *client, u8 command, |
1779 | u16 value) | ||
1778 | { | 1780 | { |
1779 | union i2c_smbus_data data; | 1781 | union i2c_smbus_data data; |
1780 | data.word = value; | 1782 | data.word = value; |
@@ -1793,7 +1795,8 @@ EXPORT_SYMBOL(i2c_smbus_write_word_data); | |||
1793 | * This executes the SMBus "process call" protocol, returning negative errno | 1795 | * This executes the SMBus "process call" protocol, returning negative errno |
1794 | * else a 16-bit unsigned "word" received from the device. | 1796 | * else a 16-bit unsigned "word" received from the device. |
1795 | */ | 1797 | */ |
1796 | s32 i2c_smbus_process_call(struct i2c_client *client, u8 command, u16 value) | 1798 | s32 i2c_smbus_process_call(const struct i2c_client *client, u8 command, |
1799 | u16 value) | ||
1797 | { | 1800 | { |
1798 | union i2c_smbus_data data; | 1801 | union i2c_smbus_data data; |
1799 | int status; | 1802 | int status; |
@@ -1821,7 +1824,7 @@ EXPORT_SYMBOL(i2c_smbus_process_call); | |||
1821 | * support this; its emulation through I2C messaging relies on a specific | 1824 | * support this; its emulation through I2C messaging relies on a specific |
1822 | * mechanism (I2C_M_RECV_LEN) which may not be implemented. | 1825 | * mechanism (I2C_M_RECV_LEN) which may not be implemented. |
1823 | */ | 1826 | */ |
1824 | s32 i2c_smbus_read_block_data(struct i2c_client *client, u8 command, | 1827 | s32 i2c_smbus_read_block_data(const struct i2c_client *client, u8 command, |
1825 | u8 *values) | 1828 | u8 *values) |
1826 | { | 1829 | { |
1827 | union i2c_smbus_data data; | 1830 | union i2c_smbus_data data; |
@@ -1848,7 +1851,7 @@ EXPORT_SYMBOL(i2c_smbus_read_block_data); | |||
1848 | * This executes the SMBus "block write" protocol, returning negative errno | 1851 | * This executes the SMBus "block write" protocol, returning negative errno |
1849 | * else zero on success. | 1852 | * else zero on success. |
1850 | */ | 1853 | */ |
1851 | s32 i2c_smbus_write_block_data(struct i2c_client *client, u8 command, | 1854 | s32 i2c_smbus_write_block_data(const struct i2c_client *client, u8 command, |
1852 | u8 length, const u8 *values) | 1855 | u8 length, const u8 *values) |
1853 | { | 1856 | { |
1854 | union i2c_smbus_data data; | 1857 | union i2c_smbus_data data; |
@@ -1864,7 +1867,7 @@ s32 i2c_smbus_write_block_data(struct i2c_client *client, u8 command, | |||
1864 | EXPORT_SYMBOL(i2c_smbus_write_block_data); | 1867 | EXPORT_SYMBOL(i2c_smbus_write_block_data); |
1865 | 1868 | ||
1866 | /* Returns the number of read bytes */ | 1869 | /* Returns the number of read bytes */ |
1867 | s32 i2c_smbus_read_i2c_block_data(struct i2c_client *client, u8 command, | 1870 | s32 i2c_smbus_read_i2c_block_data(const struct i2c_client *client, u8 command, |
1868 | u8 length, u8 *values) | 1871 | u8 length, u8 *values) |
1869 | { | 1872 | { |
1870 | union i2c_smbus_data data; | 1873 | union i2c_smbus_data data; |
@@ -1884,7 +1887,7 @@ s32 i2c_smbus_read_i2c_block_data(struct i2c_client *client, u8 command, | |||
1884 | } | 1887 | } |
1885 | EXPORT_SYMBOL(i2c_smbus_read_i2c_block_data); | 1888 | EXPORT_SYMBOL(i2c_smbus_read_i2c_block_data); |
1886 | 1889 | ||
1887 | s32 i2c_smbus_write_i2c_block_data(struct i2c_client *client, u8 command, | 1890 | s32 i2c_smbus_write_i2c_block_data(const struct i2c_client *client, u8 command, |
1888 | u8 length, const u8 *values) | 1891 | u8 length, const u8 *values) |
1889 | { | 1892 | { |
1890 | union i2c_smbus_data data; | 1893 | union i2c_smbus_data data; |