Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a876762 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'ofdeviceiddata' of git://git.pengutronix.de/git/ukl/linux into... 

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>
parents 55d512e2 75f21631

arch/arm/mm/cache-l2x0.c

+1 −1
Original line number Diff line number Diff line
@@ -554,7 +554,7 @@ static const struct of_device_id l2x0_ids[] __initconst = { 
int __init l2x0_of_init(u32 aux_val, u32 aux_mask)

{

	struct device_node *np;

	struct l2x0_of_data *data;

	const struct l2x0_of_data *data;

	struct resource res;



	np = of_find_matching_node(NULL, l2x0_ids);

arch/powerpc/platforms/83xx/suspend.c

+1 −1
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ static int pmc_probe(struct platform_device *ofdev) 
	const struct of_device_id *match;

	struct device_node *np = ofdev->dev.of_node;

	struct resource res;

	struct pmc_type *type;

	const struct pmc_type *type;

	int ret = 0;



	match = of_match_device(pmc_match, &ofdev->dev);

arch/powerpc/platforms/cell/celleb_pci.c

+1 −1
Original line number Diff line number Diff line
@@ -472,7 +472,7 @@ int __init celleb_setup_phb(struct pci_controller *phb) 
{

	struct device_node *dev = phb->dn;

	const struct of_device_id *match;

	struct celleb_phb_spec *phb_spec;

	const struct celleb_phb_spec *phb_spec;

	int rc;



	match = of_match_node(celleb_phb_match, dev);

arch/powerpc/sysdev/fsl_msi.c

+4 −4
Original line number Diff line number Diff line
@@ -368,7 +368,7 @@ static int __devinit fsl_of_msi_probe(struct platform_device *dev) 
	int err, i, j, irq_index, count;

	int rc;

	const u32 *p;

	struct fsl_msi_feature *features;

	const struct fsl_msi_feature *features;

	int len;

	u32 offset;

	static const u32 all_avail[] = { 0, NR_MSI_IRQS };
@@ -502,15 +502,15 @@ static const struct fsl_msi_feature vmpic_msi_feature = { 
static const struct of_device_id fsl_of_msi_ids[] = {

	{

		.compatible = "fsl,mpic-msi",

		.data = (void *)&mpic_msi_feature,

		.data = &mpic_msi_feature,

	},

	{

		.compatible = "fsl,ipic-msi",

		.data = (void *)&ipic_msi_feature,

		.data = &ipic_msi_feature,

	},

	{

		.compatible = "fsl,vmpic-msi",

		.data = (void *)&vmpic_msi_feature,

		.data = &vmpic_msi_feature,

	},

	{}

};

drivers/dma/tegra20-apb-dma.c

+4 −4
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ struct tegra_dma { 
	struct clk			*dma_clk;

	spinlock_t			global_lock;

	void __iomem			*base_addr;

	struct tegra_dma_chip_data	*chip_data;

	const struct tegra_dma_chip_data *chip_data;



	/* Some register need to be cache before suspend */

	u32				reg_gen;
@@ -1173,14 +1173,14 @@ static void tegra_dma_free_chan_resources(struct dma_chan *dc) 
}



/* Tegra20 specific DMA controller information */

static struct tegra_dma_chip_data tegra20_dma_chip_data = {

static const struct tegra_dma_chip_data tegra20_dma_chip_data = {

	.nr_channels		= 16,

	.max_dma_count		= 1024UL * 64,

};



#if defined(CONFIG_OF)

/* Tegra30 specific DMA controller information */

static struct tegra_dma_chip_data tegra30_dma_chip_data = {

static const struct tegra_dma_chip_data tegra30_dma_chip_data = {

	.nr_channels		= 32,

	.max_dma_count		= 1024UL * 64,

};
@@ -1204,7 +1204,7 @@ static int __devinit tegra_dma_probe(struct platform_device *pdev) 
	struct tegra_dma *tdma;

	int ret;

	int i;

	struct tegra_dma_chip_data *cdata = NULL;

	const struct tegra_dma_chip_data *cdata = NULL;



	if (pdev->dev.of_node) {

		const struct of_device_id *match;