aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/pci/ttpci/av7110_hw.c8
-rw-r--r--drivers/media/pci/ttpci/av7110_hw.h12
2 files changed, 10 insertions, 10 deletions
diff --git a/drivers/media/pci/ttpci/av7110_hw.c b/drivers/media/pci/ttpci/av7110_hw.c
index 041687abd759..b2b79bb73917 100644
--- a/drivers/media/pci/ttpci/av7110_hw.c
+++ b/drivers/media/pci/ttpci/av7110_hw.c
@@ -53,11 +53,11 @@
53 by Nathan Laredo <laredo@gnu.org> */ 53 by Nathan Laredo <laredo@gnu.org> */
54 54
55int av7110_debiwrite(struct av7110 *av7110, u32 config, 55int av7110_debiwrite(struct av7110 *av7110, u32 config,
56 int addr, u32 val, int count) 56 int addr, u32 val, unsigned int count)
57{ 57{
58 struct saa7146_dev *dev = av7110->dev; 58 struct saa7146_dev *dev = av7110->dev;
59 59
60 if (count <= 0 || count > 32764) { 60 if (count > 32764) {
61 printk("%s: invalid count %d\n", __func__, count); 61 printk("%s: invalid count %d\n", __func__, count);
62 return -1; 62 return -1;
63 } 63 }
@@ -75,12 +75,12 @@ int av7110_debiwrite(struct av7110 *av7110, u32 config,
75 return 0; 75 return 0;
76} 76}
77 77
78u32 av7110_debiread(struct av7110 *av7110, u32 config, int addr, int count) 78u32 av7110_debiread(struct av7110 *av7110, u32 config, int addr, unsigned int count)
79{ 79{
80 struct saa7146_dev *dev = av7110->dev; 80 struct saa7146_dev *dev = av7110->dev;
81 u32 result = 0; 81 u32 result = 0;
82 82
83 if (count > 32764 || count <= 0) { 83 if (count > 32764) {
84 printk("%s: invalid count %d\n", __func__, count); 84 printk("%s: invalid count %d\n", __func__, count);
85 return 0; 85 return 0;
86 } 86 }
diff --git a/drivers/media/pci/ttpci/av7110_hw.h b/drivers/media/pci/ttpci/av7110_hw.h
index 1634aba5cb84..ccb148059406 100644
--- a/drivers/media/pci/ttpci/av7110_hw.h
+++ b/drivers/media/pci/ttpci/av7110_hw.h
@@ -377,14 +377,14 @@ extern int av7110_fw_request(struct av7110 *av7110, u16 *request_buf,
377 377
378/* DEBI (saa7146 data extension bus interface) access */ 378/* DEBI (saa7146 data extension bus interface) access */
379extern int av7110_debiwrite(struct av7110 *av7110, u32 config, 379extern int av7110_debiwrite(struct av7110 *av7110, u32 config,
380 int addr, u32 val, int count); 380 int addr, u32 val, unsigned int count);
381extern u32 av7110_debiread(struct av7110 *av7110, u32 config, 381extern u32 av7110_debiread(struct av7110 *av7110, u32 config,
382 int addr, int count); 382 int addr, unsigned int count);
383 383
384 384
385/* DEBI during interrupt */ 385/* DEBI during interrupt */
386/* single word writes */ 386/* single word writes */
387static inline void iwdebi(struct av7110 *av7110, u32 config, int addr, u32 val, int count) 387static inline void iwdebi(struct av7110 *av7110, u32 config, int addr, u32 val, unsigned int count)
388{ 388{
389 av7110_debiwrite(av7110, config, addr, val, count); 389 av7110_debiwrite(av7110, config, addr, val, count);
390} 390}
@@ -397,7 +397,7 @@ static inline void mwdebi(struct av7110 *av7110, u32 config, int addr,
397 av7110_debiwrite(av7110, config, addr, 0, count); 397 av7110_debiwrite(av7110, config, addr, 0, count);
398} 398}
399 399
400static inline u32 irdebi(struct av7110 *av7110, u32 config, int addr, u32 val, int count) 400static inline u32 irdebi(struct av7110 *av7110, u32 config, int addr, u32 val, unsigned int count)
401{ 401{
402 u32 res; 402 u32 res;
403 403
@@ -408,7 +408,7 @@ static inline u32 irdebi(struct av7110 *av7110, u32 config, int addr, u32 val, i
408} 408}
409 409
410/* DEBI outside interrupts, only for count <= 4! */ 410/* DEBI outside interrupts, only for count <= 4! */
411static inline void wdebi(struct av7110 *av7110, u32 config, int addr, u32 val, int count) 411static inline void wdebi(struct av7110 *av7110, u32 config, int addr, u32 val, unsigned int count)
412{ 412{
413 unsigned long flags; 413 unsigned long flags;
414 414
@@ -417,7 +417,7 @@ static inline void wdebi(struct av7110 *av7110, u32 config, int addr, u32 val, i
417 spin_unlock_irqrestore(&av7110->debilock, flags); 417 spin_unlock_irqrestore(&av7110->debilock, flags);
418} 418}
419 419
420static inline u32 rdebi(struct av7110 *av7110, u32 config, int addr, u32 val, int count) 420static inline u32 rdebi(struct av7110 *av7110, u32 config, int addr, u32 val, unsigned int count)
421{ 421{
422 unsigned long flags; 422 unsigned long flags;
423 u32 res; 423 u32 res;