mirror of
https://github.com/torvalds/linux.git
synced 2024-11-24 21:21:41 +00:00
Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next
Marc Kleine-Budde says: ==================== the fifth pull request for upcoming v3.6 net-next. The first two patches (created by me) add const qualifiers to the flexcan and mpc5xxx_can driver. The next patch by Julia Lawall fixes a return value problem in the error path of the softing driver. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
c41e4130a2
@ -192,7 +192,7 @@ struct flexcan_priv {
|
||||
|
||||
struct clk *clk;
|
||||
struct flexcan_platform_data *pdata;
|
||||
struct flexcan_devtype_data *devtype_data;
|
||||
const struct flexcan_devtype_data *devtype_data;
|
||||
};
|
||||
|
||||
static struct flexcan_devtype_data fsl_p1010_devtype_data = {
|
||||
@ -960,7 +960,7 @@ static const struct platform_device_id flexcan_id_table[] = {
|
||||
static int __devinit flexcan_probe(struct platform_device *pdev)
|
||||
{
|
||||
const struct of_device_id *of_id;
|
||||
struct flexcan_devtype_data *devtype_data;
|
||||
const struct flexcan_devtype_data *devtype_data;
|
||||
struct net_device *dev;
|
||||
struct flexcan_priv *priv;
|
||||
struct resource *mem;
|
||||
|
@ -251,7 +251,7 @@ static struct of_device_id mpc5xxx_can_table[];
|
||||
static int __devinit mpc5xxx_can_probe(struct platform_device *ofdev)
|
||||
{
|
||||
const struct of_device_id *match;
|
||||
struct mpc5xxx_can_data *data;
|
||||
const struct mpc5xxx_can_data *data;
|
||||
struct device_node *np = ofdev->dev.of_node;
|
||||
struct net_device *dev;
|
||||
struct mscan_priv *priv;
|
||||
|
@ -826,12 +826,12 @@ static __devinit int softing_pdev_probe(struct platform_device *pdev)
|
||||
goto sysfs_failed;
|
||||
}
|
||||
|
||||
ret = -ENOMEM;
|
||||
for (j = 0; j < ARRAY_SIZE(card->net); ++j) {
|
||||
card->net[j] = netdev =
|
||||
softing_netdev_create(card, card->id.chip[j]);
|
||||
if (!netdev) {
|
||||
dev_alert(&pdev->dev, "failed to make can[%i]", j);
|
||||
ret = -ENOMEM;
|
||||
goto netdev_failed;
|
||||
}
|
||||
priv = netdev_priv(card->net[j]);
|
||||
|
Loading…
Reference in New Issue
Block a user