Skip to content

Commit

Permalink
tmio: Silence warnings introduced by mfd changes
Browse files Browse the repository at this point in the history 
This silences warnings such as

drivers/video/tmiofb.c: In function 'tmiofb_hw_init':
drivers/video/tmiofb.c:270: warning: initialization discards qualifiers from pointer target type

These were added by me in commit 2a79bb1d.

Signed-off-by: Andres Salomon <[email protected]>
Signed-off-by: Samuel Ortiz <[email protected]>
  • Loading branch information
@dilinger
dilinger authored and Samuel Ortiz committed Mar 23, 2011
1 parent 93619c2 commit 944dc03
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 18 deletions.
8 changes: 4 additions & 4 deletions drivers/mmc/host/tmio_mmc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1191,7 +1191,7 @@ static const struct mmc_host_ops tmio_mmc_ops = {
#ifdef CONFIG_PM
static int tmio_mmc_suspend(struct platform_device *dev, pm_message_t state)
{
struct mfd_cell *cell = mfd_get_cell(dev);
const struct mfd_cell *cell = mfd_get_cell(dev);
struct mmc_host *mmc = platform_get_drvdata(dev);
int ret;

Expand All @@ -1206,7 +1206,7 @@ static int tmio_mmc_suspend(struct platform_device *dev, pm_message_t state)

static int tmio_mmc_resume(struct platform_device *dev)
{
struct mfd_cell *cell = mfd_get_cell(dev);
const struct mfd_cell *cell = mfd_get_cell(dev);
struct mmc_host *mmc = platform_get_drvdata(dev);
int ret = 0;

Expand All @@ -1229,7 +1229,7 @@ static int tmio_mmc_resume(struct platform_device *dev)

static int __devinit tmio_mmc_probe(struct platform_device *dev)
{
struct mfd_cell *cell = mfd_get_cell(dev);
const struct mfd_cell *cell = mfd_get_cell(dev);
struct tmio_mmc_data *pdata;
struct resource *res_ctl;
struct tmio_mmc_host *host;
Expand Down Expand Up @@ -1344,7 +1344,7 @@ static int __devinit tmio_mmc_probe(struct platform_device *dev)

static int __devexit tmio_mmc_remove(struct platform_device *dev)
{
struct mfd_cell *cell = mfd_get_cell(dev);
const struct mfd_cell *cell = mfd_get_cell(dev);
struct mmc_host *mmc = platform_get_drvdata(dev);

platform_set_drvdata(dev, NULL);
Expand Down
8 changes: 4 additions & 4 deletions drivers/mtd/nand/tmio_nand.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ static int tmio_nand_correct_data(struct mtd_info *mtd, unsigned char *buf,

static int tmio_hw_init(struct platform_device *dev, struct tmio_nand *tmio)
{
struct mfd_cell *cell = mfd_get_cell(dev);
const struct mfd_cell *cell = mfd_get_cell(dev);
int ret;

if (cell->enable) {
Expand Down Expand Up @@ -363,7 +363,7 @@ static int tmio_hw_init(struct platform_device *dev, struct tmio_nand *tmio)

static void tmio_hw_stop(struct platform_device *dev, struct tmio_nand *tmio)
{
struct mfd_cell *cell = mfd_get_cell(dev);
const struct mfd_cell *cell = mfd_get_cell(dev);

tmio_iowrite8(FCR_MODE_POWER_OFF, tmio->fcr + FCR_MODE);
if (cell->disable)
Expand Down Expand Up @@ -515,7 +515,7 @@ static int tmio_remove(struct platform_device *dev)
#ifdef CONFIG_PM
static int tmio_suspend(struct platform_device *dev, pm_message_t state)
{
struct mfd_cell *cell = mfd_get_cell(dev);
const struct mfd_cell *cell = mfd_get_cell(dev);

if (cell->suspend)
cell->suspend(dev);
Expand All @@ -526,7 +526,7 @@ static int tmio_suspend(struct platform_device *dev, pm_message_t state)

static int tmio_resume(struct platform_device *dev)
{
struct mfd_cell *cell = mfd_get_cell(dev);
const struct mfd_cell *cell = mfd_get_cell(dev);

/* FIXME - is this required or merely another attack of the broken
* SHARP platform? Looks suspicious.
Expand Down
8 changes: 4 additions & 4 deletions drivers/usb/host/ohci-tmio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ static struct platform_driver ohci_hcd_tmio_driver;

static int __devinit ohci_hcd_tmio_drv_probe(struct platform_device *dev)
{
struct mfd_cell *cell = mfd_get_cell(dev);
const struct mfd_cell *cell = mfd_get_cell(dev);
struct resource *regs = platform_get_resource(dev, IORESOURCE_MEM, 0);
struct resource *config = platform_get_resource(dev, IORESOURCE_MEM, 1);
struct resource *sram = platform_get_resource(dev, IORESOURCE_MEM, 2);
Expand Down Expand Up @@ -274,7 +274,7 @@ static int __devexit ohci_hcd_tmio_drv_remove(struct platform_device *dev)
{
struct usb_hcd *hcd = platform_get_drvdata(dev);
struct tmio_hcd *tmio = hcd_to_tmio(hcd);
struct mfd_cell *cell = mfd_get_cell(dev);
const struct mfd_cell *cell = mfd_get_cell(dev);

usb_remove_hcd(hcd);
tmio_stop_hc(dev);
Expand All @@ -293,7 +293,7 @@ static int __devexit ohci_hcd_tmio_drv_remove(struct platform_device *dev)
#ifdef CONFIG_PM
static int ohci_hcd_tmio_drv_suspend(struct platform_device *dev, pm_message_t state)
{
struct mfd_cell *cell = mfd_get_cell(dev);
const struct mfd_cell *cell = mfd_get_cell(dev);
struct usb_hcd *hcd = platform_get_drvdata(dev);
struct ohci_hcd *ohci = hcd_to_ohci(hcd);
struct tmio_hcd *tmio = hcd_to_tmio(hcd);
Expand Down Expand Up @@ -326,7 +326,7 @@ static int ohci_hcd_tmio_drv_suspend(struct platform_device *dev, pm_message_t s

static int ohci_hcd_tmio_drv_resume(struct platform_device *dev)
{
struct mfd_cell *cell = mfd_get_cell(dev);
const struct mfd_cell *cell = mfd_get_cell(dev);
struct usb_hcd *hcd = platform_get_drvdata(dev);
struct ohci_hcd *ohci = hcd_to_ohci(hcd);
struct tmio_hcd *tmio = hcd_to_tmio(hcd);
Expand Down
11 changes: 5 additions & 6 deletions drivers/video/tmiofb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ static int tmiofb_hw_stop(struct platform_device *dev)
*/
static int tmiofb_hw_init(struct platform_device *dev)
{
struct mfd_cell *cell = mfd_get_cell(dev);
const struct mfd_cell *cell = mfd_get_cell(dev);
struct fb_info *info = platform_get_drvdata(dev);
struct tmiofb_par *par = info->par;
const struct resource *nlcr = &cell->resources[0];
Expand Down Expand Up @@ -311,7 +311,6 @@ static int tmiofb_hw_init(struct platform_device *dev)
*/
static void tmiofb_hw_mode(struct platform_device *dev)
{
struct mfd_cell *cell = mfd_get_cell(dev);
struct tmio_fb_data *data = mfd_get_data(dev);
struct fb_info *info = platform_get_drvdata(dev);
struct fb_videomode *mode = info->mode;
Expand Down Expand Up @@ -680,7 +679,7 @@ static struct fb_ops tmiofb_ops = {

static int __devinit tmiofb_probe(struct platform_device *dev)
{
struct mfd_cell *cell = mfd_get_cell(dev);
const struct mfd_cell *cell = mfd_get_cell(dev);
struct tmio_fb_data *data = mfd_get_data(dev);
struct resource *ccr = platform_get_resource(dev, IORESOURCE_MEM, 1);
struct resource *lcr = platform_get_resource(dev, IORESOURCE_MEM, 0);
Expand Down Expand Up @@ -808,7 +807,7 @@ static int __devinit tmiofb_probe(struct platform_device *dev)

static int __devexit tmiofb_remove(struct platform_device *dev)
{
struct mfd_cell *cell = mfd_get_cell(dev);
const struct mfd_cell *cell = mfd_get_cell(dev);
struct fb_info *info = platform_get_drvdata(dev);
int irq = platform_get_irq(dev, 0);
struct tmiofb_par *par;
Expand Down Expand Up @@ -938,7 +937,7 @@ static int tmiofb_suspend(struct platform_device *dev, pm_message_t state)
#ifdef CONFIG_FB_TMIO_ACCELL
struct tmiofb_par *par = info->par;
#endif
struct mfd_cell *cell = mfd_get_cell(dev);
const struct mfd_cell *cell = mfd_get_cell(dev);
int retval = 0;

console_lock();
Expand Down Expand Up @@ -970,7 +969,7 @@ static int tmiofb_suspend(struct platform_device *dev, pm_message_t state)
static int tmiofb_resume(struct platform_device *dev)
{
struct fb_info *info = platform_get_drvdata(dev);
struct mfd_cell *cell = mfd_get_cell(dev);
const struct mfd_cell *cell = mfd_get_cell(dev);
int retval = 0;

console_lock();
Expand Down

0 comments on commit 944dc03

Please sign in to comment.