ioctl.h: don't use new typedefs

We should not add new typedefs.

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
git-svn-id: svn://svn.berlios.de//socketcan/trunk@775 030b6a49-0b11-0410-94ab-b0dab22257f2

diff --git a/kernel/2.6/drivers/net/can/mscan/mscan.c b/kernel/2.6/drivers/net/can/mscan/mscan.c
index 4a3e4ee27ac9fac3dd7cbe7b224ba70bb02dd4d7..18e1cb652dcc6fe9889ce7434aab1e4c4a47b7bb 100644 (file)
--- a/kernel/2.6/drivers/net/can/mscan/mscan.c
+++ b/kernel/2.6/drivers/net/can/mscan/mscan.c
@@ -109,7 +109,7 @@ struct mscan_priv {
 #define F_TX_PROGRESS  1
 #define F_TX_WAIT_ALL  2
 
-static can_state_t state_map[] = {
+static enum can_state state_map[] = {
        CAN_STATE_ACTIVE,
        CAN_STATE_BUS_WARNING,
        CAN_STATE_BUS_PASSIVE,
@@ -304,7 +304,7 @@ static int mscan_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
 static inline int check_set_state(struct net_device *dev, u8 canrflg)
 {
        struct mscan_priv *priv = netdev_priv(dev);
-       can_state_t state;
+       enum can_state state;
        int ret = 0;
 
        if (!(canrflg & MSCAN_CSCIF) || priv->can.state > CAN_STATE_BUS_OFF)
@@ -552,7 +552,7 @@ static irqreturn_t mscan_isr(int irq, void *dev_id)
        return ret;
 }
 
-static int mscan_do_set_mode(struct net_device *dev, can_mode_t mode)
+static int mscan_do_set_mode(struct net_device *dev, enum can_mode mode)
 {
 
        struct mscan_priv *priv = netdev_priv(dev);

diff --git a/kernel/2.6/drivers/net/can/old/ccan/ccan.c b/kernel/2.6/drivers/net/can/old/ccan/ccan.c
index a7b8052470ad572154d7b23be48cf031a1977e98..bf8f9db4c57b357947016e983c2c1dc4ca85e40e 100644 (file)
--- a/kernel/2.6/drivers/net/can/old/ccan/ccan.c
+++ b/kernel/2.6/drivers/net/can/old/ccan/ccan.c
@@ -274,7 +274,7 @@ static int ccan_set_bittime(struct net_device *dev, struct can_bittime *br)
        return 0;
 }
 
-static int ccan_set_mode(struct net_device *dev, can_mode_t mode)
+static int ccan_set_mode(struct net_device *dev, enum can_mode mode)
 {
        switch (mode) {
        case CAN_MODE_START:
@@ -287,7 +287,7 @@ static int ccan_set_mode(struct net_device *dev, can_mode_t mode)
        return 0;
 }
 
-static int ccan_get_state(struct net_device *dev, can_state_t *state)
+static int ccan_get_state(struct net_device *dev, enum can_state *state)
 {
        struct ccan_priv *priv = netdev_priv(dev);
        u32 reg_status;

diff --git a/kernel/2.6/drivers/net/can/sja1000/sja1000.c b/kernel/2.6/drivers/net/can/sja1000/sja1000.c
index cf088d7777f257e2c1a8d11babba301e906a3dfe..3243d4e7a13be50e66aefa3b8425bf2f7dbcdbfe 100644 (file)
--- a/kernel/2.6/drivers/net/can/sja1000/sja1000.c
+++ b/kernel/2.6/drivers/net/can/sja1000/sja1000.c
@@ -238,7 +238,7 @@ static void sja1000_start(struct net_device *dev)
        set_normal_mode(dev);
 }
 
-static int sja1000_set_mode(struct net_device *dev, can_mode_t mode)
+static int sja1000_set_mode(struct net_device *dev, enum can_mode mode)
 {
        struct sja1000_priv *priv = netdev_priv(dev);
 
@@ -260,7 +260,7 @@ static int sja1000_set_mode(struct net_device *dev, can_mode_t mode)
        return 0;
 }
 
-static int sja1000_get_state(struct net_device *dev, can_state_t *state)
+static int sja1000_get_state(struct net_device *dev, enum can_state *state)
 {
        struct sja1000_priv *priv = netdev_priv(dev);
        u8 status;
@@ -478,7 +478,7 @@ static int sja1000_err(struct net_device *dev,
        struct net_device_stats *stats = dev->get_stats(dev);
        struct can_frame *cf;
        struct sk_buff *skb;
-       can_state_t state = priv->can.state;
+       enum can_state state = priv->can.state;
        uint8_t ecc, alc;
 
        skb = dev_alloc_skb(sizeof(struct can_frame));

diff --git a/kernel/2.6/drivers/net/can/sysfs.c b/kernel/2.6/drivers/net/can/sysfs.c
index 7e4de21fa8bc5abcec98f756a91b5439f569b0b6..773bbec7f0113f18db57e0fdc05e639171aef6c6 100644 (file)
--- a/kernel/2.6/drivers/net/can/sysfs.c
+++ b/kernel/2.6/drivers/net/can/sysfs.c
@@ -101,7 +101,7 @@ static int can_get_ctrlmode(struct net_device *dev, u32 *ctrlmode)
        return 0;
 }
 
-static int can_get_state(struct net_device *dev, can_state_t *state)
+static int can_get_state(struct net_device *dev, enum can_state *state)
 {
        struct can_priv *priv = netdev_priv(dev);
 
@@ -283,7 +283,7 @@ static ssize_t can_show_state(struct device *dev,
                             char *buf)
 {
        struct net_device *ndev = to_net_dev(dev);
-       can_state_t state;
+       enum can_state state;
        int ret = -EINVAL;
 
        read_lock(&dev_base_lock);

diff --git a/kernel/2.6/include/linux/can/dev.h b/kernel/2.6/include/linux/can/dev.h
index 33c747fbf8a806a9305c131b40a637e7f933a578..d7ef8b5dcdc42e7ca1e2f036239acc3ddc82112f 100644 (file)
--- a/kernel/2.6/include/linux/can/dev.h
+++ b/kernel/2.6/include/linux/can/dev.h
@@ -49,7 +49,7 @@ struct can_priv {
        /* Please hold this lock when touching net_stats/can_stats */
        spinlock_t stats_lock;
 
-       can_state_t state;
+       enum can_state state;
        u32 ctrlmode;
 
        int restart_ms;

diff --git a/kernel/2.6/include/linux/can/ioctl.h b/kernel/2.6/include/linux/can/ioctl.h
index 56357aee616237c71d1de43de2425712c4f883ad..f9ba439cca67017077bd57940728d736bfa4c21a 100644 (file)
--- a/kernel/2.6/include/linux/can/ioctl.h
+++ b/kernel/2.6/include/linux/can/ioctl.h
@@ -25,10 +25,10 @@
 /*
  * CAN custom bit time
  */
-typedef enum CAN_BITTIME_TYPE {
+enum can_bittimes {
        CAN_BITTIME_STD,
        CAN_BITTIME_BTR
-} can_bittime_type_t;
+};
 
 /* TSEG1 of controllers usually is a sum of synch_seg (always 1),
  * prop_seg and phase_seg1, TSEG2 = phase_seg2 */
@@ -48,7 +48,7 @@ struct can_bittime_btr {
 };
 
 struct can_bittime {
-       can_bittime_type_t type;
+       enum can_bittimes type;
        union {
                struct can_bittime_std std;
                struct can_bittime_btr btr;
@@ -58,11 +58,11 @@ struct can_bittime {
 /*
  * CAN mode
  */
-typedef enum {
+enum can_mode {
        CAN_MODE_STOP = 0,
        CAN_MODE_START,
        CAN_MODE_SLEEP
-} can_mode_t;
+};
 
 /*
  * CAN controller mode
@@ -73,14 +73,14 @@ typedef enum {
 /*
  * CAN operational and error states
  */
-typedef enum {
+enum can_state {
        CAN_STATE_ACTIVE = 0,
        CAN_STATE_BUS_WARNING,
        CAN_STATE_BUS_PASSIVE,
        CAN_STATE_BUS_OFF,
        CAN_STATE_STOPPED,
        CAN_STATE_SLEEPING
-} can_state_t;
+};
 
 /*
  * CAN device statistics