From patchwork Sat Jan 3 14:49:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 5561871 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D4D99BF6C3 for ; Sat, 3 Jan 2015 14:49:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 16888201FA for ; Sat, 3 Jan 2015 14:49:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8C2C3201FE for ; Sat, 3 Jan 2015 14:49:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752128AbbACOte (ORCPT ); Sat, 3 Jan 2015 09:49:34 -0500 Received: from bombadil.infradead.org ([198.137.202.9]:46671 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751100AbbACOtZ (ORCPT ); Sat, 3 Jan 2015 09:49:25 -0500 Received: from 200-181-92-56.bsace705.dsl.brasiltelecom.net.br ([200.181.92.56] helo=smtp.w2.samsung.com) by bombadil.infradead.org with esmtpsa (Exim 4.80.1 #2 (Red Hat Linux)) id 1Y7Q15-0008Es-5A; Sat, 03 Jan 2015 14:49:23 +0000 Received: from mchehab by smtp.w2.samsung.com with local (Exim 4.84) (envelope-from ) id 1Y7Q0u-0003o0-Ug; Sat, 03 Jan 2015 12:49:12 -0200 From: Mauro Carvalho Chehab To: Laurent Pinchart Cc: Mauro Carvalho Chehab , Linux Media Mailing List , Mauro Carvalho Chehab , linux-api@vger.kernel.org Subject: [PATCHv2 1/9] media: Fix DVB representation at media controller API Date: Sat, 3 Jan 2015 12:49:03 -0200 Message-Id: X-Mailer: git-send-email 2.1.0 In-Reply-To: References: In-Reply-To: References: Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The DVB devices are identified via a (major, minor) tuple, and not by a random id. Fix it, before we start using it. Signed-off-by: Mauro Carvalho Chehab diff --git a/include/media/media-entity.h b/include/media/media-entity.h index e00459185d20..de333cc8261b 100644 --- a/include/media/media-entity.h +++ b/include/media/media-entity.h @@ -97,7 +97,10 @@ struct media_entity { u32 device; u32 subdevice; } alsa; - int dvb; + struct { + u32 major; + u32 minor; + } dvb; /* Sub-device specifications */ /* Nothing needed yet */ diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h index d847c760e8f0..7902e800f019 100644 --- a/include/uapi/linux/media.h +++ b/include/uapi/linux/media.h @@ -27,7 +27,7 @@ #include #include -#define MEDIA_API_VERSION KERNEL_VERSION(0, 1, 0) +#define MEDIA_API_VERSION KERNEL_VERSION(0, 1, 1) struct media_device_info { char driver[16]; @@ -88,7 +88,10 @@ struct media_entity_desc { __u32 device; __u32 subdevice; } alsa; - int dvb; + struct { + __u32 major; + __u32 minor; + } dvb; /* Sub-device specifications */ /* Nothing needed yet */