i2c-s3c2410: Change IRQ to be plain integer.

Change the code to use a plain integer as the holder
for the IRQ for the device and use platform_get_irq()
to find it.

This makes the code slightly neater, and easier to get
the IRQ number.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>

Ben Dooks e0d1ec97 692acbd3

+8 -14
+8 -14
drivers/i2c/busses/i2c-s3c2410.c
··· 61 61 unsigned int msg_ptr; 62 62 63 63 unsigned int tx_setup; 64 + unsigned int irq; 64 65 65 66 enum s3c24xx_i2c_state state; 66 67 unsigned long clkrate; ··· 69 68 void __iomem *regs; 70 69 struct clk *clk; 71 70 struct device *dev; 72 - struct resource *irq; 73 71 struct resource *ioarea; 74 72 struct i2c_adapter adap; 75 73 ··· 869 869 * ensure no current IRQs pending 870 870 */ 871 871 872 - res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); 873 - if (res == NULL) { 872 + i2c->irq = ret = platform_get_irq(pdev, 0); 873 + if (ret <= 0) { 874 874 dev_err(&pdev->dev, "cannot find IRQ\n"); 875 - ret = -ENOENT; 876 875 goto err_iomap; 877 876 } 878 877 879 - ret = request_irq(res->start, s3c24xx_i2c_irq, IRQF_DISABLED, 880 - pdev->name, i2c); 878 + ret = request_irq(i2c->irq, s3c24xx_i2c_irq, IRQF_DISABLED, 879 + dev_name(&pdev->dev), i2c); 881 880 882 881 if (ret != 0) { 883 - dev_err(&pdev->dev, "cannot claim IRQ\n"); 882 + dev_err(&pdev->dev, "cannot claim IRQ %d\n", i2c->irq); 884 883 goto err_iomap; 885 884 } 886 - 887 - i2c->irq = res; 888 - 889 - dev_dbg(&pdev->dev, "irq resource %p (%lu)\n", res, 890 - (unsigned long)res->start); 891 885 892 886 ret = s3c24xx_i2c_register_cpufreq(i2c); 893 887 if (ret < 0) { ··· 912 918 s3c24xx_i2c_deregister_cpufreq(i2c); 913 919 914 920 err_irq: 915 - free_irq(i2c->irq->start, i2c); 921 + free_irq(i2c->irq, i2c); 916 922 917 923 err_iomap: 918 924 iounmap(i2c->regs); ··· 942 948 s3c24xx_i2c_deregister_cpufreq(i2c); 943 949 944 950 i2c_del_adapter(&i2c->adap); 945 - free_irq(i2c->irq->start, i2c); 951 + free_irq(i2c->irq, i2c); 946 952 947 953 clk_disable(i2c->clk); 948 954 clk_put(i2c->clk);