diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2008-08-02 11:54:14 -0400 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2008-08-22 19:49:44 -0400 |
commit | dd797d81d3d7da31a50031f2741b93327ed22260 (patch) | |
tree | 22b4479e71b48666c3b76c97473758c1b3006441 /drivers/pcmcia/o2micro.h | |
parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) |
pcmcia: use dev_printk and dev_dbg in yenta_socket
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia/o2micro.h')
-rw-r--r-- | drivers/pcmcia/o2micro.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/pcmcia/o2micro.h b/drivers/pcmcia/o2micro.h index a234ce1967a3..5554015a7813 100644 --- a/drivers/pcmcia/o2micro.h +++ b/drivers/pcmcia/o2micro.h | |||
@@ -140,7 +140,8 @@ static int o2micro_override(struct yenta_socket *socket) | |||
140 | a = config_readb(socket, O2_RESERVED1); | 140 | a = config_readb(socket, O2_RESERVED1); |
141 | b = config_readb(socket, O2_RESERVED2); | 141 | b = config_readb(socket, O2_RESERVED2); |
142 | 142 | ||
143 | printk(KERN_INFO "Yenta O2: res at 0x94/0xD4: %02x/%02x\n", a, b); | 143 | dev_printk(KERN_INFO, &socket->dev->dev, |
144 | "O2: res at 0x94/0xD4: %02x/%02x\n", a, b); | ||
144 | 145 | ||
145 | switch (socket->dev->device) { | 146 | switch (socket->dev->device) { |
146 | /* | 147 | /* |
@@ -153,7 +154,9 @@ static int o2micro_override(struct yenta_socket *socket) | |||
153 | case PCI_DEVICE_ID_O2_6812: | 154 | case PCI_DEVICE_ID_O2_6812: |
154 | case PCI_DEVICE_ID_O2_6832: | 155 | case PCI_DEVICE_ID_O2_6832: |
155 | case PCI_DEVICE_ID_O2_6836: | 156 | case PCI_DEVICE_ID_O2_6836: |
156 | printk(KERN_INFO "Yenta O2: old bridge, disabling read prefetch/write burst\n"); | 157 | dev_printk(KERN_INFO, &socket->dev->dev, |
158 | "Yenta O2: old bridge, disabling read " | ||
159 | "prefetch/write burst\n"); | ||
157 | config_writeb(socket, O2_RESERVED1, | 160 | config_writeb(socket, O2_RESERVED1, |
158 | a & ~(O2_RES_READ_PREFETCH | O2_RES_WRITE_BURST)); | 161 | a & ~(O2_RES_READ_PREFETCH | O2_RES_WRITE_BURST)); |
159 | config_writeb(socket, O2_RESERVED2, | 162 | config_writeb(socket, O2_RESERVED2, |
@@ -161,7 +164,8 @@ static int o2micro_override(struct yenta_socket *socket) | |||
161 | break; | 164 | break; |
162 | 165 | ||
163 | default: | 166 | default: |
164 | printk(KERN_INFO "Yenta O2: enabling read prefetch/write burst\n"); | 167 | dev_printk(KERN_INFO , &socket->dev->dev, |
168 | "O2: enabling read prefetch/write burst\n"); | ||
165 | config_writeb(socket, O2_RESERVED1, | 169 | config_writeb(socket, O2_RESERVED1, |
166 | a | O2_RES_READ_PREFETCH | O2_RES_WRITE_BURST); | 170 | a | O2_RES_READ_PREFETCH | O2_RES_WRITE_BURST); |
167 | config_writeb(socket, O2_RESERVED2, | 171 | config_writeb(socket, O2_RESERVED2, |