[PATCH 00/14] use atomic_dec_not_zero()
complementary definition to atomic_inc_not_zero() featured in lib/fault-inject.c. This small patchset moves it to include/linux/atomic.h using it instead of atomic_add_unless(value, -1, 0) s390 patches were not compile-tested. Fabian Frederick (14): locking/atomic: import atomic_dec_not_zero() drm/exynos: use atomic_dec_not_zero() drm/omap: use atomic_dec_not_zero() m5mols: use atomic_dec_not_zero() omap3isp: use atomic_dec_not_zero() s390/qeth: use atomic_dec_not_zero() PM / RUNTIME: use atomic_dec_not_zero() ipmi: use atomic_dec_not_zero() kdb: use atomic_dec_not_zero() PM / Hibernate: use atomic_dec_not_zero() PM: use atomic_dec_not_zero() s390/topology: use atomic_dec_not_zero() ext4: use atomic_dec_not_zero() xfs: use atomic_dec_not_zero() arch/s390/kernel/topology.c | 2 +- drivers/base/power/runtime.c | 4 ++-- drivers/char/ipmi/ipmi_msghandler.c | 2 +- drivers/gpu/drm/exynos/exynos_drm_fimd.c | 2 +- drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 2 +- drivers/media/i2c/m5mols/m5mols_core.c| 2 +- drivers/media/platform/omap3isp/ispstat.c | 2 +- drivers/s390/net/qeth_core_main.c | 2 +- fs/ext4/ext4.h| 2 +- fs/xfs/xfs_buf.c | 2 +- include/linux/atomic.h| 2 ++ kernel/debug/kdb/kdb_main.c | 2 +- kernel/power/hibernate.c | 4 ++-- kernel/power/user.c | 2 +- lib/fault-inject.c| 2 -- 15 files changed, 17 insertions(+), 17 deletions(-) -- 2.9.3 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 04/14] m5mols: use atomic_dec_not_zero()
instead of atomic_add_unless(value, -1, 0) Signed-off-by: Fabian Frederick --- drivers/media/i2c/m5mols/m5mols_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/i2c/m5mols/m5mols_core.c b/drivers/media/i2c/m5mols/m5mols_core.c index acb804b..3aab2ca 100644 --- a/drivers/media/i2c/m5mols/m5mols_core.c +++ b/drivers/media/i2c/m5mols/m5mols_core.c @@ -337,7 +337,7 @@ int m5mols_wait_interrupt(struct v4l2_subdev *sd, u8 irq_mask, u32 timeout) struct m5mols_info *info = to_m5mols(sd); int ret = wait_event_interruptible_timeout(info->irq_waitq, - atomic_add_unless(&info->irq_done, -1, 0), + atomic_dec_not_zero(&info->irq_done), msecs_to_jiffies(timeout)); if (ret <= 0) return ret ? ret : -ETIMEDOUT; -- 2.9.3 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 05/14] omap3isp: use atomic_dec_not_zero()
instead of atomic_add_unless(value, -1, 0) Signed-off-by: Fabian Frederick --- drivers/media/platform/omap3isp/ispstat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/omap3isp/ispstat.c b/drivers/media/platform/omap3isp/ispstat.c index 47cbc7e..462b1d1 100644 --- a/drivers/media/platform/omap3isp/ispstat.c +++ b/drivers/media/platform/omap3isp/ispstat.c @@ -620,7 +620,7 @@ static int isp_stat_buf_process(struct ispstat *stat, int buf_state) { int ret = STAT_NO_BUF; - if (!atomic_add_unless(&stat->buf_err, -1, 0) && + if (!atomic_dec_not_zero(&stat->buf_err) && buf_state == STAT_BUF_DONE && stat->state == ISPSTAT_ENABLED) { ret = isp_stat_buf_queue(stat); isp_stat_buf_next(stat); -- 2.9.3 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/1 linux-next] v4l2-dv-timings: use swap() in v4l2_calc_aspect_ratio()
Use kernel.h macro definition. Thanks to Julia Lawall for Coccinelle scripting support. Signed-off-by: Fabian Frederick --- drivers/media/v4l2-core/v4l2-dv-timings.c | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-dv-timings.c b/drivers/media/v4l2-core/v4l2-dv-timings.c index 5792192..41a07d6 100644 --- a/drivers/media/v4l2-core/v4l2-dv-timings.c +++ b/drivers/media/v4l2-core/v4l2-dv-timings.c @@ -615,7 +615,6 @@ EXPORT_SYMBOL_GPL(v4l2_detect_gtf); struct v4l2_fract v4l2_calc_aspect_ratio(u8 hor_landscape, u8 vert_portrait) { struct v4l2_fract aspect = { 16, 9 }; - u32 tmp; u8 ratio; /* Nothing filled in, fallback to 16:9 */ @@ -647,9 +646,7 @@ struct v4l2_fract v4l2_calc_aspect_ratio(u8 hor_landscape, u8 vert_portrait) if (hor_landscape) return aspect; /* The aspect ratio is for portrait, so swap numerator and denominator */ - tmp = aspect.denominator; - aspect.denominator = aspect.numerator; - aspect.numerator = tmp; + swap(aspect.denominator, aspect.numerator); return aspect; } EXPORT_SYMBOL_GPL(v4l2_calc_aspect_ratio); -- 2.4.2 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/1 linux-next] saa6588: use swap() in saa6588_i2c_poll()
Use kernel.h macro definition. Thanks to Julia Lawall for Coccinelle scripting support. Signed-off-by: Fabian Frederick --- drivers/media/i2c/saa6588.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/media/i2c/saa6588.c b/drivers/media/i2c/saa6588.c index 2960b5a..2240e0a 100644 --- a/drivers/media/i2c/saa6588.c +++ b/drivers/media/i2c/saa6588.c @@ -301,9 +301,7 @@ static void saa6588_i2c_poll(struct saa6588 *s) first and the last of the 3 bytes block. */ - tmp = tmpbuf[2]; - tmpbuf[2] = tmpbuf[0]; - tmpbuf[0] = tmp; + swap(tmpbuf[2], tmpbuf[0]); /* Map 'Invalid block E' to 'Invalid Block' */ if (blocknum == 6) -- 2.4.2 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/1 linux-next] [media] btcx-risc: use swap() in btcx_sort_clips()
Use kernel.h macro definition. Thanks to Julia Lawall for Coccinelle scripting support. Signed-off-by: Fabian Frederick --- drivers/media/pci/bt8xx/btcx-risc.c | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/media/pci/bt8xx/btcx-risc.c b/drivers/media/pci/bt8xx/btcx-risc.c index 00f0880..57c7f58 100644 --- a/drivers/media/pci/bt8xx/btcx-risc.c +++ b/drivers/media/pci/bt8xx/btcx-risc.c @@ -160,7 +160,6 @@ btcx_align(struct v4l2_rect *win, struct v4l2_clip *clips, unsigned int n, int m void btcx_sort_clips(struct v4l2_clip *clips, unsigned int nclips) { - struct v4l2_clip swap; int i,j,n; if (nclips < 2) @@ -168,9 +167,7 @@ btcx_sort_clips(struct v4l2_clip *clips, unsigned int nclips) for (i = nclips-2; i >= 0; i--) { for (n = 0, j = 0; j <= i; j++) { if (clips[j].c.left > clips[j+1].c.left) { - swap = clips[j]; - clips[j] = clips[j+1]; - clips[j+1] = swap; + swap(clips[j], clips[j + 1]); n++; } } -- 2.4.2 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/1 linux-next] saa7146: use swap() in sort_and_eliminate()
Use kernel.h macro definition. Thanks to Julia Lawall for Coccinelle scripting support. Signed-off-by: Fabian Frederick --- drivers/media/common/saa7146/saa7146_hlp.c | 9 +++-- 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/media/common/saa7146/saa7146_hlp.c b/drivers/media/common/saa7146/saa7146_hlp.c index be746d1..3dc6a83 100644 --- a/drivers/media/common/saa7146/saa7146_hlp.c +++ b/drivers/media/common/saa7146/saa7146_hlp.c @@ -307,7 +307,7 @@ static int calculate_v_scale_registers(struct saa7146_dev *dev, enum v4l2_field /* simple bubble-sort algorithm with duplicate elimination */ static int sort_and_eliminate(u32* values, int* count) { - int low = 0, high = 0, top = 0, temp = 0; + int low = 0, high = 0, top = 0; int cur = 0, next = 0; /* sanity checks */ @@ -318,11 +318,8 @@ static int sort_and_eliminate(u32* values, int* count) /* bubble sort the first @count items of the array @values */ for( top = *count; top > 0; top--) { for( low = 0, high = 1; high < top; low++, high++) { - if( values[low] > values[high] ) { - temp = values[low]; - values[low] = values[high]; - values[high] = temp; - } + if( values[low] > values[high] ) + swap(values[low], values[high]); } } -- 2.4.2 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/1 linux-next] ttusb-dec: use swap() in swap_bytes()
Use kernel.h macro definition. Thanks to Julia Lawall for Coccinelle scripting support. Signed-off-by: Fabian Frederick --- drivers/media/usb/ttusb-dec/ttusb_dec.c | 9 ++--- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/media/usb/ttusb-dec/ttusb_dec.c b/drivers/media/usb/ttusb-dec/ttusb_dec.c index 322b53a..7c3a7c5 100644 --- a/drivers/media/usb/ttusb-dec/ttusb_dec.c +++ b/drivers/media/usb/ttusb-dec/ttusb_dec.c @@ -593,14 +593,9 @@ static void ttusb_dec_process_packet(struct ttusb_dec *dec) static void swap_bytes(u8 *b, int length) { - u8 c; - length -= length % 2; - for (; length; b += 2, length -= 2) { - c = *b; - *b = *(b + 1); - *(b + 1) = c; - } + for (; length; b += 2, length -= 2) + swap(*b, *(b + 1)); } static void ttusb_dec_process_urb_frame(struct ttusb_dec *dec, u8 *b, -- 2.4.2 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/1 linux-next] wl128x: use swap() in fm_rdsparse_swapbytes()
Use kernel.h macro definition. Thanks to Julia Lawall for Coccinelle scripting support. Signed-off-by: Fabian Frederick --- drivers/media/radio/wl128x/fmdrv_common.c | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/media/radio/wl128x/fmdrv_common.c b/drivers/media/radio/wl128x/fmdrv_common.c index 704397f..ebc73b0 100644 --- a/drivers/media/radio/wl128x/fmdrv_common.c +++ b/drivers/media/radio/wl128x/fmdrv_common.c @@ -689,7 +689,6 @@ static void fm_rx_update_af_cache(struct fmdev *fmdev, u8 af) static void fm_rdsparse_swapbytes(struct fmdev *fmdev, struct fm_rdsdata_format *rds_format) { - u8 byte1; u8 index = 0; u8 *rds_buff; @@ -701,9 +700,7 @@ static void fm_rdsparse_swapbytes(struct fmdev *fmdev, if (fmdev->asci_id != 0x6350) { rds_buff = &rds_format->data.groupdatabuff.buff[0]; while (index + 1 < FM_RX_RDS_INFO_FIELD_MAX) { - byte1 = rds_buff[index]; - rds_buff[index] = rds_buff[index + 1]; - rds_buff[index + 1] = byte1; + swap(rds_buff[index], rds_buff[index + 1]); index += 2; } } -- 2.4.2 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 4/7 linux-next] saa7146: replace current->state by set_current_state()
Use helper functions to access current->state. Direct assignments are prone to races and therefore buggy. current->state = TASK_RUNNING can be replaced by __set_current_state() Thanks to Peter Zijlstra for the exact definition of the problem. Suggested-By: Peter Zijlstra Signed-off-by: Fabian Frederick --- drivers/media/common/saa7146/saa7146_vbi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/common/saa7146/saa7146_vbi.c b/drivers/media/common/saa7146/saa7146_vbi.c index 1e71e37..2da9957 100644 --- a/drivers/media/common/saa7146/saa7146_vbi.c +++ b/drivers/media/common/saa7146/saa7146_vbi.c @@ -95,7 +95,7 @@ static int vbi_workaround(struct saa7146_dev *dev) /* prepare to wait to be woken up by the irq-handler */ add_wait_queue(&vv->vbi_wq, &wait); - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); /* start rps1 to enable workaround */ saa7146_write(dev, RPS_ADDR1, dev->d_rps1.dma_handle); @@ -106,7 +106,7 @@ static int vbi_workaround(struct saa7146_dev *dev) DEB_VBI("brs bug workaround %d/1\n", i); remove_wait_queue(&vv->vbi_wq, &wait); - current->state = TASK_RUNNING; + __set_current_state(TASK_RUNNING); /* disable rps1 irqs */ SAA7146_IER_DISABLE(dev,MASK_28); -- 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 00/35 linux-next] constify of_device_id array
This small patchset adds const to of_device_id arrays in drivers branch. Fabian Frederick (35): ata: constify of_device_id array regulator: constify of_device_id array thermal: constify of_device_id array tty/hvc_opal: constify of_device_id array tty: constify of_device_id array power: constify of_device_id array char: constify of_device_id array dma: constify of_device_id array iio: constify of_device_id array misc: constify of_device_id array usb: gadget: constify of_device_id array mtd: constify of_device_id array w1: constify of_device_id array ide: pmac: constify of_device_id array spi: constify of_device_id array video: constify of_device_id array coresight-replicator: constify of_device_id array macintosh: constify of_device_id array virtio_mmio: constify of_device_id array swim3: constify of_device_id array mfd: constify of_device_id array soc: ti: constify of_device_id array [media]: constify of_device_id array Input: constify of_device_id array PCI: constify of_device_id array hwmon: constify of_device_id array reset: sti: constify of_device_id array uio: constify of_device_id array gpu: constify of_device_id array devfreq: constify of_device_id array EDAC: constify of_device_id array clk: constify of_device_id array mmc: constify of_device_id array Staging: octeon: constify of_device_id array pinctrl: constify of_device_id array drivers/ata/pata_macio.c | 2 +- drivers/ata/pata_mpc52xx.c | 2 +- drivers/ata/pata_octeon_cf.c | 2 +- drivers/ata/pata_of_platform.c | 2 +- drivers/ata/sata_fsl.c | 2 +- drivers/ata/sata_mv.c| 2 +- drivers/ata/sata_rcar.c | 2 +- drivers/block/swim3.c| 2 +- drivers/char/hw_random/pasemi-rng.c | 2 +- drivers/char/hw_random/powernv-rng.c | 2 +- drivers/char/hw_random/ppc4xx-rng.c | 2 +- drivers/char/ipmi/ipmi_si_intf.c | 4 ++-- drivers/char/xillybus/xillybus_of.c | 2 +- drivers/clk/clk-palmas.c | 2 +- drivers/clk/st/clkgen-fsyn.c | 2 +- drivers/clk/st/clkgen-mux.c | 8 drivers/clk/st/clkgen-pll.c | 4 ++-- drivers/clk/ti/clk-dra7-atl.c| 2 +- drivers/clk/ti/clockdomain.c | 2 +- drivers/clk/versatile/clk-vexpress-osc.c | 2 +- drivers/coresight/coresight-replicator.c | 2 +- drivers/devfreq/event/exynos-ppmu.c | 2 +- drivers/devfreq/tegra-devfreq.c | 2 +- drivers/dma/bestcomm/bestcomm.c | 4 ++-- drivers/dma/k3dma.c | 2 +- drivers/dma/mmp_pdma.c | 2 +- drivers/dma/mmp_tdma.c | 2 +- drivers/dma/mpc512x_dma.c| 2 +- drivers/dma/mv_xor.c | 2 +- drivers/dma/sirf-dma.c | 2 +- drivers/dma/sun6i-dma.c | 2 +- drivers/edac/highbank_mc_edac.c | 2 +- drivers/edac/mpc85xx_edac.c | 4 ++-- drivers/edac/ppc4xx_edac.c | 2 +- drivers/edac/synopsys_edac.c | 2 +- drivers/gpio/gpio-mpc8xxx.c | 2 +- drivers/gpio/gpio-octeon.c | 2 +- drivers/gpio/gpio-tz1090-pdc.c | 2 +- drivers/gpio/gpio-tz1090.c | 2 +- drivers/gpio/gpio-zynq.c | 2 +- drivers/gpu/drm/armada/armada_crtc.c | 2 +- drivers/gpu/drm/exynos/exynos_drm_dsi.c | 2 +- drivers/gpu/drm/exynos/exynos_hdmi.c | 2 +- drivers/gpu/drm/exynos/exynos_mixer.c| 2 +- drivers/gpu/drm/panel/panel-ld9040.c | 2 +- drivers/gpu/drm/panel/panel-s6e8aa0.c| 2 +- drivers/gpu/drm/sti/sti_dvo.c| 2 +- drivers/gpu/drm/sti/sti_hqvdp.c | 2 +- drivers/gpu/drm/tilcdc/tilcdc_drv.c | 4 ++-- drivers/gpu/drm/tilcdc/tilcdc_panel.c| 2 +- drivers/gpu/drm/tilcdc/tilcdc_slave.c| 4 ++-- drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 4 ++-- drivers/gpu/host1x/dev.c | 2 +- drivers/gpu/host1x/mipi.c| 2 +- drivers/hwmon/pwm-fan.c | 2 +- drivers/hwmon/vexpress.c | 2 +- drivers/ide/pmac.c | 2 +- drivers/iio/common/ssp_sensors/ssp_dev.c | 2 +- drivers/input/misc/palmas-pwrbutton.c| 2 +- drivers/input/misc/regulator-haptic.c| 2 +- drivers/input/misc/tps65218-pwrbutton.c | 2 +- drivers/input/touchscreen/ar1021_i2c.c | 2 +- drivers/macintosh/mediabay.c | 2 +- drivers/macintosh/rack-meter.c | 2 +- drivers/media/i2c/adv7604.c | 2 +- drivers/media/platform/fsl-viu.c | 2 +- drivers/media/platform/soc_camera/rcar_vin.c
[PATCH 23/35 linux-next] [media] constify of_device_id array
of_device_id is always used as const. (See driver.of_match_table and open firmware functions) Signed-off-by: Fabian Frederick --- drivers/media/i2c/adv7604.c | 2 +- drivers/media/platform/fsl-viu.c | 2 +- drivers/media/platform/soc_camera/rcar_vin.c | 2 +- drivers/media/rc/gpio-ir-recv.c | 2 +- drivers/media/rc/ir-hix5hd2.c| 2 +- drivers/media/rc/st_rc.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/media/i2c/adv7604.c b/drivers/media/i2c/adv7604.c index d228b7c..5a7c938 100644 --- a/drivers/media/i2c/adv7604.c +++ b/drivers/media/i2c/adv7604.c @@ -2598,7 +2598,7 @@ static struct i2c_device_id adv7604_i2c_id[] = { }; MODULE_DEVICE_TABLE(i2c, adv7604_i2c_id); -static struct of_device_id adv7604_of_id[] __maybe_unused = { +static const struct of_device_id adv7604_of_id[] __maybe_unused = { { .compatible = "adi,adv7611", .data = &adv7604_chip_info[ADV7611] }, { } }; diff --git a/drivers/media/platform/fsl-viu.c b/drivers/media/platform/fsl-viu.c index bbf4281..5b76e3d 100644 --- a/drivers/media/platform/fsl-viu.c +++ b/drivers/media/platform/fsl-viu.c @@ -1664,7 +1664,7 @@ static int viu_resume(struct platform_device *op) /* * Initialization and module stuff */ -static struct of_device_id mpc512x_viu_of_match[] = { +static const struct of_device_id mpc512x_viu_of_match[] = { { .compatible = "fsl,mpc5121-viu", }, diff --git a/drivers/media/platform/soc_camera/rcar_vin.c b/drivers/media/platform/soc_camera/rcar_vin.c index 279ab9f..bbbaa0a 100644 --- a/drivers/media/platform/soc_camera/rcar_vin.c +++ b/drivers/media/platform/soc_camera/rcar_vin.c @@ -1818,7 +1818,7 @@ static struct soc_camera_host_ops rcar_vin_host_ops = { }; #ifdef CONFIG_OF -static struct of_device_id rcar_vin_of_table[] = { +static const struct of_device_id rcar_vin_of_table[] = { { .compatible = "renesas,vin-r8a7794", .data = (void *)RCAR_GEN2 }, { .compatible = "renesas,vin-r8a7793", .data = (void *)RCAR_GEN2 }, { .compatible = "renesas,vin-r8a7791", .data = (void *)RCAR_GEN2 }, diff --git a/drivers/media/rc/gpio-ir-recv.c b/drivers/media/rc/gpio-ir-recv.c index 229853d..707df54 100644 --- a/drivers/media/rc/gpio-ir-recv.c +++ b/drivers/media/rc/gpio-ir-recv.c @@ -59,7 +59,7 @@ static int gpio_ir_recv_get_devtree_pdata(struct device *dev, return 0; } -static struct of_device_id gpio_ir_recv_of_match[] = { +static const struct of_device_id gpio_ir_recv_of_match[] = { { .compatible = "gpio-ir-receiver", }, { }, }; diff --git a/drivers/media/rc/ir-hix5hd2.c b/drivers/media/rc/ir-hix5hd2.c index b0df629..0a11d55 100644 --- a/drivers/media/rc/ir-hix5hd2.c +++ b/drivers/media/rc/ir-hix5hd2.c @@ -327,7 +327,7 @@ static int hix5hd2_ir_resume(struct device *dev) static SIMPLE_DEV_PM_OPS(hix5hd2_ir_pm_ops, hix5hd2_ir_suspend, hix5hd2_ir_resume); -static struct of_device_id hix5hd2_ir_table[] = { +static const struct of_device_id hix5hd2_ir_table[] = { { .compatible = "hisilicon,hix5hd2-ir", }, {}, }; diff --git a/drivers/media/rc/st_rc.c b/drivers/media/rc/st_rc.c index 0e758ae..50ea09d 100644 --- a/drivers/media/rc/st_rc.c +++ b/drivers/media/rc/st_rc.c @@ -381,7 +381,7 @@ static int st_rc_resume(struct device *dev) static SIMPLE_DEV_PM_OPS(st_rc_pm_ops, st_rc_suspend, st_rc_resume); #ifdef CONFIG_OF -static struct of_device_id st_rc_match[] = { +static const struct of_device_id st_rc_match[] = { { .compatible = "st,comms-irb", }, {}, }; -- 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/1 linux-next] [media] siano: define SRVM_MAX_PID_FILTERS only once
SRVM_MAX_PID_FILTERS was defined in 2 sms_tx_stats structures Signed-off-by: Fabian Frederick --- drivers/media/common/siano/smscoreapi.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/media/common/siano/smscoreapi.h b/drivers/media/common/siano/smscoreapi.h index eb8bd68..4cc39e4 100644 --- a/drivers/media/common/siano/smscoreapi.h +++ b/drivers/media/common/siano/smscoreapi.h @@ -1010,6 +1010,7 @@ struct sms_rx_stats_ex { s32 mrc_in_band_pwr;/* In band power in dBM */ }; +#defineSRVM_MAX_PID_FILTERS 8 /* statistics information returned as response for * SmsHostApiGetstatisticsEx_Req for DVB applications, SMS1100 and up */ @@ -1021,7 +1022,6 @@ struct sms_stats_dvb { struct sms_tx_stats transmission_data; /* Burst parameters, valid only for DVB-H */ -#defineSRVM_MAX_PID_FILTERS 8 struct sms_pid_data pid_data[SRVM_MAX_PID_FILTERS]; }; @@ -1035,7 +1035,6 @@ struct sms_stats_dvb_ex { struct sms_tx_stats transmission_data; /* Burst parameters, valid only for DVB-H */ -#defineSRVM_MAX_PID_FILTERS 8 struct sms_pid_data pid_data[SRVM_MAX_PID_FILTERS]; }; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/1 linux-next] omap_vout: use swap() in omapvid_init()
Use kernel.h macro definition. Signed-off-by: Fabian Frederick --- drivers/media/platform/omap/omap_vout.c | 10 +++--- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c index 17b189a..f09c5f1 100644 --- a/drivers/media/platform/omap/omap_vout.c +++ b/drivers/media/platform/omap/omap_vout.c @@ -445,7 +445,7 @@ static int omapvid_init(struct omap_vout_device *vout, u32 addr) int ret = 0, i; struct v4l2_window *win; struct omap_overlay *ovl; - int posx, posy, outw, outh, temp; + int posx, posy, outw, outh; struct omap_video_timings *timing; struct omapvideo_info *ovid = &vout->vid_info; @@ -468,9 +468,7 @@ static int omapvid_init(struct omap_vout_device *vout, u32 addr) /* Invert the height and width for 90 * and 270 degree rotation */ - temp = outw; - outw = outh; - outh = temp; + swap(outw, outh); posy = (timing->y_res - win->w.width) - win->w.left; posx = win->w.top; break; @@ -481,9 +479,7 @@ static int omapvid_init(struct omap_vout_device *vout, u32 addr) break; case dss_rotation_270_degree: - temp = outw; - outw = outh; - outh = temp; + swap(outw, outh); posy = win->w.left; posx = (timing->x_res - win->w.height) - win->w.top; break; -- 2.4.0 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/1 linux-next] omap_vout: use swap() in omapvid_init()
> On 18 May 2015 at 20:20 Vaibhav Hiremath wrote: > > > > > On Monday 18 May 2015 11:24 PM, Fabian Frederick wrote: > > Use kernel.h macro definition. > > > > Signed-off-by: Fabian Frederick > > --- > > drivers/media/platform/omap/omap_vout.c | 10 +++--- > > 1 file changed, 3 insertions(+), 7 deletions(-) > > > > diff --git a/drivers/media/platform/omap/omap_vout.c > > b/drivers/media/platform/omap/omap_vout.c > > index 17b189a..f09c5f1 100644 > > --- a/drivers/media/platform/omap/omap_vout.c > > +++ b/drivers/media/platform/omap/omap_vout.c > > @@ -445,7 +445,7 @@ static int omapvid_init(struct omap_vout_device *vout, > > u32 addr) > > int ret = 0, i; > > struct v4l2_window *win; > > struct omap_overlay *ovl; > > - int posx, posy, outw, outh, temp; > > + int posx, posy, outw, outh; > > struct omap_video_timings *timing; > > struct omapvideo_info *ovid = &vout->vid_info; > > > > @@ -468,9 +468,7 @@ static int omapvid_init(struct omap_vout_device *vout, > > u32 addr) > > /* Invert the height and width for 90 > > * and 270 degree rotation > > */ > > - temp = outw; > > - outw = outh; > > - outh = temp; > > + swap(outw, outh); > > posy = (timing->y_res - win->w.width) - win->w.left; > > posx = win->w.top; > > break; > > @@ -481,9 +479,7 @@ static int omapvid_init(struct omap_vout_device *vout, > > u32 addr) > > break; > > > > case dss_rotation_270_degree: > > - temp = outw; > > - outw = outh; > > - outh = temp; > > + swap(outw, outh); > > posy = win->w.left; > > posx = (timing->x_res - win->w.height) - win->w.top; > > break; > > > > > Curious to know, > How do you test this? Do you have any OMAP2/3 or AM335x board? > Does this driver still works? Hello Vaibhav, Unfortunately I can't test it. Regards, Fabian > > Thanks, > Vaibhav -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/1] drivers/base/dma-buf.c: replace dma_buf_uninit_debugfs by debugfs_remove_recursive
null test before debugfs_remove_recursive is not needed so one line function dma_buf_uninit_debugfs can be removed. This patch calls debugfs_remove_recursive under CONFIG_DEBUG_FS Cc: Sumit Semwal Cc: Greg Kroah-Hartman Cc: linux-media@vger.kernel.org Signed-off-by: Fabian Frederick --- This is untested. drivers/base/dma-buf.c | 13 +++-- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/base/dma-buf.c b/drivers/base/dma-buf.c index 840c7fa..184c0cb 100644 --- a/drivers/base/dma-buf.c +++ b/drivers/base/dma-buf.c @@ -701,12 +701,6 @@ static int dma_buf_init_debugfs(void) return err; } -static void dma_buf_uninit_debugfs(void) -{ - if (dma_buf_debugfs_dir) - debugfs_remove_recursive(dma_buf_debugfs_dir); -} - int dma_buf_debugfs_create_file(const char *name, int (*write)(struct seq_file *)) { @@ -722,9 +716,6 @@ static inline int dma_buf_init_debugfs(void) { return 0; } -static inline void dma_buf_uninit_debugfs(void) -{ -} #endif static int __init dma_buf_init(void) @@ -738,6 +729,8 @@ subsys_initcall(dma_buf_init); static void __exit dma_buf_deinit(void) { - dma_buf_uninit_debugfs(); +#ifdef CONFIG_DEBUG_FS + debugfs_remove_recursive(dma_buf_debugfs_dir); +#endif } __exitcall(dma_buf_deinit); -- 1.8.4.5 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/1] drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c: remove unnecessary null test before usb_free_urb
Fix checkpatch warning: WARNING: usb_free_urb(NULL) is safe this check is probably not required Cc: Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org Signed-off-by: Fabian Frederick --- drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c index f8a60c1..f166ffc 100644 --- a/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c +++ b/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c @@ -791,8 +791,7 @@ static void ttusb_free_iso_urbs(struct ttusb *ttusb) int i; for (i = 0; i < ISO_BUF_COUNT; i++) - if (ttusb->iso_urb[i]) - usb_free_urb(ttusb->iso_urb[i]); + usb_free_urb(ttusb->iso_urb[i]); pci_free_consistent(NULL, ISO_FRAME_SIZE * FRAMES_PER_ISO_BUF * -- 1.8.4.5 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[RFC 1/1] em28xx: fix configuration warning
This patch tries to solve a problem detected with random configuration. warning: (VIDEO_EM28XX_V4L2) selects VIDEO_MT9V011 which has unmet direct dependencies (MEDIA_SUPPORT && I2C && VIDEO_V4L2 && MEDIA_CAMERA_SUPPORT) Cc: Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org Signed-off-by: Fabian Frederick --- drivers/media/usb/em28xx/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/media/usb/em28xx/Kconfig b/drivers/media/usb/em28xx/Kconfig index f5d7198..d42e1de 100644 --- a/drivers/media/usb/em28xx/Kconfig +++ b/drivers/media/usb/em28xx/Kconfig @@ -7,6 +7,7 @@ config VIDEO_EM28XX config VIDEO_EM28XX_V4L2 tristate "Empia EM28xx analog TV, video capture and/or webcam support" depends on VIDEO_EM28XX + depends on MEDIA_CAMERA_SUPPORT select VIDEOBUF2_VMALLOC select VIDEO_SAA711X if MEDIA_SUBDRV_AUTOSELECT select VIDEO_TVP5150 if MEDIA_SUBDRV_AUTOSELECT -- 1.8.4.5 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/1] r820t: remove unnecessary break after goto
Cc: Mauro Carvalho Chehab Cc: Antti Palosaari Cc: Michael Krufky Cc: linux-media@vger.kernel.org Signed-off-by: Fabian Frederick --- drivers/media/tuners/r820t.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/media/tuners/r820t.c b/drivers/media/tuners/r820t.c index 96ccfeb..6906b16 100644 --- a/drivers/media/tuners/r820t.c +++ b/drivers/media/tuners/r820t.c @@ -2300,7 +2300,6 @@ struct dvb_frontend *r820t_attach(struct dvb_frontend *fe, case 0: /* memory allocation failure */ goto err_no_gate; - break; case 1: /* new tuner instance */ priv->cfg = cfg; -- 1.8.4.5 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/1] dvb-frontends: remove unnecessary break after goto
Cc: Antti Palosaari Cc: Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org Signed-off-by: Fabian Frederick --- drivers/media/dvb-frontends/af9013.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/media/dvb-frontends/af9013.c b/drivers/media/dvb-frontends/af9013.c index fb504f1..ecf6388 100644 --- a/drivers/media/dvb-frontends/af9013.c +++ b/drivers/media/dvb-frontends/af9013.c @@ -470,7 +470,6 @@ static int af9013_statistics_snr_result(struct dvb_frontend *fe) break; default: goto err; - break; } for (i = 0; i < len; i++) { -- 1.8.4.5 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/1] xc2028: remove unnecessary break after goto
Cc: Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org Signed-off-by: Fabian Frederick --- drivers/media/tuners/tuner-xc2028.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/media/tuners/tuner-xc2028.c b/drivers/media/tuners/tuner-xc2028.c index 6ef93ee..565eeeb 100644 --- a/drivers/media/tuners/tuner-xc2028.c +++ b/drivers/media/tuners/tuner-xc2028.c @@ -1489,7 +1489,6 @@ struct dvb_frontend *xc2028_attach(struct dvb_frontend *fe, case 0: /* memory allocation failure */ goto fail; - break; case 1: /* new tuner instance */ priv->ctrl.max_len = 13; -- 1.8.4.5 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/1] xc4000: remove unnecessary break after goto
Cc: Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org Signed-off-by: Fabian Frederick --- drivers/media/tuners/xc4000.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/media/tuners/xc4000.c b/drivers/media/tuners/xc4000.c index 2018bef..d2ee5df 100644 --- a/drivers/media/tuners/xc4000.c +++ b/drivers/media/tuners/xc4000.c @@ -1668,7 +1668,6 @@ struct dvb_frontend *xc4000_attach(struct dvb_frontend *fe, switch (instance) { case 0: goto fail; - break; case 1: /* new tuner instance */ priv->bandwidth = 600; -- 1.8.4.5 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/1] xc5000: remove unnecessary break after goto
Cc: Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org Signed-off-by: Fabian Frederick --- drivers/media/tuners/xc5000.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/media/tuners/xc5000.c b/drivers/media/tuners/xc5000.c index 2b3d514..f059ba2 100644 --- a/drivers/media/tuners/xc5000.c +++ b/drivers/media/tuners/xc5000.c @@ -1302,7 +1302,6 @@ struct dvb_frontend *xc5000_attach(struct dvb_frontend *fe, switch (instance) { case 0: goto fail; - break; case 1: /* new tuner instance */ priv->bandwidth = 600; -- 1.8.4.5 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/1] dvb-frontends: remove unnecessary break after goto
On Tue, 08 Jul 2014 21:35:58 +0300 Antti Palosaari wrote: > Moikka Fabian! > I have no reason to decline that patch (I will apply it) even it has > hardly meaning. But is there now some new tool which warns that kind of > issues? Hello Antti, Thanks :) AFAIK there's still no automatic detection of those cases. Regards, Fabian > > regards > Atnti > > > On 07/08/2014 08:23 PM, Fabian Frederick wrote: > > Cc: Antti Palosaari > > Cc: Mauro Carvalho Chehab > > Cc: linux-media@vger.kernel.org > > Signed-off-by: Fabian Frederick > > --- > > drivers/media/dvb-frontends/af9013.c | 1 - > > 1 file changed, 1 deletion(-) > > > > diff --git a/drivers/media/dvb-frontends/af9013.c > > b/drivers/media/dvb-frontends/af9013.c > > index fb504f1..ecf6388 100644 > > --- a/drivers/media/dvb-frontends/af9013.c > > +++ b/drivers/media/dvb-frontends/af9013.c > > @@ -470,7 +470,6 @@ static int af9013_statistics_snr_result(struct > > dvb_frontend *fe) > > break; > > default: > > goto err; > > - break; > > } > > > > for (i = 0; i < len; i++) { > > > > -- > http://palosaari.fi/ -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/1] drivers/base/dma-buf.c: replace dma_buf_uninit_debugfs by debugfs_remove_recursive
> On 10 July 2014 at 02:34 Greg Kroah-Hartman > wrote: > > > On Fri, Jun 27, 2014 at 10:32:10PM +0200, Fabian Frederick wrote: > > null test before debugfs_remove_recursive is not needed so one line function > > dma_buf_uninit_debugfs can be removed. > > > > This patch calls debugfs_remove_recursive under CONFIG_DEBUG_FS > > > > Cc: Sumit Semwal > > Cc: Greg Kroah-Hartman > > Cc: linux-media@vger.kernel.org > > Signed-off-by: Fabian Frederick > > --- > > > > This is untested. > > > > drivers/base/dma-buf.c | 13 +++-- > > 1 file changed, 3 insertions(+), 10 deletions(-) > > > > diff --git a/drivers/base/dma-buf.c b/drivers/base/dma-buf.c > > index 840c7fa..184c0cb 100644 > > --- a/drivers/base/dma-buf.c > > +++ b/drivers/base/dma-buf.c > > @@ -701,12 +701,6 @@ static int dma_buf_init_debugfs(void) > > return err; > > } > > > > -static void dma_buf_uninit_debugfs(void) > > -{ > > - if (dma_buf_debugfs_dir) > > - debugfs_remove_recursive(dma_buf_debugfs_dir); > > -} > > - > > int dma_buf_debugfs_create_file(const char *name, > > int (*write)(struct seq_file *)) > > { > > @@ -722,9 +716,6 @@ static inline int dma_buf_init_debugfs(void) > > { > > return 0; > > } > > -static inline void dma_buf_uninit_debugfs(void) > > -{ > > -} > > #endif > > > > static int __init dma_buf_init(void) > > @@ -738,6 +729,8 @@ subsys_initcall(dma_buf_init); > > > > static void __exit dma_buf_deinit(void) > > { > > - dma_buf_uninit_debugfs(); > > +#ifdef CONFIG_DEBUG_FS > > + debugfs_remove_recursive(dma_buf_debugfs_dir); > > +#endif > > That ifdef should not be needed at all, right? No ifdefs should be > needed for debugfs code, if it is written correctly :) > Hello Greg, Current dma_buf_init_debugfs and dma_buf_init_uninit_debugfs and related functions in drivers/base/dma-buf.c are only defined under #ifdef CONFIG_DEBUG_FS ; reason for that #ifdef in the patch. I'll send you a fixed version. Thanks, Fabian > thanks, > > greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 00/11 linux-next] drivers: remove unnecessary version.h inclusion
This small patchset removes unnecessary version.h includes detected by versioncheck in drivers branch. Fabian Frederick (11): rsxx: remove unnecessary version.h inclusion skd: remove unnecessary version.h inclusion ipmi: remove unnecessary version.h inclusion input: remove unnecessary version.h inclusion [media] tw68: remove unnecessary version.h inclusion [media] s5p-g2d: remove unnecessary version.h inclusion [media] s5p-mfc: remove unnecessary version.h inclusion [media] vivid: remove unnecessary version.h inclusion [media] uvcvideo: remove unnecessary version.h inclusion GenWQE: remove unnecessary version.h inclusion s390/hmcdrv: remove unnecessary version.h inclusion drivers/block/rsxx/rsxx_priv.h | 1 - drivers/block/skd_main.c | 1 - drivers/char/ipmi/ipmi_ssif.c| 1 - drivers/input/touchscreen/elants_i2c.c | 2 -- drivers/media/pci/tw68/tw68.h| 1 - drivers/media/platform/s5p-g2d/g2d.c | 1 - drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 1 - drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 1 - drivers/media/platform/vivid/vivid-tpg.h | 1 - drivers/media/usb/uvc/uvc_v4l2.c | 1 - drivers/misc/genwqe/card_base.h | 1 - drivers/misc/genwqe/card_sysfs.c | 1 - drivers/s390/char/hmcdrv_mod.c | 1 - 13 files changed, 14 deletions(-) -- 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 05/11 linux-next] [media] tw68: remove unnecessary version.h inclusion
Based on versioncheck. Signed-off-by: Fabian Frederick --- drivers/media/pci/tw68/tw68.h | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/media/pci/tw68/tw68.h b/drivers/media/pci/tw68/tw68.h index 7a7501b..93f2335 100644 --- a/drivers/media/pci/tw68/tw68.h +++ b/drivers/media/pci/tw68/tw68.h @@ -25,7 +25,6 @@ * GNU General Public License for more details. */ -#include #include #include #include -- 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 07/11 linux-next] [media] s5p-mfc: remove unnecessary version.h inclusion
Based on versioncheck. Signed-off-by: Fabian Frederick --- drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 1 - drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c index c6c3452..a9ef843 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c index bd64f1d..68df3cd 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include -- 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 09/11 linux-next] [media] uvcvideo: remove unnecessary version.h inclusion
Based on versioncheck. Signed-off-by: Fabian Frederick --- drivers/media/usb/uvc/uvc_v4l2.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c index 9c5cbcf..43e953f 100644 --- a/drivers/media/usb/uvc/uvc_v4l2.c +++ b/drivers/media/usb/uvc/uvc_v4l2.c @@ -13,7 +13,6 @@ #include #include -#include #include #include #include -- 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 08/11 linux-next] [media] vivid: remove unnecessary version.h inclusion
Based on versioncheck. Signed-off-by: Fabian Frederick --- drivers/media/platform/vivid/vivid-tpg.h | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/media/platform/vivid/vivid-tpg.h b/drivers/media/platform/vivid/vivid-tpg.h index 9dc463a4..bd8b1c7 100644 --- a/drivers/media/platform/vivid/vivid-tpg.h +++ b/drivers/media/platform/vivid/vivid-tpg.h @@ -20,7 +20,6 @@ #ifndef _VIVID_TPG_H_ #define _VIVID_TPG_H_ -#include #include #include #include -- 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 06/11 linux-next] [media] s5p-g2d: remove unnecessary version.h inclusion
Based on versioncheck. Signed-off-by: Fabian Frederick --- drivers/media/platform/s5p-g2d/g2d.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/media/platform/s5p-g2d/g2d.c b/drivers/media/platform/s5p-g2d/g2d.c index 47ba8fb..ec3e124 100644 --- a/drivers/media/platform/s5p-g2d/g2d.c +++ b/drivers/media/platform/s5p-g2d/g2d.c @@ -12,7 +12,6 @@ #include #include -#include #include #include #include -- 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 09/11 linux-next] [media] uvcvideo: remove unnecessary version.h inclusion
> On 30 December 2014 at 00:42 Laurent Pinchart > wrote: > > > Hi Fabian, > > Thank you for the patch. > > On Monday 29 December 2014 15:29:43 Fabian Frederick wrote: > > Based on versioncheck. > > > > Signed-off-by: Fabian Frederick > > Acked-by: Laurent Pinchart > > Should I take the patch in my tree or do you plan to send a pull request for > the whole series elsewhere ? > > > --- > > drivers/media/usb/uvc/uvc_v4l2.c | 1 - > > 1 file changed, 1 deletion(-) > > > > diff --git a/drivers/media/usb/uvc/uvc_v4l2.c > > b/drivers/media/usb/uvc/uvc_v4l2.c index 9c5cbcf..43e953f 100644 > > --- a/drivers/media/usb/uvc/uvc_v4l2.c > > +++ b/drivers/media/usb/uvc/uvc_v4l2.c > > @@ -13,7 +13,6 @@ > > > > #include > > #include > > -#include > > #include > > #include > > #include > > -- > Regards, > > Laurent Pinchart > Hi Laurent, Thanks for the ack, you can take the patch. (Maybe Greg will try later to apply the whole patchset on linux-next. It should not be a problem if some of them are already in.) Regards, Fabian -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 0/7 linux-next] drivers: remove deprecated IRQF_DISABLED
This small patchset removes IRQF_DISABLED from drivers branch. See include/linux/interrupt.h: "This flag is a NOOP and scheduled to be removed" Note: (cross)compiled but untested. Fabian Frederick (7): mv64x60_edac: remove deprecated IRQF_DISABLED ppc4xx_edac: remove deprecated IRQF_DISABLED tw68: remove deprecated IRQF_DISABLED cpqarray: remove deprecated IRQF_DISABLED HSI: remove deprecated IRQF_DISABLED bus: omap_l3_noc: remove deprecated IRQF_DISABLED bus: omap_l3_smx: remove deprecated IRQF_DISABLED drivers/block/cpqarray.c | 2 +- drivers/bus/omap_l3_noc.c | 4 ++-- drivers/bus/omap_l3_smx.c | 10 -- drivers/edac/mv64x60_edac.c| 8 drivers/edac/ppc4xx_edac.c | 4 ++-- drivers/hsi/clients/nokia-modem.c | 4 ++-- drivers/media/pci/tw68/tw68-core.c | 2 +- 7 files changed, 16 insertions(+), 18 deletions(-) -- 1.9.3 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 3/7 linux-next] tw68: remove deprecated IRQF_DISABLED
See include/linux/interrupt.h: "This flag is a NOOP and scheduled to be removed" Signed-off-by: Fabian Frederick --- drivers/media/pci/tw68/tw68-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/pci/tw68/tw68-core.c b/drivers/media/pci/tw68/tw68-core.c index a6fb48c..63f0b64 100644 --- a/drivers/media/pci/tw68/tw68-core.c +++ b/drivers/media/pci/tw68/tw68-core.c @@ -306,7 +306,7 @@ static int tw68_initdev(struct pci_dev *pci_dev, /* get irq */ err = devm_request_irq(&pci_dev->dev, pci_dev->irq, tw68_irq, - IRQF_SHARED | IRQF_DISABLED, dev->name, dev); + IRQF_SHARED, dev->name, dev); if (err < 0) { pr_err("%s: can't get IRQ %d\n", dev->name, pci_dev->irq); -- 1.9.3 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 0/7 linux-next] drivers: remove deprecated IRQF_DISABLED
> On 06 October 2014 at 19:40 Borislav Petkov wrote: > > > On Mon, Oct 06, 2014 at 05:35:47PM +0200, Fabian Frederick wrote: > > This small patchset removes IRQF_DISABLED from drivers branch. > > > > See include/linux/interrupt.h: > > "This flag is a NOOP and scheduled to be removed" > > > > Note: (cross)compiled but untested. > > > > Fabian Frederick (7): > > mv64x60_edac: remove deprecated IRQF_DISABLED > > ppc4xx_edac: remove deprecated IRQF_DISABLED > > For the EDAC bits already applied Michael's patch: > > https://lkml.kernel.org/r/1412159043-7348-1-git-send-email-michael.opdenac...@free-electrons.com > > -- > Regards/Gruss, > Boris. Hi Borislav, You're right, I guess we can forget this patchset. I didn't see it was already done. (nothing in linux-next yet). Sorry for the noise. Regards, Fabian > > Sent from a fat crate under my desk. Formatting is fine. > -- -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 0/7 linux-next] drivers: remove deprecated IRQF_DISABLED
> On 06 October 2014 at 20:46 Borislav Petkov wrote: > > > On Mon, Oct 06, 2014 at 08:33:00PM +0200, Fabian Frederick wrote: > > You're right, I guess we can forget this patchset. > > I didn't see it was already done. (nothing in linux-next yet). > > Not the whole patchset - I was replying only to your two patches > touching code in drivers/edac/. I don't know about the rest but yeah, > checking linux-next is always a good idea. > > Also, did you CC the proper maintainers for the rest of your patches? If > not, do that and see what they have to say. > > HTH. > CC list was ok. I'll keep an eye on linux-next and see with Michael if he has other patches approved in the list. Regards, Fabian > -- > Regards/Gruss, > Boris. > > Sent from a fat crate under my desk. Formatting is fine. > -- -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html