@@ -20,6 +20,7 @@
#include <linux/kmod.h>
#include <linux/init.h>
#include <linux/pci.h>
+#include <linux/string_choices.h>
#include <linux/vmalloc.h>
#include <linux/firmware.h>
#include <net/checksum.h>
@@ -3036,12 +3037,12 @@ static void flyvideo_gpio(struct bttv *btv)
tuner_type = TUNER_ABSENT; /* No tuner present */
pr_info("%d: FlyVideo Radio=%s RemoteControl=%s Tuner=%d gpio=0x%06x\n",
- btv->c.nr, has_radio ? "yes" : "no",
- has_remote ? "yes" : "no", tuner_type, gpio);
+ btv->c.nr, str_yes_no(has_radio),
+ str_yes_no(has_remote), tuner_type, gpio);
pr_info("%d: FlyVideo LR90=%s tda9821/tda9820=%s capture_only=%s\n",
- btv->c.nr, is_lr90 ? "yes" : "no",
- has_tda9820_tda9821 ? "yes" : "no",
- is_capture_only ? "yes" : "no");
+ btv->c.nr, str_yes_no(is_lr90),
+ str_yes_no(has_tda9820_tda9821),
+ str_yes_no(is_capture_only));
if (tuner_type != UNSET) /* only set if known tuner autodetected, else let insmod option through */
btv->tuner_type = tuner_type;
@@ -3137,7 +3138,7 @@ static void miro_pinnacle_gpio(struct bttv *btv)
if (-1 != msp)
btv->c.type = BTTV_BOARD_PINNACLEPRO;
pr_info("%d: pinnacle/mt: id=%d info=\"%s\" radio=%s\n",
- btv->c.nr, id, info, btv->has_radio ? "yes" : "no");
+ btv->c.nr, id, info, str_yes_no(btv->has_radio));
btv->tuner_type = TUNER_MT2032;
}
}
@@ -4077,8 +4078,8 @@ static void avermedia_eeprom(struct bttv *btv)
} else
pr_cont("Unknown type");
pr_cont(" radio:%s remote control:%s\n",
- tuner_tv_fm ? "yes" : "no",
- btv->has_remote ? "yes" : "no");
+ str_yes_no(tuner_tv_fm),
+ str_yes_no(btv->has_remote));
}
/*
@@ -32,6 +32,7 @@
#include <linux/fs.h>
#include <linux/kernel.h>
#include <linux/sched.h>
+#include <linux/string_choices.h>
#include <linux/interrupt.h>
#include <linux/kdev_t.h>
#include "bttvp.h"
@@ -2983,12 +2984,10 @@ static irqreturn_t bttv_irq(int irq, void *dev_id)
bttv_print_irqbits(stat,astat);
if (stat & BT848_INT_HLOCK)
pr_cont(" HLOC => %s",
- dstat & BT848_DSTATUS_HLOC
- ? "yes" : "no");
+ str_yes_no(dstat & BT848_DSTATUS_HLOC));
if (stat & BT848_INT_VPRES)
pr_cont(" PRES => %s",
- dstat & BT848_DSTATUS_PRES
- ? "yes" : "no");
+ str_yes_no(dstat & BT848_DSTATUS_PRES));
if (stat & BT848_INT_FMTCHG)
pr_cont(" NUML => %s",
dstat & BT848_DSTATUS_NUML
@@ -10,6 +10,7 @@
#include <linux/bitfield.h>
#include <linux/delay.h>
+#include <linux/string_choices.h>
#include <media/i2c/adv7604.h>
#include <media/i2c/adv7842.h>
#include <media/i2c/adv7511.h>
@@ -260,7 +261,7 @@ static void msi_config_show(struct cobalt *cobalt, struct pci_dev *pci_dev)
u32 adrs_l, adrs_h;
pci_read_config_word(pci_dev, 0x52, &ctrl);
- cobalt_info("MSI %s\n", ctrl & 1 ? "enable" : "disable");
+ cobalt_info("MSI %s\n", str_enable_disable(ctrl & 1));
cobalt_info("MSI multiple message: Capable %u. Enable %u\n",
(1 << ((ctrl >> 1) & 7)), (1 << ((ctrl >> 4) & 7)));
if (ctrl & 0x80)
@@ -8,6 +8,7 @@
* Copyright (C) 2008 Andy Walls <awalls@md.metrocast.net>
*/
+#include <linux/string_choices.h>
#include "cx18-driver.h"
#include "cx18-io.h"
#include "cx18-cards.h"
@@ -1010,7 +1011,7 @@ static int cx18_av_s_stream(struct v4l2_subdev *sd, int enable)
{
struct cx18 *cx = v4l2_get_subdevdata(sd);
- CX18_DEBUG_INFO_DEV(sd, "%s output\n", enable ? "enable" : "disable");
+ CX18_DEBUG_INFO_DEV(sd, "%s output\n", str_enable_disable(enable));
if (enable) {
cx18_av_write(cx, 0x115, 0x8c);
cx18_av_write(cx, 0x116, 0x07);
@@ -1115,7 +1116,7 @@ static void log_audio_status(struct cx18 *cx)
}
CX18_INFO_DEV(sd, "Detected audio standard: %s\n", p);
CX18_INFO_DEV(sd, "Audio muted: %s\n",
- (mute_ctl & 0x2) ? "yes" : "no");
+ str_yes_no(mute_ctl & 0x2));
CX18_INFO_DEV(sd, "Audio microcontroller: %s\n",
(download_ctl & 0x10) ? "running" : "stopped");
@@ -41,6 +41,7 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+#include <linux/string_choices.h>
#include <media/dvb_demux.h>
#include <media/dvb_frontend.h>
#include "altera-ci.h"
@@ -282,7 +283,7 @@ static int altera_ci_op_cam(struct dvb_ca_en50221 *en50221, int slot,
mutex_unlock(&inter->fpga_mutex);
ci_dbg_print("%s: %s: addr=[0x%02x], %s=%x\n", __func__,
- (read) ? "read" : "write", addr,
+ str_read_write(read), addr,
(flag == NETUP_CI_FLG_CTL) ? "ctl" : "mem",
(read) ? mem : val);
@@ -11,6 +11,7 @@
#include "cx23885.h"
#include "cimax2.h"
+#include <linux/string_choices.h>
#include <media/dvb_ca_en50221.h>
/* Max transfer size done by I2C transfer functions */
@@ -224,7 +225,7 @@ static int netup_ci_op_cam(struct dvb_ca_en50221 *en50221, int slot,
return -EREMOTEIO;
ci_dbg_print("%s: %s: chipaddr=[0x%x] addr=[0x%02x], %s=%x\n", __func__,
- (read) ? "read" : "write", state->ci_i2c_addr, addr,
+ str_read_write(read), state->ci_i2c_addr, addr,
(flag == NETUP_CI_CTL) ? "ctl" : "mem",
(read) ? mem : data);
@@ -12,6 +12,7 @@
#include <linux/kfifo.h>
#include <linux/slab.h>
+#include <linux/string_choices.h>
#include <media/v4l2-device.h>
#include <media/rc-core.h>
@@ -930,11 +931,11 @@ static int cx23888_ir_log_status(struct v4l2_subdev *sd)
v4l2_info(sd, "IR Receiver:\n");
v4l2_info(sd, "\tEnabled: %s\n",
- cntrl & CNTRL_RXE ? "yes" : "no");
+ str_yes_no(cntrl & CNTRL_RXE));
v4l2_info(sd, "\tDemodulation from a carrier: %s\n",
- cntrl & CNTRL_DMD ? "enabled" : "disabled");
+ str_enabled_disabled(cntrl & CNTRL_DMD));
v4l2_info(sd, "\tFIFO: %s\n",
- cntrl & CNTRL_RFE ? "enabled" : "disabled");
+ str_enabled_disabled(cntrl & CNTRL_RFE));
switch (cntrl & CNTRL_EDG) {
case CNTRL_EDG_NONE:
s = "disabled";
@@ -993,37 +994,37 @@ static int cx23888_ir_log_status(struct v4l2_subdev *sd)
pulse_width_count_to_us(FIFO_RXTX, rxclk),
pulse_width_count_to_ns(FIFO_RXTX, rxclk));
v4l2_info(sd, "\tLow pass filter: %s\n",
- filtr ? "enabled" : "disabled");
+ str_enabled_disabled(filtr));
if (filtr)
v4l2_info(sd, "\tMin acceptable pulse width (LPF): %u us, %u ns\n",
lpf_count_to_us(filtr),
lpf_count_to_ns(filtr));
v4l2_info(sd, "\tPulse width timer timed-out: %s\n",
- stats & STATS_RTO ? "yes" : "no");
+ str_yes_no(stats & STATS_RTO));
v4l2_info(sd, "\tPulse width timer time-out intr: %s\n",
- irqen & IRQEN_RTE ? "enabled" : "disabled");
+ str_enabled_disabled(irqen & IRQEN_RTE));
v4l2_info(sd, "\tFIFO overrun: %s\n",
- stats & STATS_ROR ? "yes" : "no");
+ str_yes_no(stats & STATS_ROR));
v4l2_info(sd, "\tFIFO overrun interrupt: %s\n",
- irqen & IRQEN_ROE ? "enabled" : "disabled");
+ str_enabled_disabled(irqen & IRQEN_ROE));
v4l2_info(sd, "\tBusy: %s\n",
- stats & STATS_RBY ? "yes" : "no");
+ str_yes_no(stats & STATS_RBY));
v4l2_info(sd, "\tFIFO service requested: %s\n",
- stats & STATS_RSR ? "yes" : "no");
+ str_yes_no(stats & STATS_RSR));
v4l2_info(sd, "\tFIFO service request interrupt: %s\n",
- irqen & IRQEN_RSE ? "enabled" : "disabled");
+ str_enabled_disabled(irqen & IRQEN_RSE));
v4l2_info(sd, "IR Transmitter:\n");
v4l2_info(sd, "\tEnabled: %s\n",
- cntrl & CNTRL_TXE ? "yes" : "no");
+ str_yes_no(cntrl & CNTRL_TXE));
v4l2_info(sd, "\tModulation onto a carrier: %s\n",
- cntrl & CNTRL_MOD ? "enabled" : "disabled");
+ str_enabled_disabled(cntrl & CNTRL_MOD));
v4l2_info(sd, "\tFIFO: %s\n",
- cntrl & CNTRL_TFE ? "enabled" : "disabled");
+ str_enabled_disabled(cntrl & CNTRL_TFE));
v4l2_info(sd, "\tFIFO interrupt watermark: %s\n",
cntrl & CNTRL_TIC ? "not empty" : "half full or less");
v4l2_info(sd, "\tOutput pin level inversion %s\n",
- cntrl & CNTRL_IVO ? "yes" : "no");
+ str_yes_no(cntrl & CNTRL_IVO));
v4l2_info(sd, "\tCarrier polarity: %s\n",
cntrl & CNTRL_CPL ? "space:burst mark:noburst"
: "space:noburst mark:burst");
@@ -1037,11 +1038,11 @@ static int cx23888_ir_log_status(struct v4l2_subdev *sd)
pulse_width_count_to_us(FIFO_RXTX, txclk),
pulse_width_count_to_ns(FIFO_RXTX, txclk));
v4l2_info(sd, "\tBusy: %s\n",
- stats & STATS_TBY ? "yes" : "no");
+ str_yes_no(stats & STATS_TBY));
v4l2_info(sd, "\tFIFO service requested: %s\n",
- stats & STATS_TSR ? "yes" : "no");
+ str_yes_no(stats & STATS_TSR));
v4l2_info(sd, "\tFIFO service request interrupt: %s\n",
- irqen & IRQEN_TSE ? "enabled" : "disabled");
+ str_enabled_disabled(irqen & IRQEN_TSE));
return 0;
}
@@ -12,6 +12,7 @@
#include <linux/io.h>
#include <linux/minmax.h>
#include <linux/sprintf.h>
+#include <linux/string_choices.h>
#include <media/media-entity.h>
#include <media/v4l2-ctrls.h>
@@ -244,7 +245,7 @@ static int ipu6_isys_csi2_set_stream(struct v4l2_subdev *sd,
u32 mask = 0;
u32 i;
- dev_dbg(dev, "stream %s CSI2-%u with %u lanes\n", enable ? "on" : "off",
+ dev_dbg(dev, "stream %s CSI2-%u with %u lanes\n", str_on_off(enable),
csi2->port, nlanes);
cfg.port = csi2->port;
@@ -20,6 +20,7 @@
#include "ivtv-gpio.h"
#include "ivtv-controls.h"
#include "ivtv-cards.h"
+#include <linux/string_choices.h>
#include <media/i2c/saa7127.h>
#include <media/tveeprom.h>
#include <media/v4l2-event.h>
@@ -1558,7 +1559,7 @@ static int ivtv_log_status(struct file *file, void *fh)
ivtv_vapi_result(itv, data, CX2341X_OSD_GET_STATE, 0);
data[0] |= (read_reg(0x2a00) >> 7) & 0x40;
IVTV_INFO("Overlay: %s, Alpha: %s, Pixel Format: %s\n",
- data[0] & 1 ? "On" : "Off",
+ str_on_off(data[0] & 1),
alpha_mode[(data[0] >> 1) & 0x3],
pixel_format[(data[0] >> 3) & 0xf]);
}
@@ -14,6 +14,7 @@
#include <linux/module.h>
#include <linux/i2c.h>
#include <linux/i2c-algo-bit.h>
+#include <linux/string_choices.h>
#include "xc2028.h"
#include <media/v4l2-common.h>
@@ -7980,8 +7981,7 @@ int saa7134_board_init2(struct saa7134_dev *dev)
msg.flags = I2C_M_RD;
rc = i2c_transfer(&dev->i2c_adap, &msg, 1);
pr_info("%s: probe IR chip @ i2c 0x%02x: %s\n",
- dev->name, msg.addr,
- (1 == rc) ? "yes" : "no");
+ dev->name, msg.addr, str_yes_no(rc == 1));
if (rc == 1)
dev->has_remote = SAA7134_REMOTE_I2C;
}
@@ -16,6 +16,7 @@
#include <linux/kernel.h>
#include <linux/delay.h>
#include <linux/kthread.h>
+#include <linux/string_choices.h>
#include <linux/suspend.h>
#include <media/v4l2-common.h>
@@ -90,7 +91,7 @@ static int pinnacle_antenna_pwr(struct saa7134_dev *dev, int on)
saa_setl(SAA7134_GPIO_GPSTATUS0 >> 2, (1 << 28));
udelay(10);
ok = saa_readl(SAA7134_GPIO_GPSTATUS0) & (1 << 27);
- pr_debug("%s %s\n", __func__, ok ? "on" : "off");
+ pr_debug("%s %s\n", __func__, str_on_off(ok));
if (!ok)
saa_clearl(SAA7134_GPIO_GPSTATUS0 >> 2, (1 << 26));
@@ -12,6 +12,7 @@
#include <linux/delay.h>
#include <linux/interrupt.h>
#include <linux/slab.h>
+#include <linux/string_choices.h>
#define MODULE_NAME "saa7134"
@@ -895,7 +896,7 @@ void saa7134_probe_i2c_ir(struct saa7134_dev *dev)
rc = i2c_transfer(&dev->i2c_adap, &msg_msi, 1);
input_dbg("probe 0x%02x @ %s: %s\n",
msg_msi.addr, dev->i2c_adap.name,
- (1 == rc) ? "yes" : "no");
+ str_yes_no(rc == 1));
break;
case SAA7134_BOARD_SNAZIO_TVPVR_PRO:
dev->init_data.name = "SnaZio* TVPVR PRO";
@@ -916,7 +917,7 @@ void saa7134_probe_i2c_ir(struct saa7134_dev *dev)
rc = i2c_transfer(&dev->i2c_adap, &msg_msi, 1);
input_dbg("probe 0x%02x @ %s: %s\n",
msg_msi.addr, dev->i2c_adap.name,
- (rc == 1) ? "yes" : "no");
+ str_yes_no(rc == 1));
break;
case SAA7134_BOARD_KWORLD_PC150U:
/* copied and modified from MSI TV@nywhere Plus */
@@ -931,7 +932,7 @@ void saa7134_probe_i2c_ir(struct saa7134_dev *dev)
rc = i2c_transfer(&dev->i2c_adap, &msg_msi, 1);
input_dbg("probe 0x%02x @ %s: %s\n",
msg_msi.addr, dev->i2c_adap.name,
- (1 == rc) ? "yes" : "no");
+ str_yes_no(rc == 1));
break;
case SAA7134_BOARD_HAUPPAUGE_HVR1110:
dev->init_data.name = saa7134_boards[dev->board].name;
@@ -16,6 +16,7 @@
#include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/sort.h>
+#include <linux/string_choices.h>
#include <media/v4l2-common.h>
#include <media/v4l2-event.h>
@@ -619,7 +620,7 @@ static int saa7134_enable_analog_tuner(struct saa7134_dev *dev)
if (ret) {
pr_err("Couldn't change link %s->%s to %s. Error %d\n",
source->name, sink->name,
- flags ? "enabled" : "disabled",
+ str_enabled_disabled(flags),
ret);
return ret;
}
Replace ternary (condition ? "enable" : "disable") syntax with helpers from string_choices.h because: 1. Simple function call with one argument is easier to read. Ternary operator has three arguments and with wrapping might lead to quite long code. 2. Is slightly shorter thus also easier to read. 3. It brings uniformity in the text - same string. 4. Allows deduping by the linker, which results in a smaller binary file. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> --- drivers/media/pci/bt8xx/bttv-cards.c | 17 ++++++------ drivers/media/pci/bt8xx/bttv-driver.c | 7 +++-- drivers/media/pci/cobalt/cobalt-driver.c | 3 ++- drivers/media/pci/cx18/cx18-av-core.c | 5 ++-- drivers/media/pci/cx23885/altera-ci.c | 3 ++- drivers/media/pci/cx23885/cimax2.c | 3 ++- drivers/media/pci/cx23885/cx23888-ir.c | 37 ++++++++++++++------------- drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c | 3 ++- drivers/media/pci/ivtv/ivtv-ioctl.c | 3 ++- drivers/media/pci/saa7134/saa7134-cards.c | 4 +-- drivers/media/pci/saa7134/saa7134-dvb.c | 3 ++- drivers/media/pci/saa7134/saa7134-input.c | 7 ++--- drivers/media/pci/saa7134/saa7134-video.c | 3 ++- 13 files changed, 54 insertions(+), 44 deletions(-)