Merge "msm: arm64: remove return value related compiler bug fixes" (60305124) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/bus/mhi/controllers/mhi_qcom.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -616,7 +616,10 @@ static struct mhi_controller mhi_register_controller(struct pci_dev pci_dev)
		mhi_cntrl->fw_image = firmware_info->fw_image;
		mhi_cntrl->edl_image = firmware_info->edl_image;

		sysfs_create_group(&mhi_cntrl->mhi_dev->dev.kobj, &mhi_qcom_group);
		ret = sysfs_create_group(&mhi_cntrl->mhi_dev->dev.kobj,
		&mhi_qcom_group);
		if (ret)
		goto error_register;

		return mhi_cntrl;

+6 −2

Original line number	Diff line number	Diff line
		@@ -129,11 +129,12 @@ static void dp_gpio_hpd_work(struct work_struct *work)
		struct delayed_work *dw = to_delayed_work(work);
		struct dp_gpio_hpd_private *gpio_hpd = container_of(dw,
		struct dp_gpio_hpd_private, work);
		int ret;

		if (gpio_hpd->hpd) {
		devm_free_irq(gpio_hpd->dev,
		gpio_hpd->irq, gpio_hpd);
		devm_request_threaded_irq(gpio_hpd->dev,
		ret = devm_request_threaded_irq(gpio_hpd->dev,
		gpio_hpd->irq, NULL,
		dp_gpio_isr,
		IRQF_TRIGGER_FALLING \| IRQF_ONESHOT,
		@@ -142,13 +143,16 @@ static void dp_gpio_hpd_work(struct work_struct *work)
		} else {
		devm_free_irq(gpio_hpd->dev,
		gpio_hpd->irq, gpio_hpd);
		devm_request_threaded_irq(gpio_hpd->dev,
		ret = devm_request_threaded_irq(gpio_hpd->dev,
		gpio_hpd->irq, NULL,
		dp_gpio_isr,
		IRQF_TRIGGER_RISING \| IRQF_ONESHOT,
		"dp-gpio-intp", gpio_hpd);
		dp_gpio_hpd_connect(gpio_hpd, false);
		}

		if (ret < 0)
		pr_err("Cannot claim IRQ dp-gpio-intp\n");
		}

		static int dp_gpio_hpd_simulate_connect(struct dp_hpd *dp_hpd, bool hpd)

+1 −1

Original line number	Diff line number	Diff line
		@@ -1229,7 +1229,7 @@ static inline bool sde_hw_sspp_multirect_enabled(const struct sde_sspp_cfg *cfg)
		test_bit(SDE_SSPP_SMART_DMA_V2p5, &cfg->features);
		}

		static inline sde_hw_intf_te_supported(const struct sde_mdss_cfg *sde_cfg)
		static inline bool sde_hw_intf_te_supported(const struct sde_mdss_cfg *sde_cfg)
		{
		return test_bit(SDE_INTF_TE, &(sde_cfg->intf[0].features));
		}