diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2011-01-30 22:14:49 +0100 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2011-06-06 11:00:09 +0200 |
| commit | 44d856665789288859b7aa47ca25933c1c6ab57d (patch) | |
| tree | 8e8431015f6f54b1b7261e7077f5985414116343 /drivers/net/can/at91_can.c | |
| parent | e3cc055c18ab575291acf0af7622a2e97c4728fa (diff) | |
| download | lwn-44d856665789288859b7aa47ca25933c1c6ab57d.tar.gz lwn-44d856665789288859b7aa47ca25933c1c6ab57d.zip | |
can: at91_can: don't align struct definitions
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers/net/can/at91_can.c')
| -rw-r--r-- | drivers/net/can/at91_can.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/drivers/net/can/at91_can.c b/drivers/net/can/at91_can.c index 74efb5a2ad41..8f15ae4c719f 100644 --- a/drivers/net/can/at91_can.c +++ b/drivers/net/can/at91_can.c @@ -157,21 +157,21 @@ enum at91_mb_mode { #define AT91_IRQ_ALL (0x1fffffff) struct at91_priv { - struct can_priv can; /* must be the first member! */ - struct net_device *dev; - struct napi_struct napi; + struct can_priv can; /* must be the first member! */ + struct net_device *dev; + struct napi_struct napi; - void __iomem *reg_base; + void __iomem *reg_base; - u32 reg_sr; - unsigned int tx_next; - unsigned int tx_echo; - unsigned int rx_next; + u32 reg_sr; + unsigned int tx_next; + unsigned int tx_echo; + unsigned int rx_next; - struct clk *clk; - struct at91_can_data *pdata; + struct clk *clk; + struct at91_can_data *pdata; - canid_t mb0_id; + canid_t mb0_id; }; static struct can_bittiming_const at91_bittiming_const = { @@ -271,7 +271,7 @@ static void at91_setup_mailboxes(struct net_device *dev) /* reset acceptance mask and id register */ for (i = AT91_MB_RX_FIRST; i <= AT91_MB_RX_LAST; i++) { - at91_write(priv, AT91_MAM(i), 0x0 ); + at91_write(priv, AT91_MAM(i), 0x0); at91_write(priv, AT91_MID(i), AT91_MID_MIDE); } @@ -1231,11 +1231,11 @@ static int __devexit at91_can_remove(struct platform_device *pdev) } static struct platform_driver at91_can_driver = { - .probe = at91_can_probe, - .remove = __devexit_p(at91_can_remove), - .driver = { - .name = KBUILD_MODNAME, - .owner = THIS_MODULE, + .probe = at91_can_probe, + .remove = __devexit_p(at91_can_remove), + .driver = { + .name = KBUILD_MODNAME, + .owner = THIS_MODULE, }, }; |