diff options
author | Wolfram Sang <wsa@the-dreams.de> | 2015-01-07 06:24:10 -0500 |
---|---|---|
committer | Wolfram Sang <wsa@the-dreams.de> | 2015-03-13 10:10:56 -0400 |
commit | afe90203977bc7ecd7d1048a5ad453a8670c16f5 (patch) | |
tree | 72ff6e7327e4fe03a5d7ff214f32fa77400f9b9e | |
parent | 280d230012dc0441e7fd8c722ac06dc370ce78d0 (diff) |
i2c: dln2: make use of the new infrastructure for quirks
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
-rw-r--r-- | drivers/i2c/busses/i2c-dln2.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/i2c/busses/i2c-dln2.c b/drivers/i2c/busses/i2c-dln2.c index b3fb86af4cbb..b6f9ba7eb175 100644 --- a/drivers/i2c/busses/i2c-dln2.c +++ b/drivers/i2c/busses/i2c-dln2.c | |||
@@ -144,7 +144,6 @@ static int dln2_i2c_xfer(struct i2c_adapter *adapter, | |||
144 | { | 144 | { |
145 | struct dln2_i2c *dln2 = i2c_get_adapdata(adapter); | 145 | struct dln2_i2c *dln2 = i2c_get_adapdata(adapter); |
146 | struct i2c_msg *pmsg; | 146 | struct i2c_msg *pmsg; |
147 | struct device *dev = &dln2->adapter.dev; | ||
148 | int i; | 147 | int i; |
149 | 148 | ||
150 | for (i = 0; i < num; i++) { | 149 | for (i = 0; i < num; i++) { |
@@ -152,11 +151,6 @@ static int dln2_i2c_xfer(struct i2c_adapter *adapter, | |||
152 | 151 | ||
153 | pmsg = &msgs[i]; | 152 | pmsg = &msgs[i]; |
154 | 153 | ||
155 | if (pmsg->len > DLN2_I2C_MAX_XFER_SIZE) { | ||
156 | dev_warn(dev, "maximum transfer size exceeded\n"); | ||
157 | return -EOPNOTSUPP; | ||
158 | } | ||
159 | |||
160 | if (pmsg->flags & I2C_M_RD) { | 154 | if (pmsg->flags & I2C_M_RD) { |
161 | ret = dln2_i2c_read(dln2, pmsg->addr, pmsg->buf, | 155 | ret = dln2_i2c_read(dln2, pmsg->addr, pmsg->buf, |
162 | pmsg->len); | 156 | pmsg->len); |
@@ -187,6 +181,11 @@ static const struct i2c_algorithm dln2_i2c_usb_algorithm = { | |||
187 | .functionality = dln2_i2c_func, | 181 | .functionality = dln2_i2c_func, |
188 | }; | 182 | }; |
189 | 183 | ||
184 | static struct i2c_adapter_quirks dln2_i2c_quirks = { | ||
185 | .max_read_len = DLN2_I2C_MAX_XFER_SIZE, | ||
186 | .max_write_len = DLN2_I2C_MAX_XFER_SIZE, | ||
187 | }; | ||
188 | |||
190 | static int dln2_i2c_probe(struct platform_device *pdev) | 189 | static int dln2_i2c_probe(struct platform_device *pdev) |
191 | { | 190 | { |
192 | int ret; | 191 | int ret; |
@@ -209,6 +208,7 @@ static int dln2_i2c_probe(struct platform_device *pdev) | |||
209 | dln2->adapter.owner = THIS_MODULE; | 208 | dln2->adapter.owner = THIS_MODULE; |
210 | dln2->adapter.class = I2C_CLASS_HWMON; | 209 | dln2->adapter.class = I2C_CLASS_HWMON; |
211 | dln2->adapter.algo = &dln2_i2c_usb_algorithm; | 210 | dln2->adapter.algo = &dln2_i2c_usb_algorithm; |
211 | dln2->adapter.quirks = &dln2_i2c_quirks; | ||
212 | dln2->adapter.dev.parent = dev; | 212 | dln2->adapter.dev.parent = dev; |
213 | i2c_set_adapdata(&dln2->adapter, dln2); | 213 | i2c_set_adapdata(&dln2->adapter, dln2); |
214 | snprintf(dln2->adapter.name, sizeof(dln2->adapter.name), "%s-%s-%d", | 214 | snprintf(dln2->adapter.name, sizeof(dln2->adapter.name), "%s-%s-%d", |