leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

can: c_can: Modify c_can device names

Browse Source 
Modify c_can device names from *_CAN_DEVTYPE to BOSCH_*_CAN to make
use of same names for array indexes in c_can_id_table[] as well as
device names.

This patch also add indexes to c_can_id_table array.

Signed-off-by: AnilKumar Ch <anilkumar@ti.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
This commit is contained in:
AnilKumar Ch 2012-08-02 18:43:09 +05:30 committed by Marc Kleine-Budde
parent abb17e6c0c
commit f27b1db95d
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/can/c_can/c_can.h
View File

@ -143,8 +143,9 @@ static const u16 reg_map_d_can[] = {
}; };
enum c_can_dev_id { enum c_can_dev_id {
C_CAN_DEVTYPE, BOSCH_C_CAN_PLATFORM,
D_CAN_DEVTYPE, BOSCH_C_CAN,
BOSCH_D_CAN,
}; };
/* c_can private data structure */ /* c_can private data structure */

6
drivers/net/can/c_can/c_can_pci.c
View File

@ -120,10 +120,10 @@ static int __devinit c_can_pci_probe(struct pci_dev *pdev,
/* Configure CAN type */ /* Configure CAN type */
switch (c_can_pci_data->type) { switch (c_can_pci_data->type) {
case C_CAN_DEVTYPE: case BOSCH_C_CAN:
priv->regs = reg_map_c_can; priv->regs = reg_map_c_can;
break; break;
case D_CAN_DEVTYPE: case BOSCH_D_CAN:
priv->regs = reg_map_d_can; priv->regs = reg_map_d_can;
priv->can.ctrlmode_supported |= CAN_CTRLMODE_3_SAMPLES; priv->can.ctrlmode_supported |= CAN_CTRLMODE_3_SAMPLES;
break; break;
@ -192,7 +192,7 @@ static void __devexit c_can_pci_remove(struct pci_dev *pdev)
} }
static struct c_can_pci_data c_can_sta2x11= { static struct c_can_pci_data c_can_sta2x11= {
.type = C_CAN_DEVTYPE, .type = BOSCH_C_CAN,
.reg_align = C_CAN_REG_ALIGN_32, .reg_align = C_CAN_REG_ALIGN_32,
.freq = 52000000, /* 52 Mhz */ .freq = 52000000, /* 52 Mhz */
}; };

18
drivers/net/can/c_can/c_can_platform.c
View File

@ -116,7 +116,7 @@ static int __devinit c_can_plat_probe(struct platform_device *pdev)
priv = netdev_priv(dev); priv = netdev_priv(dev);
id = platform_get_device_id(pdev); id = platform_get_device_id(pdev);
switch (id->driver_data) { switch (id->driver_data) {
case C_CAN_DEVTYPE: case BOSCH_C_CAN:
priv->regs = reg_map_c_can; priv->regs = reg_map_c_can;
switch (mem->flags & IORESOURCE_MEM_TYPE_MASK) { switch (mem->flags & IORESOURCE_MEM_TYPE_MASK) {
case IORESOURCE_MEM_32BIT: case IORESOURCE_MEM_32BIT:
@ -130,7 +130,7 @@ static int __devinit c_can_plat_probe(struct platform_device *pdev)
break; break;
} }
break; break;
case D_CAN_DEVTYPE: case BOSCH_D_CAN:
priv->regs = reg_map_d_can; priv->regs = reg_map_d_can;
priv->can.ctrlmode_supported |= CAN_CTRLMODE_3_SAMPLES; priv->can.ctrlmode_supported |= CAN_CTRLMODE_3_SAMPLES;
priv->read_reg = c_can_plat_read_reg_aligned_to_16bit; priv->read_reg = c_can_plat_read_reg_aligned_to_16bit;
@ -196,15 +196,17 @@ static int __devexit c_can_plat_remove(struct platform_device *pdev)
} }
static const struct platform_device_id c_can_id_table[] = { static const struct platform_device_id c_can_id_table[] = {
{ [BOSCH_C_CAN_PLATFORM] = {
.name = KBUILD_MODNAME, .name = KBUILD_MODNAME,
.driver_data = C_CAN_DEVTYPE, .driver_data = BOSCH_C_CAN,
}, { },
[BOSCH_C_CAN] = {
.name = "c_can", .name = "c_can",
.driver_data = C_CAN_DEVTYPE, .driver_data = BOSCH_C_CAN,
}, { },
[BOSCH_D_CAN] = {
.name = "d_can", .name = "d_can",
.driver_data = D_CAN_DEVTYPE, .driver_data = BOSCH_D_CAN,
}, { }, {
} }
}; };