media: streamzap: remove unused struct members

[ Upstream commit 4df69e46c352df9bdbe859824da33428a3ce8a1d ]

These struct members do not serve any purpose.

Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Stable-dep-of: f656cfbc7a29 ("media: streamzap: fix race between device disconnection and urb callback")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/media/rc/streamzap.c b/drivers/media/rc/streamzap.c
index e862a866b9b0f9f77973320f25ab4faac6fa3163..cd994e27362eb114158cc8ec7c5ba5d203aa7c7c 100644 (file)
--- a/drivers/media/rc/streamzap.c
+++ b/drivers/media/rc/streamzap.c
@@ -66,9 +66,6 @@ struct streamzap_ir {
        struct device *dev;
 
        /* usb */
-       struct usb_device       *usbdev;
-       struct usb_interface    *interface;
-       struct usb_endpoint_descriptor *endpoint;
        struct urb              *urb_in;
 
        /* buffer & dma */
@@ -85,7 +82,6 @@ struct streamzap_ir {
        /* start time of signal; necessary for gap tracking */
        ktime_t                 signal_last;
        ktime_t                 signal_start;
-       bool                    timeout_enabled;
 
        char                    phys[64];
 };
@@ -211,8 +207,7 @@ static void sz_process_ir_data(struct streamzap_ir *sz, int len)
                                        .duration = sz->rdev->timeout
                                };
                                sz->idle = true;
-                               if (sz->timeout_enabled)
-                                       sz_push(sz, rawir);
+                               sz_push(sz, rawir);
                        } else {
                                sz_push_full_space(sz, sz->buf_in[i]);
                        }
@@ -273,7 +268,8 @@ static void streamzap_callback(struct urb *urb)
        return;
 }
 
-static struct rc_dev *streamzap_init_rc_dev(struct streamzap_ir *sz)
+static struct rc_dev *streamzap_init_rc_dev(struct streamzap_ir *sz,
+                                           struct usb_device *usbdev)
 {
        struct rc_dev *rdev;
        struct device *dev = sz->dev;
@@ -283,12 +279,12 @@ static struct rc_dev *streamzap_init_rc_dev(struct streamzap_ir *sz)
        if (!rdev)
                goto out;
 
-       usb_make_path(sz->usbdev, sz->phys, sizeof(sz->phys));
+       usb_make_path(usbdev, sz->phys, sizeof(sz->phys));
        strlcat(sz->phys, "/input0", sizeof(sz->phys));
 
        rdev->device_name = "Streamzap PC Remote Infrared Receiver";
        rdev->input_phys = sz->phys;
-       usb_to_input_id(sz->usbdev, &rdev->input_id);
+       usb_to_input_id(usbdev, &rdev->input_id);
        rdev->dev.parent = dev;
        rdev->priv = sz;
        rdev->allowed_protocols = RC_PROTO_BIT_ALL_IR_DECODER;
@@ -319,6 +315,7 @@ static int streamzap_probe(struct usb_interface *intf,
                           const struct usb_device_id *id)
 {
        struct usb_device *usbdev = interface_to_usbdev(intf);
+       struct usb_endpoint_descriptor *endpoint;
        struct usb_host_interface *iface_host;
        struct streamzap_ir *sz = NULL;
        int retval = -ENOMEM;
@@ -329,9 +326,6 @@ static int streamzap_probe(struct usb_interface *intf,
        if (!sz)
                return -ENOMEM;
 
-       sz->usbdev = usbdev;
-       sz->interface = intf;
-
        /* Check to ensure endpoint information matches requirements */
        iface_host = intf->cur_altsetting;
 
@@ -342,22 +336,22 @@ static int streamzap_probe(struct usb_interface *intf,
                goto free_sz;
        }
 
-       sz->endpoint = &(iface_host->endpoint[0].desc);
-       if (!usb_endpoint_dir_in(sz->endpoint)) {
+       endpoint = &iface_host->endpoint[0].desc;
+       if (!usb_endpoint_dir_in(endpoint)) {
                dev_err(&intf->dev, "%s: endpoint doesn't match input device 02%02x\n",
-                       __func__, sz->endpoint->bEndpointAddress);
+                       __func__, endpoint->bEndpointAddress);
                retval = -ENODEV;
                goto free_sz;
        }
 
-       if (!usb_endpoint_xfer_int(sz->endpoint)) {
+       if (!usb_endpoint_xfer_int(endpoint)) {
                dev_err(&intf->dev, "%s: endpoint attributes don't match xfer 02%02x\n",
-                       __func__, sz->endpoint->bmAttributes);
+                       __func__, endpoint->bmAttributes);
                retval = -ENODEV;
                goto free_sz;
        }
 
-       pipe = usb_rcvintpipe(usbdev, sz->endpoint->bEndpointAddress);
+       pipe = usb_rcvintpipe(usbdev, endpoint->bEndpointAddress);
        maxp = usb_maxpacket(usbdev, pipe, usb_pipeout(pipe));
 
        if (maxp == 0) {
@@ -379,14 +373,13 @@ static int streamzap_probe(struct usb_interface *intf,
        sz->dev = &intf->dev;
        sz->buf_in_len = maxp;
 
-       sz->rdev = streamzap_init_rc_dev(sz);
+       sz->rdev = streamzap_init_rc_dev(sz, usbdev);
        if (!sz->rdev)
                goto rc_dev_fail;
 
        sz->idle = true;
        sz->decoder_state = PulseSpace;
        /* FIXME: don't yet have a way to set this */
-       sz->timeout_enabled = true;
        sz->rdev->timeout = SZ_TIMEOUT * SZ_RESOLUTION;
        #if 0
        /* not yet supported, depends on patches from maxim */
@@ -399,8 +392,7 @@ static int streamzap_probe(struct usb_interface *intf,
 
        /* Complete final initialisations */
        usb_fill_int_urb(sz->urb_in, usbdev, pipe, sz->buf_in,
-                        maxp, (usb_complete_t)streamzap_callback,
-                        sz, sz->endpoint->bInterval);
+                        maxp, streamzap_callback, sz, endpoint->bInterval);
        sz->urb_in->transfer_dma = sz->dma_in;
        sz->urb_in->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
 
@@ -441,7 +433,6 @@ static void streamzap_disconnect(struct usb_interface *interface)
        if (!sz)
                return;
 
-       sz->usbdev = NULL;
        rc_unregister_device(sz->rdev);
        usb_kill_urb(sz->urb_in);
        usb_free_urb(sz->urb_in);