diff options
| author | Mike Isely <isely@pobox.com> | 2007-11-25 22:55:07 -0600 |
|---|---|---|
| committer | Mike Isely <isely@pobox.com> | 2007-11-25 22:55:07 -0600 |
| commit | aad9eaebf68a27da1d3d889b885379cd7e27cba0 (patch) | |
| tree | 1500ec0a6d216ba1f87f71cfdcd9b9ecffe9cb09 | |
| parent | dd9cc2999bfc382787413a184733709ef86d0897 (diff) | |
| download | mediapointer-dvb-s2-aad9eaebf68a27da1d3d889b885379cd7e27cba0.tar.gz mediapointer-dvb-s2-aad9eaebf68a27da1d3d889b885379cd7e27cba0.tar.bz2 | |
pvrusb2: Remove obsolete global hardware type enumeration
From: Mike Isely <isely@pobox.com>
Device-specific driver behavior is now defined by generic device
characteristics rather than by specific device model information.
With this change, the hardware type field can go away, thus this
change.
Signed-off-by: Mike Isely <isely@pobox.com>
| -rw-r--r-- | linux/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h index cd06005ae..a8e829d37 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h @@ -178,8 +178,8 @@ struct pvr2_hdw { struct usb_device *usb_dev; struct usb_interface *usb_intf; - /* Device type, one of PVR2_HDW_TYPE_xxxxx */ - unsigned int hdw_type; + /* Device description, anything that must adjust behavior based on + device specific info will use information held here. */ const struct pvr2_device_desc *hdw_desc; /* Kernel worker thread handling */ diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c index 91922569a..da9bbf4fa 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c @@ -1841,7 +1841,6 @@ struct pvr2_hdw *pvr2_hdw_create(struct usb_interface *intf, hdw->controls = kzalloc(sizeof(struct pvr2_ctrl) * hdw->control_cnt, GFP_KERNEL); if (!hdw->controls) goto fail; - hdw->hdw_type = hdw_type; hdw->hdw_desc = hdw_desc; for (idx = 0; idx < hdw->control_cnt; idx++) { cptr = hdw->controls + idx; |