aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/pci/pt1/pt1.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/pci/pt1/pt1.c')
-rw-r--r--drivers/media/pci/pt1/pt1.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/media/pci/pt1/pt1.c b/drivers/media/pci/pt1/pt1.c
index db887b0c37b1..acc35b42e53c 100644
--- a/drivers/media/pci/pt1/pt1.c
+++ b/drivers/media/pci/pt1/pt1.c
@@ -109,9 +109,6 @@ struct pt1_adapter {
109 int sleep; 109 int sleep;
110}; 110};
111 111
112#define pt1_printk(level, pt1, format, arg...) \
113 dev_printk(level, &(pt1)->pdev->dev, format, ##arg)
114
115static void pt1_write_reg(struct pt1 *pt1, int reg, u32 data) 112static void pt1_write_reg(struct pt1 *pt1, int reg, u32 data)
116{ 113{
117 writel(data, pt1->regs + reg * 4); 114 writel(data, pt1->regs + reg * 4);
@@ -154,7 +151,7 @@ static int pt1_sync(struct pt1 *pt1)
154 return 0; 151 return 0;
155 pt1_write_reg(pt1, 0, 0x00000008); 152 pt1_write_reg(pt1, 0, 0x00000008);
156 } 153 }
157 pt1_printk(KERN_ERR, pt1, "could not sync\n"); 154 dev_err(&pt1->pdev->dev, "could not sync\n");
158 return -EIO; 155 return -EIO;
159} 156}
160 157
@@ -179,7 +176,7 @@ static int pt1_unlock(struct pt1 *pt1)
179 return 0; 176 return 0;
180 schedule_timeout_uninterruptible((HZ + 999) / 1000); 177 schedule_timeout_uninterruptible((HZ + 999) / 1000);
181 } 178 }
182 pt1_printk(KERN_ERR, pt1, "could not unlock\n"); 179 dev_err(&pt1->pdev->dev, "could not unlock\n");
183 return -EIO; 180 return -EIO;
184} 181}
185 182
@@ -193,7 +190,7 @@ static int pt1_reset_pci(struct pt1 *pt1)
193 return 0; 190 return 0;
194 schedule_timeout_uninterruptible((HZ + 999) / 1000); 191 schedule_timeout_uninterruptible((HZ + 999) / 1000);
195 } 192 }
196 pt1_printk(KERN_ERR, pt1, "could not reset PCI\n"); 193 dev_err(&pt1->pdev->dev, "could not reset PCI\n");
197 return -EIO; 194 return -EIO;
198} 195}
199 196
@@ -207,7 +204,7 @@ static int pt1_reset_ram(struct pt1 *pt1)
207 return 0; 204 return 0;
208 schedule_timeout_uninterruptible((HZ + 999) / 1000); 205 schedule_timeout_uninterruptible((HZ + 999) / 1000);
209 } 206 }
210 pt1_printk(KERN_ERR, pt1, "could not reset RAM\n"); 207 dev_err(&pt1->pdev->dev, "could not reset RAM\n");
211 return -EIO; 208 return -EIO;
212} 209}
213 210
@@ -224,7 +221,7 @@ static int pt1_do_enable_ram(struct pt1 *pt1)
224 } 221 }
225 schedule_timeout_uninterruptible((HZ + 999) / 1000); 222 schedule_timeout_uninterruptible((HZ + 999) / 1000);
226 } 223 }
227 pt1_printk(KERN_ERR, pt1, "could not enable RAM\n"); 224 dev_err(&pt1->pdev->dev, "could not enable RAM\n");
228 return -EIO; 225 return -EIO;
229} 226}
230 227