• Olof Johansson's avatar
    Merge branch 'ofdeviceiddata' of git://git.pengutronix.de/git/ukl/linux into... · 1a876762
    Olof Johansson authored
    Merge branch 'ofdeviceiddata' of git://git.pengutronix.de/git/ukl/linux into next/fixes-non-critical
    
    From  "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>:
    
    this is the 2nd version of this series whose goal is to make struct
    of_device_id.data const. Conceptually a driver must not modify the data
    contained there so making it const is the right thing.
    
    v1 of this series was sent with Message-id:
    1342182734-321-1-git-send-email-y. Changes since then are:
     - powerpc fixes
     - several new consts that were found by Arnd that are possible after
       patch 19.
    
    Arnd suggested to take this series via arm-soc late for 3.6 in one go
    because patch 19 depends on the former patches but is a precondition to
    the latter and it fixes a few warnings. So getting it in via the
    respective maintainer trees would need a much bigger coordination
    effort. That means I prefer getting Acks over you taking the patch.
    
    Vinod Koul already took
            dmaengine: at_hdmac: add a few const qualifiers
    that is in next-20120723 as 7fd63ccd now. Vinod, I don't follow your
    pull requests, but assuming you didn't let it already pull for 3.6 I
    suggest you drop it from your queue and I just take your Ack.
    
    This series was build tested for arm (all defconfigs) and powerpc (all
    defconfigs and an allyesconfig) and grep didn't find more issues. As
    before it introduces a warning in drivers/regulator/twl-regulator.c.
    This driver does modify its .of_match_table when a device is bound which
    doesn't fits the concept of independant devices. Arnd noticed another
    new warning in drivers/scsi/qlogicpti.c that isn't that easy to resolve,
    because the pointer to (now) const data is passed as first argument to
    scsi_host_alloc. To fix that properly struct Scsi_Host.hostt needs to
    get a const, too. Alternatively I could introduce a cast removing the
    const, but I don't like that.
    
    * 'ofdeviceiddata' of git://git.pengutronix.de/git/ukl/linux: (25 commits)
      dma: tegra: make data used as *of_device_id.data const
      can: mpc5xxx_can: make data used as *of_device_id.data const
      macintosh/mediabay: make data used as *of_device_id.data const
      i2c/mpc: make data used as *of_device_id.data const
      mfd/da9052: make i2c_device_id array const
      powerpc/fsl_msi: drop unneeded cast to non-const pointer
      gpio/gpio-omap: make platformdata used as *of_device_id.data const
      of: add const to struct *of_device_id.data
      dma: tegra: make tegra_dma.chip_data a pointer to const data
      watchdog/mpc8xxx: add a const qualifier
      powerpc/celleb_pci: add a const qualifier
      powerpc/fsl_msi: add a const qualifier
      powerpc/83xx: add a const qualifier
      macintosh/mediabay: add a const qualifier
      mmc/omap_hsmmc: add a const qualifier
      i2c/mpc: add a const qualifier
      i2c/i2c-omap: add a const qualifier
      gpio/mpc8xxx: add a const qualifier
      gpio/gpio-omap.c: add a const qualifier
      misc/atmel_tc: make atmel_tc.tcb_config member point to const data
    Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
    [olof: repulled a v3 version of the branch that rebased to add some more
    acked-bys and added one more patch on top for tegra]
    Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
    1a876762
i2c-omap.c 33.1 KB