Changeset 43613a90 in rtems


Ignore:
Timestamp:
Feb 11, 2015, 11:54:57 AM (5 years ago)
Author:
Daniel Hellstrom <daniel@…>
Branches:
4.11, master
Children:
62fb1778
Parents:
56662f5c
git-author:
Daniel Hellstrom <daniel@…> (02/11/15 11:54:57)
git-committer:
Daniel Hellstrom <daniel@…> (04/16/15 23:10:25)
Message:

AMBAPP_BUS: fix build warnings

File:
1 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/sparc/shared/drvmgr/ambapp_bus.c

    r56662f5c r43613a90  
    146146        void *arg)
    147147{
    148         struct drvmgr_dev *busdev;
    149148        struct ambapp_priv *priv;
    150149        int irq;
    151150
    152         busdev = dev->parent->dev;
    153151        priv = dev->parent->priv;
    154152
     
    158156                return DRVMGR_EINVAL;
    159157
    160         DBG("Register interrupt on 0x%x for dev 0x%x (IRQ: %d)\n", (unsigned int)busdev, (unsigned int)dev, irq);
     158        DBG("Register interrupt on 0x%x for dev 0x%x (IRQ: %d)\n",
     159                (unsigned int)dev->parent->dev, (unsigned int)dev, irq);
    161160
    162161        if ( priv->config->ops->int_register ) {
     
    174173        void *arg)
    175174{
    176         struct drvmgr_dev *busdev;
    177175        struct ambapp_priv *priv;
    178176        int irq;
    179177
    180         busdev = dev->parent->dev;
    181178        priv = dev->parent->priv;
    182179
     
    186183                return DRVMGR_EINVAL;
    187184
    188         DBG("Unregister interrupt on 0x%x for dev 0x%x (IRQ: %d)\n", (unsigned int)busdev, (unsigned int)dev, irq);
     185        DBG("Unregister interrupt on 0x%x for dev 0x%x (IRQ: %d)\n",
     186                (unsigned int)dev->parent->dev, (unsigned int)dev, irq);
    189187
    190188        if ( priv->config->ops->int_unregister ) {
     
    200198        int index)
    201199{
    202         struct drvmgr_dev *busdev;
    203200        struct ambapp_priv *priv;
    204201        int irq;
    205202
    206         busdev = dev->parent->dev;
    207203        priv = dev->parent->priv;
    208204
     
    212208                return -1;
    213209
    214         DBG("Clear interrupt on 0x%x for dev 0x%x (IRQ: %d)\n", (unsigned int)busdev, (unsigned int)dev, irq);
     210        DBG("Clear interrupt on 0x%x for dev 0x%x (IRQ: %d)\n",
     211                (unsigned int)dev->parent->dev, (unsigned int)dev, irq);
    215212
    216213        if ( priv->config->ops->int_clear ) {
     
    226223        int index)
    227224{
    228         struct drvmgr_dev *busdev;
    229225        struct ambapp_priv *priv;
    230226        int irq;
    231227
    232         busdev = dev->parent->dev;
    233228        priv = dev->parent->priv;
    234229
     
    238233                return -1;
    239234
    240         DBG("MASK interrupt on 0x%x for dev 0x%x (IRQ: %d)\n", (unsigned int)busdev, (unsigned int)dev, irq);
     235        DBG("MASK interrupt on 0x%x for dev 0x%x (IRQ: %d)\n",
     236                (unsigned int)dev->parent->dev, (unsigned int)dev, irq);
    241237
    242238        if ( priv->config->ops->int_mask ) {
     
    252248        int index)
    253249{
    254         struct drvmgr_dev *busdev;
    255250        struct ambapp_priv *priv;
    256251        int irq;
    257252
    258         busdev = dev->parent->dev;
    259253        priv = dev->parent->priv;
    260254
     
    264258                return DRVMGR_EINVAL;
    265259
    266         DBG("UNMASK interrupt on 0x%x for dev 0x%x (IRQ: %d)\n", (unsigned int)busdev, (unsigned int)dev, irq);
     260        DBG("UNMASK interrupt on 0x%x for dev 0x%x (IRQ: %d)\n",
     261                (unsigned int)dev->parent->dev, (unsigned int)dev, irq);
    267262
    268263        if ( priv->config->ops->int_unmask ) {
     
    460455
    461456/* Fix device in last stage */
    462 int ambapp_dev_fixup(struct drvmgr_dev *dev, struct amba_dev_info *pnp)
     457static int ambapp_dev_fixup(struct drvmgr_dev *dev, struct amba_dev_info *pnp)
    463458{
    464459        /* OCCAN speciality:
     
    497492
    498493struct ambapp_dev_reg_struct {
    499         struct ambapp_bus               *abus;
     494        struct ambapp_bus       *abus;
    500495        struct drvmgr_bus       *bus;
    501         struct ambapp_dev               *ahb_mst;
    502         struct ambapp_dev               *ahb_slv;
    503         struct ambapp_dev               *apb_slv;
     496        struct ambapp_dev       *ahb_mst;
     497        struct ambapp_dev       *ahb_slv;
     498        struct ambapp_dev       *apb_slv;
    504499};
    505500
    506 void ambapp_core_register(
     501static void ambapp_core_register(
    507502        struct ambapp_dev       *ahb_mst,
    508503        struct ambapp_dev       *ahb_slv,
     
    596591
    597592/* Register one AMBA device */
    598 int ambapp_dev_register(struct ambapp_dev *dev, int index, void *arg)
     593static int ambapp_dev_register(struct ambapp_dev *dev, int index, void *arg)
    599594{
    600595        struct ambapp_dev_reg_struct *p = arg;
     
    673668
    674669/* Register all AMBA devices available on the AMBAPP bus */
    675 int ambapp_ids_register(struct drvmgr_bus *bus)
     670static int ambapp_ids_register(struct drvmgr_bus *bus)
    676671{
    677672        struct ambapp_priv *priv = bus->priv;
Note: See TracChangeset for help on using the changeset viewer.