diff options
author | Jean Delvare <khali@linux-fr.org> | 2011-05-24 14:58:49 -0400 |
---|---|---|
committer | Jean Delvare <khali@endymion.delvare> | 2011-05-24 14:58:49 -0400 |
commit | 07da0372dd6ca5517400ce95040861def25930c8 (patch) | |
tree | 417c8b0a982f8d24cce4550bfa78acdb11bcea8d /drivers/i2c/busses/i2c-parport-light.c | |
parent | 8eacfcebf0274310a751924c02c5c31cbdf057b3 (diff) |
i2c-parport: Various cleanups
* Fix white space.
* Rename labels to something meaningful.
* Prefix defines with PORT_ to avoid collision with macros from
<linux/parport.h>.
* Add const markers where possible.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Diffstat (limited to 'drivers/i2c/busses/i2c-parport-light.c')
-rw-r--r-- | drivers/i2c/busses/i2c-parport-light.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/i2c/busses/i2c-parport-light.c b/drivers/i2c/busses/i2c-parport-light.c index fc5fbd1012c9..4b95f7a63a3b 100644 --- a/drivers/i2c/busses/i2c-parport-light.c +++ b/drivers/i2c/busses/i2c-parport-light.c | |||
@@ -2,13 +2,13 @@ | |||
2 | * i2c-parport-light.c I2C bus over parallel port * | 2 | * i2c-parport-light.c I2C bus over parallel port * |
3 | * ------------------------------------------------------------------------ * | 3 | * ------------------------------------------------------------------------ * |
4 | Copyright (C) 2003-2010 Jean Delvare <khali@linux-fr.org> | 4 | Copyright (C) 2003-2010 Jean Delvare <khali@linux-fr.org> |
5 | 5 | ||
6 | Based on older i2c-velleman.c driver | 6 | Based on older i2c-velleman.c driver |
7 | Copyright (C) 1995-2000 Simon G. Vogl | 7 | Copyright (C) 1995-2000 Simon G. Vogl |
8 | With some changes from: | 8 | With some changes from: |
9 | Frodo Looijaard <frodol@dds.nl> | 9 | Frodo Looijaard <frodol@dds.nl> |
10 | Kyösti Mälkki <kmalkki@cc.hut.fi> | 10 | Kyösti Mälkki <kmalkki@cc.hut.fi> |
11 | 11 | ||
12 | This program is free software; you can redistribute it and/or modify | 12 | This program is free software; you can redistribute it and/or modify |
13 | it under the terms of the GNU General Public License as published by | 13 | it under the terms of the GNU General Public License as published by |
14 | the Free Software Foundation; either version 2 of the License, or | 14 | the Free Software Foundation; either version 2 of the License, or |
@@ -114,7 +114,7 @@ static struct i2c_algo_bit_data parport_algo_data = { | |||
114 | .getscl = parport_getscl, | 114 | .getscl = parport_getscl, |
115 | .udelay = 50, | 115 | .udelay = 50, |
116 | .timeout = HZ, | 116 | .timeout = HZ, |
117 | }; | 117 | }; |
118 | 118 | ||
119 | /* ----- Driver registration ---------------------------------------------- */ | 119 | /* ----- Driver registration ---------------------------------------------- */ |
120 | 120 | ||
@@ -132,7 +132,7 @@ static struct i2c_smbus_alert_setup alert_data = { | |||
132 | static struct i2c_client *ara; | 132 | static struct i2c_client *ara; |
133 | static struct lineop parport_ctrl_irq = { | 133 | static struct lineop parport_ctrl_irq = { |
134 | .val = (1 << 4), | 134 | .val = (1 << 4), |
135 | .port = CTRL, | 135 | .port = PORT_CTRL, |
136 | }; | 136 | }; |
137 | 137 | ||
138 | static int __devinit i2c_parport_probe(struct platform_device *pdev) | 138 | static int __devinit i2c_parport_probe(struct platform_device *pdev) |
@@ -245,7 +245,7 @@ static int __init i2c_parport_init(void) | |||
245 | if (irq != 0) | 245 | if (irq != 0) |
246 | pr_info(DRVNAME ": using irq %d\n", irq); | 246 | pr_info(DRVNAME ": using irq %d\n", irq); |
247 | 247 | ||
248 | if (!adapter_parm[type].getscl.val) | 248 | if (!adapter_parm[type].getscl.val) |
249 | parport_algo_data.getscl = NULL; | 249 | parport_algo_data.getscl = NULL; |
250 | 250 | ||
251 | /* Sets global pdev as a side effect */ | 251 | /* Sets global pdev as a side effect */ |