summaryrefslogtreecommitdiffstats
path: root/drivers/i2c/busses/i2c-highlander.c
diff options
context:
space:
mode:
authorKalle Valo <kvalo@qca.qualcomm.com>2012-03-05 18:32:58 +0100
committerKalle Valo <kvalo@qca.qualcomm.com>2012-03-05 18:32:58 +0100
commit05e5bd0f3daddb0368a433af5b58be68c62dc365 (patch)
treea54c90523b72fb6e61b7bfe01fb8917e16825781 /drivers/i2c/busses/i2c-highlander.c
parentath6kl: Restrict memcpy to bounce buffer only for write request (diff)
parentcarl9170: fix breakage from "mac80211: handle non-bufferable MMPDUs correctly" (diff)
downloadlinux-05e5bd0f3daddb0368a433af5b58be68c62dc365.tar.xz
linux-05e5bd0f3daddb0368a433af5b58be68c62dc365.zip
Merge remote branch 'wireless-next/master' into ath6kl-next
Conflicts: drivers/net/wireless/ath/ath6kl/cfg80211.c
Diffstat (limited to 'drivers/i2c/busses/i2c-highlander.c')
-rw-r--r--drivers/i2c/busses/i2c-highlander.c15
1 files changed, 2 insertions, 13 deletions
diff --git a/drivers/i2c/busses/i2c-highlander.c b/drivers/i2c/busses/i2c-highlander.c
index 63bb1cc2a042..19515df61021 100644
--- a/drivers/i2c/busses/i2c-highlander.c
+++ b/drivers/i2c/busses/i2c-highlander.c
@@ -52,7 +52,7 @@ struct highlander_i2c_dev {
size_t buf_len;
};
-static int iic_force_poll, iic_force_normal;
+static bool iic_force_poll, iic_force_normal;
static int iic_timeout = 1000, iic_read_delay;
static inline void highlander_i2c_irq_enable(struct highlander_i2c_dev *dev)
@@ -468,18 +468,7 @@ static struct platform_driver highlander_i2c_driver = {
.remove = __devexit_p(highlander_i2c_remove),
};
-static int __init highlander_i2c_init(void)
-{
- return platform_driver_register(&highlander_i2c_driver);
-}
-
-static void __exit highlander_i2c_exit(void)
-{
- platform_driver_unregister(&highlander_i2c_driver);
-}
-
-module_init(highlander_i2c_init);
-module_exit(highlander_i2c_exit);
+module_platform_driver(highlander_i2c_driver);
MODULE_AUTHOR("Paul Mundt");
MODULE_DESCRIPTION("Renesas Highlander FPGA I2C/SMBus adapter");