Merge "usb: pd: qpnp-pdphy: move RX handling to hard IRQ" (8063b54c) · Commits · e / devices / android_kernel_sony_msm8998

drivers/usb/pd/policy_engine.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -817,7 +817,7 @@ static struct rx_msg pd_ext_msg_received(struct usbpd pd, u16 header, u8 *buf,
		/* allocate new message if first chunk */
		rx_msg = kzalloc(sizeof(*rx_msg) +
		PD_MSG_EXT_HDR_DATA_SIZE(ext_hdr),
		GFP_KERNEL);
		GFP_ATOMIC);
		if (!rx_msg)
		return NULL;

		@@ -870,7 +870,7 @@ static struct rx_msg pd_ext_msg_received(struct usbpd pd, u16 header, u8 *buf,

		pd->rx_ext_msg = rx_msg;

		req = kzalloc(sizeof(*req), GFP_KERNEL);
		req = kzalloc(sizeof(*req), GFP_ATOMIC);
		if (!req)
		goto queue_rx; /* return what we have anyway */

		@@ -944,7 +944,7 @@ static void phy_msg_received(struct usbpd *pd, enum pd_sop_type sop,
		PD_MSG_HDR_TYPE(header), PD_MSG_HDR_COUNT(header));

		if (!PD_MSG_HDR_IS_EXTENDED(header)) {
		rx_msg = kzalloc(sizeof(*rx_msg) + len, GFP_KERNEL);
		rx_msg = kzalloc(sizeof(*rx_msg) + len, GFP_ATOMIC);
		if (!rx_msg)
		return;

+3 −3

Original line number	Diff line number	Diff line
		@@ -667,7 +667,7 @@ static int pd_phy_bist_mode(u8 bist_mode)
		BIST_MODE_MASK \| BIST_ENABLE, bist_mode \| BIST_ENABLE);
		}

		static irqreturn_t pdphy_msg_rx_irq_thread(int irq, void *data)
		static irqreturn_t pdphy_msg_rx_irq(int irq, void *data)
		{
		u8 size, rx_status, frame_type;
		u8 buf[32];
		@@ -808,8 +808,8 @@ static int pdphy_probe(struct platform_device *pdev)
		return ret;

		ret = pdphy_request_irq(pdphy, pdev->dev.of_node,
		&pdphy->msg_rx_irq, "msg-rx", NULL,
		pdphy_msg_rx_irq_thread, (IRQF_TRIGGER_RISING \| IRQF_ONESHOT));
		&pdphy->msg_rx_irq, "msg-rx", pdphy_msg_rx_irq,
		NULL, (IRQF_TRIGGER_RISING \| IRQF_ONESHOT));
		if (ret < 0)
		return ret;