lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

i2c-parport: Various cleanups

Browse Source 
* 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>
This commit is contained in:
Jean Delvare
2011-05-24 20:58:49 +02:00
committed by Jean Delvare
parent 8eacfcebf0
commit 07da0372dd
3 changed files with 55 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/i2c/busses/i2c-parport-light.c
View File

@@ -132,7 +132,7 @@ static struct i2c_smbus_alert_setup alert_data = {
static struct i2c_client *ara; static struct i2c_client *ara;
static struct lineop parport_ctrl_irq = { static struct lineop parport_ctrl_irq = {
.val = (1 << 4), .val = (1 << 4),
.port = CTRL, .port = PORT_CTRL,
}; };
static int __devinit i2c_parport_probe(struct platform_device *pdev) static int __devinit i2c_parport_probe(struct platform_device *pdev)

18
drivers/i2c/busses/i2c-parport.c
View File

@@ -78,13 +78,13 @@ static unsigned char port_read_control(struct parport *p)
return parport_read_control(p); return parport_read_control(p);
} }
static void (*port_write[])(struct parport *, unsigned char) = { static void (* const port_write[])(struct parport *, unsigned char) = {
port_write_data, port_write_data,
NULL, NULL,
port_write_control, port_write_control,
}; };
static unsigned char (*port_read[])(struct parport *) = { static unsigned char (* const port_read[])(struct parport *) = {
port_read_data, port_read_data,
port_read_status, port_read_status,
port_read_control, port_read_control,
@@ -164,7 +164,7 @@ void i2c_parport_irq(void *data)
"SMBus alert received but no ARA client!\n"); "SMBus alert received but no ARA client!\n");
} }
static void i2c_parport_attach (struct parport *port) static void i2c_parport_attach(struct parport *port)
{ {
struct i2c_par *adapter; struct i2c_par *adapter;
@@ -180,7 +180,7 @@ static void i2c_parport_attach (struct parport *port)
NULL, NULL, i2c_parport_irq, PARPORT_FLAG_EXCL, adapter); NULL, NULL, i2c_parport_irq, PARPORT_FLAG_EXCL, adapter);
if (!adapter->pdev) { if (!adapter->pdev) {
printk(KERN_ERR "i2c-parport: Unable to register with parport\n"); printk(KERN_ERR "i2c-parport: Unable to register with parport\n");
goto ERROR0; goto err_free;
} }
/* Fill the rest of the structure */ /* Fill the rest of the structure */
@@ -200,7 +200,7 @@ static void i2c_parport_attach (struct parport *port)
if (parport_claim_or_block(adapter->pdev) < 0) { if (parport_claim_or_block(adapter->pdev) < 0) {
printk(KERN_ERR "i2c-parport: Could not claim parallel port\n"); printk(KERN_ERR "i2c-parport: Could not claim parallel port\n");
goto ERROR1; goto err_unregister;
} }
/* Reset hardware to a sane state (SCL and SDA high) */ /* Reset hardware to a sane state (SCL and SDA high) */
@@ -215,7 +215,7 @@ static void i2c_parport_attach (struct parport *port)
if (i2c_bit_add_bus(&adapter->adapter) < 0) { if (i2c_bit_add_bus(&adapter->adapter) < 0) {
printk(KERN_ERR "i2c-parport: Unable to register with I2C\n"); printk(KERN_ERR "i2c-parport: Unable to register with I2C\n");
goto ERROR1; goto err_unregister;
} }
/* Setup SMBus alert if supported */ /* Setup SMBus alert if supported */
@@ -236,14 +236,14 @@ static void i2c_parport_attach (struct parport *port)
mutex_unlock(&adapter_list_lock); mutex_unlock(&adapter_list_lock);
return; return;
ERROR1: err_unregister:
parport_release(adapter->pdev); parport_release(adapter->pdev);
parport_unregister_device(adapter->pdev); parport_unregister_device(adapter->pdev);
ERROR0: err_free:
kfree(adapter); kfree(adapter);
} }
static void i2c_parport_detach (struct parport *port) static void i2c_parport_detach(struct parport *port)
{ {
struct i2c_par *adapter, *_n; struct i2c_par *adapter, *_n;

72
drivers/i2c/busses/i2c-parport.h
View File

@@ -18,13 +18,9 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
* ------------------------------------------------------------------------ */ * ------------------------------------------------------------------------ */
#ifdef DATA #define PORT_DATA 0
#undef DATA #define PORT_STAT 1
#endif #define PORT_CTRL 2
#define DATA 0
#define STAT 1
#define CTRL 2
struct lineop { struct lineop {
u8 val; u8 val;
@@ -41,61 +37,61 @@ struct adapter_parm {
unsigned int smbus_alert:1; unsigned int smbus_alert:1;
}; };
static struct adapter_parm adapter_parm[] = { static const struct adapter_parm adapter_parm[] = {
/* type 0: Philips adapter */ /* type 0: Philips adapter */
{ {
.setsda = { 0x80, DATA, 1 }, .setsda = { 0x80, PORT_DATA, 1 },
.setscl = { 0x08, CTRL, 0 }, .setscl = { 0x08, PORT_CTRL, 0 },
.getsda = { 0x80, STAT, 0 }, .getsda = { 0x80, PORT_STAT, 0 },
.getscl = { 0x08, STAT, 0 }, .getscl = { 0x08, PORT_STAT, 0 },
}, },
/* type 1: home brew teletext adapter */ /* type 1: home brew teletext adapter */
{ {
.setsda = { 0x02, DATA, 0 }, .setsda = { 0x02, PORT_DATA, 0 },
.setscl = { 0x01, DATA, 0 }, .setscl = { 0x01, PORT_DATA, 0 },
.getsda = { 0x80, STAT, 1 }, .getsda = { 0x80, PORT_STAT, 1 },
}, },
/* type 2: Velleman K8000 adapter */ /* type 2: Velleman K8000 adapter */
{ {
.setsda = { 0x02, CTRL, 1 }, .setsda = { 0x02, PORT_CTRL, 1 },
.setscl = { 0x08, CTRL, 1 }, .setscl = { 0x08, PORT_CTRL, 1 },
.getsda = { 0x10, STAT, 0 }, .getsda = { 0x10, PORT_STAT, 0 },
}, },
/* type 3: ELV adapter */ /* type 3: ELV adapter */
{ {
.setsda = { 0x02, DATA, 1 }, .setsda = { 0x02, PORT_DATA, 1 },
.setscl = { 0x01, DATA, 1 }, .setscl = { 0x01, PORT_DATA, 1 },
.getsda = { 0x40, STAT, 1 }, .getsda = { 0x40, PORT_STAT, 1 },
.getscl = { 0x08, STAT, 1 }, .getscl = { 0x08, PORT_STAT, 1 },
}, },
/* type 4: ADM1032 evaluation board */ /* type 4: ADM1032 evaluation board */
{ {
.setsda = { 0x02, DATA, 1 }, .setsda = { 0x02, PORT_DATA, 1 },
.setscl = { 0x01, DATA, 1 }, .setscl = { 0x01, PORT_DATA, 1 },
.getsda = { 0x10, STAT, 1 }, .getsda = { 0x10, PORT_STAT, 1 },
.init = { 0xf0, DATA, 0 }, .init = { 0xf0, PORT_DATA, 0 },
.smbus_alert = 1, .smbus_alert = 1,
}, },
/* type 5: ADM1025, ADM1030 and ADM1031 evaluation boards */ /* type 5: ADM1025, ADM1030 and ADM1031 evaluation boards */
{ {
.setsda = { 0x02, DATA, 1 }, .setsda = { 0x02, PORT_DATA, 1 },
.setscl = { 0x01, DATA, 1 }, .setscl = { 0x01, PORT_DATA, 1 },
.getsda = { 0x10, STAT, 1 }, .getsda = { 0x10, PORT_STAT, 1 },
}, },
/* type 6: Barco LPT->DVI (K5800236) adapter */ /* type 6: Barco LPT->DVI (K5800236) adapter */
{ {
.setsda = { 0x02, DATA, 1 }, .setsda = { 0x02, PORT_DATA, 1 },
.setscl = { 0x01, DATA, 1 }, .setscl = { 0x01, PORT_DATA, 1 },
.getsda = { 0x20, STAT, 0 }, .getsda = { 0x20, PORT_STAT, 0 },
.getscl = { 0x40, STAT, 0 }, .getscl = { 0x40, PORT_STAT, 0 },
.init = { 0xfc, DATA, 0 }, .init = { 0xfc, PORT_DATA, 0 },
}, },
/* type 7: One For All JP1 parallel port adapter */ /* type 7: One For All JP1 parallel port adapter */
{ {
.setsda = { 0x01, DATA, 0 }, .setsda = { 0x01, PORT_DATA, 0 },
.setscl = { 0x02, DATA, 0 }, .setscl = { 0x02, PORT_DATA, 0 },
.getsda = { 0x80, STAT, 1 }, .getsda = { 0x80, PORT_STAT, 1 },
.init = { 0x04, DATA, 1 }, .init = { 0x04, PORT_DATA, 1 },
}, },
}; };