V4L/DVB (10238): pvrusb2: Change sysfs serial number handling

Use the new pvrusb2 internal API to grab the device identifier, rather
than generating it directly.  This unifies some code and make possible
use of that identifier in places other than sysfs.

Signed-off-by: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 2 insertions, 10 deletions

diff --git a/drivers/media/video/pvrusb2/pvrusb2-sysfs.c b/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
index e641cd971453..e20ba1e6e0ea 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
@@ -627,16 +627,8 @@ static void class_dev_create(struct pvr2_sysfs *sfp,
         pvr2_sysfs_trace("Creating class_dev id=%p",class_dev);
 
         class_dev->class = &class_ptr->class;
-        if (pvr2_hdw_get_sn(sfp->channel.hdw)) {
-                dev_set_name(class_dev, "sn-%lu",
-                         pvr2_hdw_get_sn(sfp->channel.hdw));
-        } else if (pvr2_hdw_get_unit_number(sfp->channel.hdw) >= 0) {
-                dev_set_name(class_dev, "unit-%c",
-                         pvr2_hdw_get_unit_number(sfp->channel.hdw) + 'a');
-        } else {
-                kfree(class_dev);
-                return;
-        }
+        dev_set_name(class_dev, "%s",
+                     pvr2_hdw_get_device_identifier(sfp->channel.hdw));
 
         class_dev->parent = &usb_dev->dev;