media: saa7134: rc device does not need 'saa7134 IR (' prefix

PATCH New Sean Young 1 participant 1 message Oct 27, 2018

Subsystems (2)

Media (V4L/DVB) SAA7134 VIDEO4LINUX driver

lore

Share & tools

lore

Sean Young

author

2018-10-27 23:09 UTC #0 lore raw

PATCH 1/1 media: saa7134: rc device does not need 'saa7134 IR (' prefix

Before this patch, the rc name is truncated to:

saa7134 IR (Hauppauge WinTV-HVR

Now it is:

Hauppauge WinTV-HVR1150 ATSC/QAM-Hybrid

Signed-off-by Sean Young <[email protected]>

---
 drivers/media/pci/saa7134/saa7134-input.c | 4 +---
 drivers/media/pci/saa7134/saa7134.h       | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

drivers/media/pci/saa7134/saa7134-input.c +1 -3

index 999b2774b220..6e6d68964017 100644
@@ -880,8 +880,6 @@ int saa7134_input_init1(struct saa7134_dev *dev)
 	ir->raw_decode	 = raw_decode;
 
 	/* init input device */
-	snprintf(ir->name, sizeof(ir->name), "saa7134 IR (%s)",
-		 saa7134_boards[dev->board].name);
 	snprintf(ir->phys, sizeof(ir->phys), "pci-%s/ir0",
 		 pci_name(dev->pci));

@@ -893,7 +891,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
 		rc->allowed_protocols = RC_PROTO_BIT_ALL_IR_DECODER;
 	}
 
-	rc->device_name = ir->name;
+	rc->device_name = saa7134_boards[dev->board].name;
 	rc->input_phys = ir->phys;
 	rc->input_id.bustype = BUS_PCI;
 	rc->input_id.version = 1;

drivers/media/pci/saa7134/saa7134.h +0 -1

index 480228456014..1c3f273f7dd2 100644
@@ -123,7 +123,6 @@ struct saa7134_format {
 struct saa7134_card_ir {
 	struct rc_dev		*dev;
 
-	char                    name[32];
 	char                    phys[32];
 	unsigned                users;

Signature · 1 line

2.17.2