V4L/DVB (6594): Add tuner_err macro
Some tuners, like xc3028, need to print error messages. Instead of declaring local macros, create a tuner global macro for printing tuner errors. To preserve CodingStyle on all tuner_macros, a few CodingStyle violations were fixed at the other macros: - lines with more than 80 columns - two statements at the same line The patch also removes the CodingStyle violation of having emacs declarations inside de source code (CodingStyle chapter 18). Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
parent
f380e1d2c9
commit
98883cdcb5
|
@ -73,22 +73,24 @@ struct tuner {
|
|||
|
||||
#define tuner_warn(fmt, arg...) do { \
|
||||
printk(KERN_WARNING "%s %d-%04x: " fmt, PREFIX, \
|
||||
i2c_adapter_id(t->i2c->adapter), t->i2c->addr , ##arg); } while (0)
|
||||
i2c_adapter_id(t->i2c->adapter), t->i2c->addr, ##arg); \
|
||||
} while (0)
|
||||
|
||||
#define tuner_info(fmt, arg...) do { \
|
||||
printk(KERN_INFO "%s %d-%04x: " fmt, PREFIX, \
|
||||
i2c_adapter_id(t->i2c->adapter), t->i2c->addr , ##arg); } while (0)
|
||||
i2c_adapter_id(t->i2c->adapter), t->i2c->addr , ##arg); \
|
||||
} while (0)
|
||||
|
||||
#define tuner_err(fmt, arg...) do { \
|
||||
printk(KERN_ERR "%s %d-%04x: " fmt, PREFIX, \
|
||||
i2c_adapter_id(t->i2c->adapter), t->i2c->addr , ##arg); \
|
||||
} while (0)
|
||||
|
||||
#define tuner_dbg(fmt, arg...) do { \
|
||||
extern int tuner_debug; \
|
||||
if (tuner_debug) \
|
||||
printk(KERN_DEBUG "%s %d-%04x: " fmt, PREFIX, \
|
||||
i2c_adapter_id(t->i2c->adapter), t->i2c->addr , ##arg); } while (0)
|
||||
i2c_adapter_id(t->i2c->adapter), t->i2c->addr , ##arg); \
|
||||
} while (0)
|
||||
|
||||
#endif /* __TUNER_DRIVER_H__ */
|
||||
|
||||
/*
|
||||
* Overrides for Emacs so that we follow Linus's tabbing style.
|
||||
* ---------------------------------------------------------------------------
|
||||
* Local variables:
|
||||
* c-basic-offset: 8
|
||||
* End:
|
||||
*/
|
||||
|
|
|
@ -49,22 +49,28 @@ static inline int tuner_i2c_xfer_recv(struct tuner_i2c_props *props, char *buf,
|
|||
#ifndef __TUNER_DRIVER_H__
|
||||
#define tuner_warn(fmt, arg...) do { \
|
||||
printk(KERN_WARNING "%s %d-%04x: " fmt, PREFIX, \
|
||||
i2c_adapter_id(priv->i2c_props.adap), priv->i2c_props.addr , ##arg); } while (0)
|
||||
i2c_adapter_id(priv->i2c_props.adap), \
|
||||
priv->i2c_props.addr, ##arg); \
|
||||
} while (0)
|
||||
|
||||
#define tuner_info(fmt, arg...) do { \
|
||||
printk(KERN_INFO "%s %d-%04x: " fmt, PREFIX, \
|
||||
i2c_adapter_id(priv->i2c_props.adap), priv->i2c_props.addr , ##arg); } while (0)
|
||||
i2c_adapter_id(priv->i2c_props.adap), \
|
||||
priv->i2c_props.addr , ##arg); \
|
||||
} while (0)
|
||||
|
||||
#define tuner_err(fmt, arg...) do { \
|
||||
printk(KERN_ERR "%s %d-%04x: " fmt, PREFIX, \
|
||||
i2c_adapter_id(priv->i2c_props.adap), \
|
||||
priv->i2c_props.addr , ##arg); \
|
||||
} while (0)
|
||||
|
||||
#define tuner_dbg(fmt, arg...) do { \
|
||||
if ((debug)) \
|
||||
printk(KERN_DEBUG "%s %d-%04x: " fmt, PREFIX, \
|
||||
i2c_adapter_id(priv->i2c_props.adap), priv->i2c_props.addr , ##arg); } while (0)
|
||||
i2c_adapter_id(priv->i2c_props.adap), \
|
||||
priv->i2c_props.addr , ##arg); \
|
||||
} while (0)
|
||||
#endif /* __TUNER_DRIVER_H__ */
|
||||
|
||||
#endif /* __TUNER_I2C_H__ */
|
||||
|
||||
/*
|
||||
* Overrides for Emacs so that we follow Linus's tabbing style.
|
||||
* ---------------------------------------------------------------------------
|
||||
* Local variables:
|
||||
* c-basic-offset: 8
|
||||
* End:
|
||||
*/
|
||||
|
|
Loading…
Reference in a new issue