aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/via
diff options
context:
space:
mode:
authorJonathan Corbet <corbet@lwn.net>2010-05-05 16:28:53 -0400
committerJonathan Corbet <corbet@lwn.net>2010-05-11 18:07:06 -0400
commit4a28ea9cedaa673b8a1a7f84628d784d020f3b47 (patch)
tree34001f8ddd90bcd6fb3f0933355c4bbde9956a0f /drivers/video/via
parent64a6bd6a570c53f1955eaedf3952dcbe9b62da1d (diff)
viafb: get rid of i2c debug cruft
It's ugly and adds a global.h dependency. Cc: ScottFang@viatech.com.cn Cc: JosephChan@via.com.tw Cc: Harald Welte <laforge@gnumonks.org> Acked-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de> Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Diffstat (limited to 'drivers/video/via')
-rw-r--r--drivers/video/via/via_i2c.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/video/via/via_i2c.c b/drivers/video/via/via_i2c.c
index febc1dda69c1..84ec2d6e98c4 100644
--- a/drivers/video/via/via_i2c.c
+++ b/drivers/video/via/via_i2c.c
@@ -52,7 +52,7 @@ static void via_i2c_setscl(void *data, int state)
52 val |= 0x80; 52 val |= 0x80;
53 break; 53 break;
54 default: 54 default:
55 DEBUG_MSG("viafb_i2c: specify wrong i2c type.\n"); 55 printk(KERN_ERR "viafb_i2c: specify wrong i2c type.\n");
56 } 56 }
57 via_write_reg(adap_data->io_port, adap_data->ioport_index, val); 57 via_write_reg(adap_data->io_port, adap_data->ioport_index, val);
58 spin_unlock_irqrestore(&i2c_vdev->reg_lock, flags); 58 spin_unlock_irqrestore(&i2c_vdev->reg_lock, flags);
@@ -104,7 +104,7 @@ static void via_i2c_setsda(void *data, int state)
104 val |= 0x40; 104 val |= 0x40;
105 break; 105 break;
106 default: 106 default:
107 DEBUG_MSG("viafb_i2c: specify wrong i2c type.\n"); 107 printk(KERN_ERR "viafb_i2c: specify wrong i2c type.\n");
108 } 108 }
109 via_write_reg(adap_data->io_port, adap_data->ioport_index, val); 109 via_write_reg(adap_data->io_port, adap_data->ioport_index, val);
110 spin_unlock_irqrestore(&i2c_vdev->reg_lock, flags); 110 spin_unlock_irqrestore(&i2c_vdev->reg_lock, flags);
@@ -175,8 +175,6 @@ static int create_i2c_bus(struct i2c_adapter *adapter,
175 struct via_port_cfg *adap_cfg, 175 struct via_port_cfg *adap_cfg,
176 struct pci_dev *pdev) 176 struct pci_dev *pdev)
177{ 177{
178 DEBUG_MSG(KERN_DEBUG "viafb: creating bus adap=0x%p, algo_bit_data=0x%p, adap_cfg=0x%p\n", adapter, algo, adap_cfg);
179
180 algo->setsda = via_i2c_setsda; 178 algo->setsda = via_i2c_setsda;
181 algo->setscl = via_i2c_setscl; 179 algo->setscl = via_i2c_setscl;
182 algo->getsda = via_i2c_getsda; 180 algo->getsda = via_i2c_getsda;