From patchwork Wed Jan 12 13:17:32 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robin Humble X-Patchwork-Id: 474201 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0CDUSEt006372 for ; Wed, 12 Jan 2011 13:30:28 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932538Ab1ALNaK (ORCPT ); Wed, 12 Jan 2011 08:30:10 -0500 Received: from quail.cita.utoronto.ca ([128.100.76.6]:59638 "EHLO quail.cita.utoronto.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932413Ab1ALNaI (ORCPT ); Wed, 12 Jan 2011 08:30:08 -0500 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 12 Jan 2011 13:30:28 +0000 (UTC) X-Greylist: delayed 754 seconds by postgrey-1.27 at vger.kernel.org; Wed, 12 Jan 2011 08:30:08 EST Received: from cita.utoronto.ca (grizzly.cita.utoronto.ca [128.100.76.62]) by quail.cita.utoronto.ca (8.13.8/8.13.8) with ESMTP id p0CDHWxH030817 for ; Wed, 12 Jan 2011 08:17:32 -0500 Received: from grizzly.cita.utoronto.ca (localhost [127.0.0.1]) by cita.utoronto.ca (8.14.4/8.14.4) with ESMTP id p0CDHWGn028704 for ; Wed, 12 Jan 2011 08:17:32 -0500 Received: (from rjh@localhost) by grizzly.cita.utoronto.ca (8.14.4/8.14.4/Submit) id p0CDHWu8028702 for linux-media@vger.kernel.org; Wed, 12 Jan 2011 08:17:32 -0500 Date: Wed, 12 Jan 2011 08:17:32 -0500 From: Robin Humble To: linux-media@vger.kernel.org Subject: [PATCH] dib7000m/p: struct alignment fix Message-ID: <20110112131732.GA26294@grizzly.cita.utoronto.ca> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org diff --git a/drivers/media/dvb/frontends/dib7000m.h b/drivers/media/dvb/frontends/dib7000m.h index 113819c..de82f8b 100644 --- a/drivers/media/dvb/frontends/dib7000m.h +++ b/drivers/media/dvb/frontends/dib7000m.h @@ -4,16 +4,13 @@ #include "dibx000_common.h" struct dib7000m_config { - u8 dvbt_mode; u8 output_mpeg2_in_188_bytes; u8 hostbus_diversity; u8 tuner_is_baseband; - u8 mobile_mode; int (*update_lna) (struct dvb_frontend *, u16 agc_global); u8 agc_config_count; struct dibx000_agc_config *agc; - struct dibx000_bandwidth_config *bw; #define DIB7000M_GPIO_DEFAULT_DIRECTIONS 0xffff @@ -31,9 +28,16 @@ struct dib7000m_config { u8 quartz_direct; + int (*agc_control) (struct dvb_frontend *, u8 before); + +/* keep the above in sync with dib7000p_config and the below the same size */ + u8 input_clk_is_div_2; + u8 mobile_mode; + u8 dvbt_mode; - int (*agc_control) (struct dvb_frontend *, u8 before); + u8 pad1; + u8 pad2; }; #define DEFAULT_DIB7000M_I2C_ADDRESS 18 diff --git a/drivers/media/dvb/frontends/dib7000p.h b/drivers/media/dvb/frontends/dib7000p.h index da17345..9c34485 100644 --- a/drivers/media/dvb/frontends/dib7000p.h +++ b/drivers/media/dvb/frontends/dib7000p.h @@ -28,16 +28,16 @@ struct dib7000p_config { u8 quartz_direct; - u8 spur_protect; - int (*agc_control) (struct dvb_frontend *, u8 before); +/* keep the above in sync with dib7000m_config and the below the same size */ + + u8 spur_protect; u8 output_mode; u8 disable_sample_and_hold : 1; u8 enable_current_mirror : 1; u8 diversity_delay; - }; #define DEFAULT_DIB7000P_I2C_ADDRESS 18