OSDN Git Service

drm/sysfs: remove unnecessary connector type checks
authorJani Nikula <jani.nikula@intel.com>
Tue, 12 May 2015 09:14:55 +0000 (12:14 +0300)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 12 May 2015 17:15:53 +0000 (19:15 +0200)
These attributes should be exposed for the matching connector types
only, so checking is redundant.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/drm_sysfs.c

index 34e4fbc..487ddf5 100644 (file)
@@ -312,17 +312,6 @@ static ssize_t tv_subconnector_show(struct device *device,
        uint64_t subconnector;
        int ret;
 
-       switch (connector->connector_type) {
-       case DRM_MODE_CONNECTOR_Composite:
-       case DRM_MODE_CONNECTOR_SVIDEO:
-       case DRM_MODE_CONNECTOR_Component:
-       case DRM_MODE_CONNECTOR_TV:
-               break;
-       default:
-               DRM_ERROR("Wrong connector type for this property\n");
-               return 0;
-       }
-
        prop = dev->mode_config.tv_subconnector_property;
        if (!prop) {
                DRM_ERROR("Unable to find subconnector property\n");
@@ -347,17 +336,6 @@ static ssize_t tv_select_subconnector_show(struct device *device,
        uint64_t subconnector;
        int ret;
 
-       switch (connector->connector_type) {
-       case DRM_MODE_CONNECTOR_Composite:
-       case DRM_MODE_CONNECTOR_SVIDEO:
-       case DRM_MODE_CONNECTOR_Component:
-       case DRM_MODE_CONNECTOR_TV:
-               break;
-       default:
-               DRM_ERROR("Wrong connector type for this property\n");
-               return 0;
-       }
-
        prop = dev->mode_config.tv_select_subconnector_property;
        if (!prop) {
                DRM_ERROR("Unable to find select subconnector property\n");
@@ -382,11 +360,6 @@ static ssize_t dvii_subconnector_show(struct device *device,
        uint64_t subconnector;
        int ret;
 
-       if (connector->connector_type != DRM_MODE_CONNECTOR_DVII) {
-               DRM_ERROR("Wrong connector type for this property\n");
-               return 0;
-       }
-
        prop = dev->mode_config.dvi_i_subconnector_property;
        if (!prop) {
                DRM_ERROR("Unable to find subconnector property\n");
@@ -411,11 +384,6 @@ static ssize_t dvii_select_subconnector_show(struct device *device,
        uint64_t subconnector;
        int ret;
 
-       if (connector->connector_type != DRM_MODE_CONNECTOR_DVII) {
-               DRM_ERROR("Wrong connector type for this property\n");
-               return 0;
-       }
-
        prop = dev->mode_config.dvi_i_select_subconnector_property;
        if (!prop) {
                DRM_ERROR("Unable to find select subconnector property\n");