From e740b79bb89a67918a4a3d6ff8fa85450e998d16 Mon Sep 17 00:00:00 2001 From: Jonathan Corbet Date: Wed, 5 May 2010 14:28:53 -0600 Subject: [PATCH] --- yaml --- r: 193579 b: refs/heads/master c: 4a28ea9cedaa673b8a1a7f84628d784d020f3b47 h: refs/heads/master i: 193577: 3782190e536c9317c53b1ff28e2de21d0652fa3e 193575: 8991de68b132ae56e309a1bbc6f21de15e83ceb1 v: v3 --- [refs] | 2 +- trunk/drivers/video/via/via_i2c.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 6c3562aaae4d..6859d708a38e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 64a6bd6a570c53f1955eaedf3952dcbe9b62da1d +refs/heads/master: 4a28ea9cedaa673b8a1a7f84628d784d020f3b47 diff --git a/trunk/drivers/video/via/via_i2c.c b/trunk/drivers/video/via/via_i2c.c index febc1dda69c1..84ec2d6e98c4 100644 --- a/trunk/drivers/video/via/via_i2c.c +++ b/trunk/drivers/video/via/via_i2c.c @@ -52,7 +52,7 @@ static void via_i2c_setscl(void *data, int state) val |= 0x80; break; default: - DEBUG_MSG("viafb_i2c: specify wrong i2c type.\n"); + printk(KERN_ERR "viafb_i2c: specify wrong i2c type.\n"); } via_write_reg(adap_data->io_port, adap_data->ioport_index, val); spin_unlock_irqrestore(&i2c_vdev->reg_lock, flags); @@ -104,7 +104,7 @@ static void via_i2c_setsda(void *data, int state) val |= 0x40; break; default: - DEBUG_MSG("viafb_i2c: specify wrong i2c type.\n"); + printk(KERN_ERR "viafb_i2c: specify wrong i2c type.\n"); } via_write_reg(adap_data->io_port, adap_data->ioport_index, val); spin_unlock_irqrestore(&i2c_vdev->reg_lock, flags); @@ -175,8 +175,6 @@ static int create_i2c_bus(struct i2c_adapter *adapter, struct via_port_cfg *adap_cfg, struct pci_dev *pdev) { - DEBUG_MSG(KERN_DEBUG "viafb: creating bus adap=0x%p, algo_bit_data=0x%p, adap_cfg=0x%p\n", adapter, algo, adap_cfg); - algo->setsda = via_i2c_setsda; algo->setscl = via_i2c_setscl; algo->getsda = via_i2c_getsda;