Skip to content

Commit

Permalink
mfd: Use dev_get_drvdata() directly
Browse files Browse the repository at this point in the history 
Using dev_get_drvdata directly.

Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
  • Loading branch information
Kefeng Wang authored and Lee Jones committed May 14, 2019
1 parent 4f8f2bb commit ed83513
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 35 deletions.
6 changes: 2 additions & 4 deletions drivers/mfd/ssbi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,6 @@ struct ssbi {
int (*write)(struct ssbi *, u16 addr, const u8 *buf, int len);
};

#define to_ssbi(dev) platform_get_drvdata(to_platform_device(dev))

static inline u32 ssbi_readl(struct ssbi *ssbi, u32 reg)
{
return readl(ssbi->base + reg);
Expand Down Expand Up @@ -243,7 +241,7 @@ ssbi_pa_write_bytes(struct ssbi *ssbi, u16 addr, const u8 *buf, int len)

int ssbi_read(struct device *dev, u16 addr, u8 *buf, int len)
{
struct ssbi *ssbi = to_ssbi(dev);
struct ssbi *ssbi = dev_get_drvdata(dev);
unsigned long flags;
int ret;

Expand All @@ -257,7 +255,7 @@ EXPORT_SYMBOL_GPL(ssbi_read);

int ssbi_write(struct device *dev, u16 addr, const u8 *buf, int len)
{
struct ssbi *ssbi = to_ssbi(dev);
struct ssbi *ssbi = dev_get_drvdata(dev);
unsigned long flags;
int ret;

Expand Down
12 changes: 4 additions & 8 deletions drivers/mfd/t7l66xb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,7 @@ struct t7l66xb {

static int t7l66xb_mmc_enable(struct platform_device *mmc)
{
struct platform_device *dev = to_platform_device(mmc->dev.parent);
struct t7l66xb *t7l66xb = platform_get_drvdata(dev);
struct t7l66xb *t7l66xb = dev_get_drvdata(mmc->dev.parent);
unsigned long flags;
u8 dev_ctl;
int ret;
Expand All @@ -108,8 +107,7 @@ static int t7l66xb_mmc_enable(struct platform_device *mmc)

static int t7l66xb_mmc_disable(struct platform_device *mmc)
{
struct platform_device *dev = to_platform_device(mmc->dev.parent);
struct t7l66xb *t7l66xb = platform_get_drvdata(dev);
struct t7l66xb *t7l66xb = dev_get_drvdata(mmc->dev.parent);
unsigned long flags;
u8 dev_ctl;

Expand All @@ -128,16 +126,14 @@ static int t7l66xb_mmc_disable(struct platform_device *mmc)

static void t7l66xb_mmc_pwr(struct platform_device *mmc, int state)
{
struct platform_device *dev = to_platform_device(mmc->dev.parent);
struct t7l66xb *t7l66xb = platform_get_drvdata(dev);
struct t7l66xb *t7l66xb = dev_get_drvdata(mmc->dev.parent);

tmio_core_mmc_pwr(t7l66xb->scr + 0x200, 0, state);
}

static void t7l66xb_mmc_clk_div(struct platform_device *mmc, int state)
{
struct platform_device *dev = to_platform_device(mmc->dev.parent);
struct t7l66xb *t7l66xb = platform_get_drvdata(dev);
struct t7l66xb *t7l66xb = dev_get_drvdata(mmc->dev.parent);

tmio_core_mmc_clk_div(t7l66xb->scr + 0x200, 0, state);
}
Expand Down
12 changes: 4 additions & 8 deletions drivers/mfd/tc6387xb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,25 +80,22 @@ static int tc6387xb_resume(struct platform_device *dev)

static void tc6387xb_mmc_pwr(struct platform_device *mmc, int state)
{
struct platform_device *dev = to_platform_device(mmc->dev.parent);
struct tc6387xb *tc6387xb = platform_get_drvdata(dev);
struct tc6387xb *tc6387xb = dev_get_drvdata(mmc->dev.parent);

tmio_core_mmc_pwr(tc6387xb->scr + 0x200, 0, state);
}

static void tc6387xb_mmc_clk_div(struct platform_device *mmc, int state)
{
struct platform_device *dev = to_platform_device(mmc->dev.parent);
struct tc6387xb *tc6387xb = platform_get_drvdata(dev);
struct tc6387xb *tc6387xb = dev_get_drvdata(mmc->dev.parent);

tmio_core_mmc_clk_div(tc6387xb->scr + 0x200, 0, state);
}


static int tc6387xb_mmc_enable(struct platform_device *mmc)
{
struct platform_device *dev = to_platform_device(mmc->dev.parent);
struct tc6387xb *tc6387xb = platform_get_drvdata(dev);
struct tc6387xb *tc6387xb = dev_get_drvdata(mmc->dev.parent);

clk_prepare_enable(tc6387xb->clk32k);

Expand All @@ -110,8 +107,7 @@ static int tc6387xb_mmc_enable(struct platform_device *mmc)

static int tc6387xb_mmc_disable(struct platform_device *mmc)
{
struct platform_device *dev = to_platform_device(mmc->dev.parent);
struct tc6387xb *tc6387xb = platform_get_drvdata(dev);
struct tc6387xb *tc6387xb = dev_get_drvdata(mmc->dev.parent);

clk_disable_unprepare(tc6387xb->clk32k);

Expand Down
23 changes: 8 additions & 15 deletions drivers/mfd/tc6393xb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,14 +122,13 @@ enum {

static int tc6393xb_nand_enable(struct platform_device *nand)
{
struct platform_device *dev = to_platform_device(nand->dev.parent);
struct tc6393xb *tc6393xb = platform_get_drvdata(dev);
struct tc6393xb *tc6393xb = dev_get_drvdata(nand->dev.parent);
unsigned long flags;

raw_spin_lock_irqsave(&tc6393xb->lock, flags);

/* SMD buffer on */
dev_dbg(&dev->dev, "SMD buffer on\n");
dev_dbg(nand->dev.parent, "SMD buffer on\n");
tmio_iowrite8(0xff, tc6393xb->scr + SCR_GPI_BCR(1));

raw_spin_unlock_irqrestore(&tc6393xb->lock, flags);
Expand Down Expand Up @@ -312,8 +311,7 @@ static int tc6393xb_fb_disable(struct platform_device *dev)

int tc6393xb_lcd_set_power(struct platform_device *fb, bool on)
{
struct platform_device *dev = to_platform_device(fb->dev.parent);
struct tc6393xb *tc6393xb = platform_get_drvdata(dev);
struct tc6393xb *tc6393xb = dev_get_drvdata(fb->dev.parent);
u8 fer;
unsigned long flags;

Expand All @@ -334,8 +332,7 @@ EXPORT_SYMBOL(tc6393xb_lcd_set_power);

int tc6393xb_lcd_mode(struct platform_device *fb,
const struct fb_videomode *mode) {
struct platform_device *dev = to_platform_device(fb->dev.parent);
struct tc6393xb *tc6393xb = platform_get_drvdata(dev);
struct tc6393xb *tc6393xb = dev_get_drvdata(fb->dev.parent);
unsigned long flags;

raw_spin_lock_irqsave(&tc6393xb->lock, flags);
Expand All @@ -351,8 +348,7 @@ EXPORT_SYMBOL(tc6393xb_lcd_mode);

static int tc6393xb_mmc_enable(struct platform_device *mmc)
{
struct platform_device *dev = to_platform_device(mmc->dev.parent);
struct tc6393xb *tc6393xb = platform_get_drvdata(dev);
struct tc6393xb *tc6393xb = dev_get_drvdata(mmc->dev.parent);

tmio_core_mmc_enable(tc6393xb->scr + 0x200, 0,
tc6393xb_mmc_resources[0].start & 0xfffe);
Expand All @@ -362,8 +358,7 @@ static int tc6393xb_mmc_enable(struct platform_device *mmc)

static int tc6393xb_mmc_resume(struct platform_device *mmc)
{
struct platform_device *dev = to_platform_device(mmc->dev.parent);
struct tc6393xb *tc6393xb = platform_get_drvdata(dev);
struct tc6393xb *tc6393xb = dev_get_drvdata(mmc->dev.parent);

tmio_core_mmc_resume(tc6393xb->scr + 0x200, 0,
tc6393xb_mmc_resources[0].start & 0xfffe);
Expand All @@ -373,16 +368,14 @@ static int tc6393xb_mmc_resume(struct platform_device *mmc)

static void tc6393xb_mmc_pwr(struct platform_device *mmc, int state)
{
struct platform_device *dev = to_platform_device(mmc->dev.parent);
struct tc6393xb *tc6393xb = platform_get_drvdata(dev);
struct tc6393xb *tc6393xb = dev_get_drvdata(mmc->dev.parent);

tmio_core_mmc_pwr(tc6393xb->scr + 0x200, 0, state);
}

static void tc6393xb_mmc_clk_div(struct platform_device *mmc, int state)
{
struct platform_device *dev = to_platform_device(mmc->dev.parent);
struct tc6393xb *tc6393xb = platform_get_drvdata(dev);
struct tc6393xb *tc6393xb = dev_get_drvdata(mmc->dev.parent);

tmio_core_mmc_clk_div(tc6393xb->scr + 0x200, 0, state);
}
Expand Down

0 comments on commit ed83513

Please sign in to comment.