The patch titled dma: cases IPU_PIX_FMT_BGRA32, BGR32 and ABGR32 are the same in ipu_ch_param_set_size() has been removed from the -mm tree. Its filename was dma-cases-ipu_pix_fmt_bgra32-bgr32-and-abgr32-are-the-same-in-ipu_ch_param_set_size.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: dma: cases IPU_PIX_FMT_BGRA32, BGR32 and ABGR32 are the same in ipu_ch_param_set_size() From: Roel Kluin <roel.kluin@xxxxxxxxx> In these cases the same statements are executed. Signed-off-by: Roel Kluin <roel.kluin@xxxxxxxxx> Acked-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx> Cc: Dan Williams <dan.j.williams@xxxxxxxxx> Cc: Maciej Sosnowski <maciej.sosnowski@xxxxxxxxx Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/dma/ipu/ipu_idmac.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff -puN drivers/dma/ipu/ipu_idmac.c~dma-cases-ipu_pix_fmt_bgra32-bgr32-and-abgr32-are-the-same-in-ipu_ch_param_set_size drivers/dma/ipu/ipu_idmac.c --- a/drivers/dma/ipu/ipu_idmac.c~dma-cases-ipu_pix_fmt_bgra32-bgr32-and-abgr32-are-the-same-in-ipu_ch_param_set_size +++ a/drivers/dma/ipu/ipu_idmac.c @@ -348,6 +348,7 @@ static void ipu_ch_param_set_size(union break; case IPU_PIX_FMT_BGRA32: case IPU_PIX_FMT_BGR32: + case IPU_PIX_FMT_ABGR32: params->ip.bpp = 0; params->ip.pfs = 4; params->ip.npb = 7; @@ -376,20 +377,6 @@ static void ipu_ch_param_set_size(union params->ip.wid2 = 7; /* Blue bit width - 1 */ params->ip.wid3 = 7; /* Alpha bit width - 1 */ break; - case IPU_PIX_FMT_ABGR32: - params->ip.bpp = 0; - params->ip.pfs = 4; - params->ip.npb = 7; - params->ip.sat = 2; /* SAT = 32-bit access */ - params->ip.ofs0 = 8; /* Red bit offset */ - params->ip.ofs1 = 16; /* Green bit offset */ - params->ip.ofs2 = 24; /* Blue bit offset */ - params->ip.ofs3 = 0; /* Alpha bit offset */ - params->ip.wid0 = 7; /* Red bit width - 1 */ - params->ip.wid1 = 7; /* Green bit width - 1 */ - params->ip.wid2 = 7; /* Blue bit width - 1 */ - params->ip.wid3 = 7; /* Alpha bit width - 1 */ - break; case IPU_PIX_FMT_UYVY: params->ip.bpp = 2; params->ip.pfs = 6; _ Patches currently in -mm which might be from roel.kluin@xxxxxxxxx are linux-next.patch acpi-fix-confusion-in-acpi_evaluate_string-in-comment.patch asus-acpi-remove-duplicate-comparison-of-asus_model-strings.patch thinkpad-acpi-wrong-thermal-attribute_group-removed-in-thermal_exit.patch gemini-wrong-registers-used-to-set-reg_level-in-gpio_set_irq_type.patch mx1-mx2-einval-overwritten-in-second-iteration-in-mxc_gpio_setup_multiple_pins.patch powerpc-sky-cpu-redundant-or-incorrect-tests-on-unsigned.patch drivers-gpu-drm-drm_crtc_helperc-fix-setting-of-fb_changed-in-drm_crtc_helper_set_config.patch ia64-wrong-attribute-of-hub-chip-written-in-uv_setup.patch mtd-hot-spin-and-code-duplication-in-nand_bcm_umi_bch_read_oobecc.patch mtd-change-positive-error-return-into-negative-in-mtd_do_writeoob.patch hisax-timeout-off-by-one-in-waitrecmsg.patch misdn-positive-error-return-should-be-negative-in-mode_hfcmulti.patch drivers-scsi-fnic-fnic_scsic-clean-up.patch drivers-scsi-gdthc-fix-buffer-overflow.patch drivers-scsi-lpfc-lpfc_vportc-fix-read-buffer-overflow.patch osst-fix-read-buffer-overflow.patch gdth-unmap-ccb_phys-when-scsi_add_host-fails-in-gdth_eisa_probe_one.patch ncr5380-bit-mr_dma_mode-set-twice-in-ncr5380_transfer_dma.patch scsi-pmcraid-redundant-check-in-pmcraid_check_ioctl_buffer.patch dc395x-decrease-iteration-for-tag_number-of-max_command-in-start_scsi.patch mpt2sas-fix-confusion-in-_scsih_sas_device_status_change_event.patch lpfc-two-branches-the-same-in-lpfc_decode_firmware_rev.patch lpfc-positive-error-return-into-negative.patch qla2xxx-negative-error-return-in-qla2x00_change_queue_depth.patch paride-fix-off-by-one-test.patch musb-test-always-evaluates-to-false.patch frv-duplicate-output_buffer-of-e03.patch frv-duplicate-output_buffer-of-e03-checkpatch-fixes.patch alpha-ptr_err-overwrites-einval-in-syscall-osf_mount.patch cryptocop-fix-assertion-in-create_output_descriptors.patch cris-v32-typo-in-crisv32_arbiter_unwatch.patch asiliantfb-fix-test-of-unsigned-in-asiliant_calc_dclk2.patch w1-fix-test-in-ds2482_wait_1wire_idle.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html